summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-09-02 14:40:07 -0400
committerAdam Jackson <ajax@redhat.com>2009-09-02 14:40:07 -0400
commit17545ed80ee3bb6a058a2748fc7bfb0fc5139fc1 (patch)
treec3611661178ed85ffd33e95fb934e8a19348b1e9
parent291408980f33b1e541c89d958535e6fad55fdac9 (diff)
randr: Fix crtcs using set_mode_major()
We'd never mark the crtc as active, meaning (among other things) gamma upload wouldn't work.
-rw-r--r--hw/xfree86/modes/xf86Crtc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 69f687bd7..8d636af48 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;