summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Nusinow <dnusinow@debian.org>2007-07-11 20:00:25 -0400
committerAlex Deucher <alex@botch2.com>2007-07-11 20:00:25 -0400
commit8dd310538df11cc5ff4e8e84920218b819bbae47 (patch)
tree14b547b82f4d272ebd96c71508bc7a610d169772 /src
parent4b2a0ad8f15e7b11f7c8251fb032b9df4f07ce96 (diff)
disable randr when savage rotation is enabled
fixes bug 7899
Diffstat (limited to 'src')
-rw-r--r--src/savage_driver.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 2c51770..6ffe772 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -1165,15 +1165,23 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
if ((s = xf86GetOptValString(psav->Options, OPTION_ROTATE))) {
if(!xf86NameCmp(s, "CW")) {
/* accel is disabled below for shadowFB */
+ /* RandR is disabled when the Rotate option is used (does
+ * not work well together and scrambles the screen) */
+
psav->shadowFB = TRUE;
psav->rotate = 1;
+ xf86DisableRandR();
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Rotating screen clockwise - acceleration disabled\n");
+ "Rotating screen clockwise"
+ "- acceleration and RandR disabled\n");
} else if(!xf86NameCmp(s, "CCW")) {
psav->shadowFB = TRUE;
psav->rotate = -1;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen"
- "counter clockwise - acceleration disabled\n");
+ xf86DisableRandR();
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Rotating screen counter clockwise"
+ " - acceleration and RandR disabled\n");
+
} else {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid"
"value for Option \"Rotate\"\n", s);