xf86-video-intel: src/sna/sna_display.c

[Chris Wilson]

 src/sna/sna_display.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 821b34f5db2936394e8969b15c1cdd5144acf6e3
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Aug 9 14:55:09 2013 +0100

    sna: Squelch a "valid" mode without a dotclock
    
    There is yet another race in drm initialisation where X is starting long
    before the drm device is completely ready, and is being told that the
    output has a valid mode, but with bogus settings. Ignore it, and hope it
    comes to its senses later on.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index f86d93d..ad93d04 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3034,7 +3034,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
 
 		DBG(("%s: CRTC:%d, pipe=%d: has mode?=%d\n", __FUNCTION__,
 		     sna_crtc->id, sna_crtc->pipe, mode.mode_valid));
-		if (!mode.mode_valid)
+		if (!mode.mode_valid || mode.mode.clock == 0)
 			continue;
 
 		memset(&crtc->desiredMode, 0, sizeof(crtc->desiredMode));