summaryrefslogtreecommitdiff
path: root/src/sna
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-08-09 14:55:09 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2013-08-09 14:55:09 +0100
commit821b34f5db2936394e8969b15c1cdd5144acf6e3 (patch)
tree60073a6b4d8a1b5a3b072cdb7bac3050cfed117c /src/sna
parentb6b5c3f009585151eb772dfc2526843c7cee82b3 (diff)
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@chris-wilson.co.uk>
Diffstat (limited to 'src/sna')
-rw-r--r--src/sna/sna_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index f86d93d5..ad93d046 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));