projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9075e52
)
drm/i915: don't check for i830 in vlv specific code
author
Jani Nikula
<jani.nikula@intel.com>
Fri, 22 Aug 2014 12:06:35 +0000
(15:06 +0300)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 3 Sep 2014 08:54:29 +0000
(10:54 +0200)
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>
drivers/gpu/drm/i915/intel_display.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/intel_display.c
b/drivers/gpu/drm/i915/intel_display.c
index ae218e083dc7ded27a862a467644fdca3c49502f..4933bb8504aa9a0b394e105a3836f7d0160d59e6 100644
(file)
--- 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);