diff options
| author | Sonika Jindal <sonika.jindal@intel.com> | 2014-07-22 01:46:35 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 01:05:45 -0400 |
| commit | baff296cbe4e7337bdaaa04959b062df1acb22c2 (patch) | |
| tree | 0447813bca2c9216467bffb8f10a27f6f065dc2c | |
| parent | 7a1db49af64e1b622a1d155f6b375439337cc355 (diff) | |
drm/i915: Returning from increase/decrease of pllclock when invalid
v2: Adding !HAS_GMCH_DISPLAY(dev)
Signed-off-by: Sonika Jindal <sonika.jindal@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index fea68f33aaff..1389d8a30f0a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -8780,7 +8780,7 @@ static void intel_increase_pllclock(struct drm_device *dev, | |||
| 8780 | int dpll_reg = DPLL(pipe); | 8780 | int dpll_reg = DPLL(pipe); |
| 8781 | int dpll; | 8781 | int dpll; |
| 8782 | 8782 | ||
| 8783 | if (HAS_PCH_SPLIT(dev)) | 8783 | if (!HAS_GMCH_DISPLAY(dev)) |
| 8784 | return; | 8784 | return; |
| 8785 | 8785 | ||
| 8786 | if (!dev_priv->lvds_downclock_avail) | 8786 | if (!dev_priv->lvds_downclock_avail) |
| @@ -8808,7 +8808,7 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc) | |||
| 8808 | struct drm_i915_private *dev_priv = dev->dev_private; | 8808 | struct drm_i915_private *dev_priv = dev->dev_private; |
| 8809 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); | 8809 | struct intel_crtc *intel_crtc = to_intel_crtc(crtc); |
| 8810 | 8810 | ||
| 8811 | if (HAS_PCH_SPLIT(dev)) | 8811 | if (!HAS_GMCH_DISPLAY(dev)) |
| 8812 | return; | 8812 | return; |
| 8813 | 8813 | ||
| 8814 | if (!dev_priv->lvds_downclock_avail) | 8814 | if (!dev_priv->lvds_downclock_avail) |