From 7782e38472ed69313a4f37740c76eabbf5545066 Mon Sep 17 00:00:00 2001 From: Gustavo Pichorim Boiko Date: Thu, 2 Aug 2007 18:25:40 -0300 Subject: [PATCH] Fix randr1.2 loading on non-randr1.2 DDX in a better way Change the code in a way that respects the abstraction layer --- randr/rrinfo.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/randr/rrinfo.c b/randr/rrinfo.c index bd5d5b1..c443c8c 100644 --- a/randr/rrinfo.c +++ b/randr/rrinfo.c @@ -98,17 +98,14 @@ 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)); #endif } - output = RRFirstOutput (pScreen); - if (!output) - return; - crtc = output->crtc; + output = pScrPriv->outputs[0]; + crtc = pScrPriv->crtcs[0]; /* check rotations */ if (rotations != crtc->rotations) @@ -168,7 +165,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 -- 1.5.2.4