forked from pool/xorg-x11-server
33 lines
994 B
Diff
33 lines
994 B
Diff
|
diff --git a/randr/rrinfo.c b/randr/rrinfo.c
|
||
|
|
index bd5d5b1..8b0c93d 100644
|
||
|
|
--- a/randr/rrinfo.c
|
||
|
|
+++ b/randr/rrinfo.c
|
||
|
|
@@ -98,7 +98,6 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
|
||
|
|
if (!output)
|
||
|
|
return;
|
||
|
|
RROutputSetCrtcs (output, &crtc, 1);
|
||
|
|
- output->crtc = crtc;
|
||
|
|
RROutputSetConnection (output, RR_Connected);
|
||
|
|
#ifdef RENDER
|
||
|
|
RROutputSetSubpixelOrder (output, PictureGetSubpixelOrder (pScreen));
|
||
|
|
@@ -108,7 +107,9 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
|
||
|
|
output = RRFirstOutput (pScreen);
|
||
|
|
if (!output)
|
||
|
|
return;
|
||
|
|
- crtc = output->crtc;
|
||
|
|
+ crtc = pScrPriv->crtcs[0];
|
||
|
|
+ if (!crtc)
|
||
|
|
+ return;
|
||
|
|
|
||
|
|
/* check rotations */
|
||
|
|
if (rotations != crtc->rotations)
|
||
|
|
@@ -168,7 +169,7 @@ RRScanOldConfig (ScreenPtr pScreen, Rotation rotations)
|
||
|
|
|
||
|
|
/* notice current mode */
|
||
|
|
if (newMode)
|
||
|
|
- RRCrtcNotify (output->crtc, newMode, 0, 0, pScrPriv->rotation,
|
||
|
|
+ RRCrtcNotify (crtc, newMode, 0, 0, pScrPriv->rotation,
|
||
|
|
1, &output);
|
||
|
|
}
|
||
|
|
#endif
|