drm/i915: fix vblank wait test condition

9559fcdb · Jesse Barnes <[email protected]> · 2010-08-24 11:31:16 -07:00

When converting this to the new wait_for macro I inverted the wait
condition, which causes all sorts of problems.  So correct it to fix
several failures caused by the bad wait (flickering, bad output
detection, tearing, etc.).

Reviewed-by: Chris Wilson <[email protected]>
Tested-by: Sitsofe Wheeler <[email protected]>
Signed-off-by: Jesse Barnes <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 9559fcdbff4f93d29af04478bbc48294519424f5
Parents: f4e385cc

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/gpu/drm/i915/intel_display.c	modified	+1	−1	View file

drivers/gpu/drm/i915/intel_display.c

View file

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 23157e1..11a3394 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -992,7 +992,7 @@ void intel_wait_for_vblank(struct drm_device *dev, int pipe)
 
 	/* Wait for vblank interrupt bit to set */
 	if (wait_for((I915_READ(pipestat_reg) &
-		      PIPE_VBLANK_INTERRUPT_STATUS) == 0,
+		      PIPE_VBLANK_INTERRUPT_STATUS),
 		     50, 0))
 		DRM_DEBUG_KMS("vblank wait timed out\n");
 }