summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-04-08 08:44:56 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2014-04-08 08:45:38 +0100
commite6b03269d01e61527641639c6fb7b796205e6ed8 (patch)
tree454289f8b4fcdf1a73176d01ada1a1d9a5e467cd
parentbf1875139817c5b00d63a743e262c8f3552058ab (diff)
sna: Continue to reprobe for ZaphodHeads with a mixed up configuration
Fixes regresion from commit 35b03b3fe6213eb3e08f05efe3428bd6bc5421d2 Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Fri Mar 28 09:14:59 2014 +0000 sna: Virtual CRTCs are last, so break loops early as the conflicting Zaphod detection requires on searching all potential CRTCs without finding the match. By breaking early on the virtual CRTC, we concluded that the setup was actually valid, but disabled. Reported-by: Nick Bowler <nbowler@draconx.ca> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77156 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-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 f64b0847..b942d4a1 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -3903,7 +3903,7 @@ static bool sna_probe_initial_configuration(struct sna *sna)
xf86CrtcPtr crtc = config->crtc[j];
if (to_sna_crtc(crtc) == NULL)
- break;
+ continue;
if (to_sna_crtc(crtc)->id != crtc_id)
continue;