diff options
| author | Keith Packard <keithp@keithp.com> | 2009-01-30 20:17:10 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-30 20:21:28 -0800 |
| commit | 4de5705545792d77c9990bbec3e263a517757a2a (patch) | |
| tree | e89fd28dad7edf1a1151836ed56495ecf354537e | |
| parent | f716e3f3445d443cbc6507d27f806e9ad387120a (diff) | |
RandR crtcs not fetched correctly when primary output is set.
Primary outputs may not have a CRTC.
Loops fetching CRTCs respecting primary output were broken.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | randr/randr.c | 2 | ||||
| -rw-r--r-- | randr/rrscreen.c | 13 | ||||
| -rw-r--r-- | randr/rrxinerama.c | 15 |
3 files changed, 19 insertions, 11 deletions
diff --git a/randr/randr.c b/randr/randr.c index b7c44f7ec..07dd9e917 100644 --- a/randr/randr.c +++ b/randr/randr.c @@ -436,7 +436,7 @@ RRFirstOutput (ScreenPtr pScreen) RROutputPtr output; int i, j; - if (pScrPriv->primaryOutput) + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) return pScrPriv->primaryOutput; for (i = 0; i < pScrPriv->numCrtcs; i++) diff --git a/randr/rrscreen.c b/randr/rrscreen.c index 3456c72a4..590a388d9 100644 --- a/randr/rrscreen.c +++ b/randr/rrscreen.c @@ -324,7 +324,7 @@ rrGetScreenResources(ClientPtr client, Bool query) rrScrPrivPtr pScrPriv; CARD8 *extra; unsigned long extraLen; - int i, n, rc, has_primary; + int i, n, rc, has_primary = 0; RRCrtc *crtcs; RROutput *outputs; xRRModeInfo *modeinfos; @@ -402,19 +402,22 @@ rrGetScreenResources(ClientPtr client, Bool query) modeinfos = (xRRModeInfo *) (outputs + pScrPriv->numOutputs); names = (CARD8 *) (modeinfos + num_modes); - has_primary = (pScrPriv->primaryOutput != NULL); - if (pScrPriv->primaryOutput) + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) { - crtcs[0] = pScrPriv->primaryOutput->id; + has_primary = 1; + crtcs[0] = pScrPriv->primaryOutput->crtc->id; if (client->swapped) swapl (&crtcs[0], n); } for (i = 0; i < pScrPriv->numCrtcs; i++) { - if (pScrPriv->primaryOutput && + if (has_primary && pScrPriv->primaryOutput->crtc == pScrPriv->crtcs[i]) + { + has_primary = 0; continue; + } crtcs[i + has_primary] = pScrPriv->crtcs[i]->id; if (client->swapped) swapl (&crtcs[i + has_primary], n); diff --git a/randr/rrxinerama.c b/randr/rrxinerama.c index 0a14b7960..36135c6c1 100644 --- a/randr/rrxinerama.c +++ b/randr/rrxinerama.c @@ -324,16 +324,21 @@ ProcRRXineramaQueryScreens(ClientPtr client) if(rep.number) { rrScrPriv(pScreen); int i; - int has_primary = (pScrPriv->primaryOutput != NULL); + int has_primary = 0; - if (has_primary) { + if (pScrPriv->primaryOutput && pScrPriv->primaryOutput->crtc) { + has_primary = 1; RRXineramaWriteCrtc(client, pScrPriv->primaryOutput->crtc); } for(i = 0; i < pScrPriv->numCrtcs; i++) { - RRCrtcPtr crtc = pScrPriv->crtcs[i]; - if (!has_primary || (crtc != pScrPriv->primaryOutput->crtc)) - RRXineramaWriteCrtc(client, crtc); + if (has_primary && + pScrPriv->primaryOutput->crtc == pScrPriv->crtcs[i]) + { + has_primary = 0; + continue; + } + RRXineramaWriteCrtc(client, pScrPriv->crtcs[i]); } } |