summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-04-24 14:40:04 -0400
committerAdam Jackson <ajax@redhat.com>2014-05-21 10:24:36 -0400
commit3d1c12f600e579ebde64f9900396c126e1bd6e5f (patch)
tree2d75afa693cd7b833b14d32d9e871bf9e7978837
parentea56001e5b9a01e18f50227ff988f26054743dc1 (diff)
Force shadowfb for RANDR 1.2 for now
Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--src/mga_driver.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c
index ba1dd35..16b1f65 100644
--- a/src/mga_driver.c
+++ b/src/mga_driver.c
@@ -1953,12 +1953,6 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
(1 << pScrn->offset.green) |
(((pScrn->mask.blue >> pScrn->offset.blue) - 1) << pScrn->offset.blue);
}
- if (xf86ReturnOptValBool(pMga->Options, OPTION_SHADOW_FB, FALSE)) {
- pMga->ShadowFB = TRUE;
- pMga->NoAccel = TRUE;
- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
- "Using \"Shadow Framebuffer\" - acceleration disabled\n");
- }
if (xf86ReturnOptValBool(pMga->Options, OPTION_OVERCLOCK_MEM, FALSE)) {
pMga->OverclockMem = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Overclocking memory\n");
@@ -1997,6 +1991,18 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags)
}
}
+ if (pMga->randr12) {
+ pMga->ShadowFB = TRUE;
+ pMga->NoAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ "Using shadowfb for RANDR 1.2 support\n");
+ } else if (xf86ReturnOptValBool(pMga->Options, OPTION_SHADOW_FB, FALSE)) {
+ pMga->ShadowFB = TRUE;
+ pMga->NoAccel = TRUE;
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "Using \"Shadow Framebuffer\" - acceleration disabled\n");
+ }
+
if (pMga->FBDev) {
pScrn->SwitchMode = fbdevHWSwitchModeWeak();
pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();