diff options
| author | Jani Nikula | 2014-08-21 14:06:25 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2014-09-03 11:04:18 +0200 |
| commit | ec49ba2d709f3a1a4cd822e547db2f07e121b375 (patch) | |
| tree | 9d06421b11b0fcefa097942a8090dd287655bc3d /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915/bdw: Don't execute context reset and switch with Execlists (diff) | |
| download | kernel-qcow2-linux-ec49ba2d709f3a1a4cd822e547db2f07e121b375.tar.gz kernel-qcow2-linux-ec49ba2d709f3a1a4cd822e547db2f07e121b375.tar.xz kernel-qcow2-linux-ec49ba2d709f3a1a4cd822e547db2f07e121b375.zip | |
drm/i915: fix panel unlock register mask
Use the correct mask for the unlock bits. In theory this could have lead
to incorrect asserts but this is unlikely in practise.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@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.c | 2 |
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 921594f64158..8245fe51994a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1210,7 +1210,7 @@ static void assert_panel_unlocked(struct drm_i915_private *dev_priv, val = I915_READ(pp_reg); if (!(val & PANEL_POWER_ON) || - ((val & PANEL_UNLOCK_REGS) == PANEL_UNLOCK_REGS)) + ((val & PANEL_UNLOCK_MASK) == PANEL_UNLOCK_REGS)) locked = false; if (I915_READ(lvds_reg) & LVDS_PIPEB_SELECT) |