summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch')
-rw-r--r--x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch b/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch
new file mode 100644
index 000000000000..83a7ca2b3e63
--- /dev/null
+++ b/x11-drivers/xf86-video-sunffb/files/xf86-video-sunffb-1.2.2-unbreak-when-xaa-is-not-present.patch
@@ -0,0 +1,32 @@
+From 181b60190c1f81fc9b9b5deb07d536b78f2536ab Mon Sep 17 00:00:00 2001
+From: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon, 10 Jun 2013 19:51:08 +0000
+Subject: Unbreak when XAA is not present.
+
+Turn accel off if loading XAA fails.
+
+Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+diff --git a/src/ffb_driver.c b/src/ffb_driver.c
+index af13484..7f17d64 100644
+--- a/src/ffb_driver.c
++++ b/src/ffb_driver.c
+@@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
+ return FALSE;
+ }
+
+- if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
+- FFBFreeRec(pScrn);
+- return FALSE;
++ if (!pFfb->NoAccel) {
++ if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++ "Loading XAA failed, acceleration disabled\n");
++ pFfb->NoAccel = TRUE;
++ }
+ }
+
+ if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
+--
+cgit v0.9.0.2-2-gbebe