diff options
author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-11-21 10:47:24 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-10 16:54:44 -0500 |
commit | 6806e63f48f819754f39e1f796e790b377fb6a89 (patch) | |
tree | aaf6fed17f206122b09b089cee9ccf4dbe99efb2 | |
parent | e9cb81a22841908b1c075156b409a538d09c8466 (diff) |
drm/i915: do not assert DE_PCH_EVENT_IVB enabled
The current code was checking if all bits of "val" were enabled and
DE_PCH_EVENT_IVB was disabled. The new code doesn't care about the
state of DE_PCH_EVENT_IVB: it just checks if everything else is 1.
The goal is that future patches may completely disable interrupts, and
the LCPLL-disabling code shouldn't care about the state of
DE_PCH_EVENT_IVB.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
[danvet: I think the commit message is actually wrong in it's
description of what the old test checked, but the new one seems sane.
So meh.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-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 895759b5569f..d3a3fba64361 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -6514,7 +6514,7 @@ static void assert_can_disable_lcpll(struct drm_i915_private *dev_priv) | |||
6514 | 6514 | ||
6515 | spin_lock_irqsave(&dev_priv->irq_lock, irqflags); | 6515 | spin_lock_irqsave(&dev_priv->irq_lock, irqflags); |
6516 | val = I915_READ(DEIMR); | 6516 | val = I915_READ(DEIMR); |
6517 | WARN((val & ~DE_PCH_EVENT_IVB) != val, | 6517 | WARN((val | DE_PCH_EVENT_IVB) != 0xffffffff, |
6518 | "Unexpected DEIMR bits enabled: 0x%x\n", val); | 6518 | "Unexpected DEIMR bits enabled: 0x%x\n", val); |
6519 | val = I915_READ(SDEIMR); | 6519 | val = I915_READ(SDEIMR); |
6520 | WARN((val | SDE_HOTPLUG_MASK_CPT) != 0xffffffff, | 6520 | WARN((val | SDE_HOTPLUG_MASK_CPT) != 0xffffffff, |