public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "drm/i915: fix vblank wait test condition"
@ 2010-09-04  8:17 Pekka Enberg
  2010-09-04  9:21 ` Chris Wilson
  0 siblings, 1 reply; 20+ messages in thread
From: Pekka Enberg @ 2010-09-04  8:17 UTC (permalink / raw)
  To: torvalds
  Cc: linux-kernel, Pekka Enberg, Andrew Morton, Chris Wilson,
	Sitsofe Wheeler, Jesse Barnes

This reverts commit 9559fcdbff4f93d29af04478bbc48294519424f5. The commit causes
wrong screen resolution on some i915 machines such as MacBook which is a
regression from 2.6.35. The issue has been reported multiple times but no fix
has emerged:

  - i915: 2.6.36-rc2 wrong resolution on gdm start:
    http://lkml.org/lkml/2010/8/23/452

  - i915: wrong framebuffer size in 2.6.36-rc3
    http://kerneltrap.org/mailarchive/linux-kernel/2010/8/30/4613057

I think it's time to revert the commit and try again in 2.6.37.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Sitsofe Wheeler <sitsofe@yahoo.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Reported-by Ivan Bulatovic <combuster@gmx.com>
Reported-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---
 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 11a3394..23157e1 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),
+		      PIPE_VBLANK_INTERRUPT_STATUS) == 0,
 		     50, 0))
 		DRM_DEBUG_KMS("vblank wait timed out\n");
 }
-- 
1.6.3.3


^ permalink raw reply related	[flat|nested] 20+ messages in thread

end of thread, other threads:[~2010-09-05 17:53 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-04  8:17 [PATCH] Revert "drm/i915: fix vblank wait test condition" Pekka Enberg
2010-09-04  9:21 ` Chris Wilson
2010-09-04 16:29   ` Pekka Enberg
2010-09-04 19:54     ` Hugh Dickins
2010-09-04 20:42       ` Sven Joachim
2010-09-04 22:44         ` Sitsofe Wheeler
2010-09-05  7:58           ` Pekka Enberg
2010-09-05  9:37             ` Sitsofe Wheeler
2010-09-05  8:26           ` Fabio Comolli
2010-09-05  9:14             ` Sitsofe Wheeler
2010-09-05 10:13               ` Fabio Comolli
2010-09-05 10:21                 ` Fabio Comolli
2010-09-05 12:27                   ` Sitsofe Wheeler
2010-09-05 17:41                     ` Fabio Comolli
2010-09-05 16:11         ` Pekka Enberg
2010-09-05 16:23           ` Chris Wilson
2010-09-05 16:40             ` Pekka Enberg
2010-09-05 17:21               ` Chris Wilson
2010-09-05 17:26                 ` Pekka Enberg
2010-09-05 17:53                 ` Jesse Barnes

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox