RRScanOldConfig wasn't getting crtcs set correctly

The output crtc is set by RRCrtcNotify, which is called at the end of
RRScanOldConfig. Several uses of output->crtc in this function were wrong.
This commit is contained in:
Keith Packard 2007-08-07 12:45:53 -07:00
parent 2b93cbb5f8
commit b4193a2eee

View File

@ -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