summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2014-08-22 15:06:35 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-09-03 10:54:29 +0200
commit6a9e7363775f699388f173bc4fba9c7c5a8626ae (patch)
tree78230375a8b601de45ab84652cff1afe025fa643 /drivers
parent9075e52face677b87c6bf08d8ea1a960d48d085c (diff)
downloadtalos-obmc-linux-6a9e7363775f699388f173bc4fba9c7c5a8626ae.tar.gz
talos-obmc-linux-6a9e7363775f699388f173bc4fba9c7c5a8626ae.zip
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')
-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)
BUG_ON(!IS_VALLEYVIEW(dev_priv->dev));
/* PLL is protected by panel, make sure we can write it */
- if (IS_MOBILE(dev_priv->dev) && !IS_I830(dev_priv->dev))
+ if (IS_MOBILE(dev_priv->dev))
assert_panel_unlocked(dev_priv, crtc->pipe);
I915_WRITE(reg, dpll);
OpenPOWER on IntegriCloud