xserver: Branch 'master'
Adam Jackson
ajax at kemper.freedesktop.org
Wed Sep 2 11:44:43 PDT 2009
hw/xfree86/modes/xf86Crtc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 17545ed80ee3bb6a058a2748fc7bfb0fc5139fc1
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Sep 2 14:40:07 2009 -0400
randr: Fix crtcs using set_mode_major()
We'd never mark the crtc as active, meaning (among other things) gamma
upload wouldn't work.
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 69f687b..8d636af 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -368,12 +368,13 @@ xf86CrtcSetModeTransform (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotati
}
ret = TRUE;
- crtc->active = TRUE;
- if (scrn->pScreen)
- xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
done:
- if (!ret) {
+ if (ret) {
+ crtc->active = TRUE;
+ if (scrn->pScreen)
+ xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);
+ } else {
crtc->x = saved_x;
crtc->y = saved_y;
crtc->rotation = saved_rotation;
More information about the xorg-commit
mailing list