aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-08-22 08:06:35 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-03 04:54:29 -0400
commit6a9e7363775f699388f173bc4fba9c7c5a8626ae (patch)
tree78230375a8b601de45ab84652cff1afe025fa643 /drivers/gpu/drm/i915/intel_display.c
parent9075e52face677b87c6bf08d8ea1a960d48d085c (diff)
drm/i915: don't check for i830 in vlv specific code
Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ae218e083dc7..4933bb8504aa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -1527,7 +1527,7 @@ static void vlv_enable_pll(struct intel_crtc *crtc)
1527 BUG_ON(!IS_VALLEYVIEW(dev_priv->dev)); 1527 BUG_ON(!IS_VALLEYVIEW(dev_priv->dev));
1528 1528
1529 /* PLL is protected by panel, make sure we can write it */ 1529 /* PLL is protected by panel, make sure we can write it */
1530 if (IS_MOBILE(dev_priv->dev) && !IS_I830(dev_priv->dev)) 1530 if (IS_MOBILE(dev_priv->dev))
1531 assert_panel_unlocked(dev_priv, crtc->pipe); 1531 assert_panel_unlocked(dev_priv, crtc->pipe);
1532 1532
1533 I915_WRITE(reg, dpll); 1533 I915_WRITE(reg, dpll);