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 /randr/rrscreen.c | |
| 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>
Diffstat (limited to 'randr/rrscreen.c')
| -rw-r--r-- | randr/rrscreen.c | 13 |
1 files changed, 8 insertions, 5 deletions
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); |