package/xorg/xf86-video-sunffb/hotfix-xaa.patch

   1 From 181b60190c1f81fc9b9b5deb07d536b78f2536ab Mon Sep 17 00:00:00 2001
   2 From: Matthieu Herrb <matthieu.herrb@laas.fr>
   3 Date: Mon, 10 Jun 2013 21:51:08 +0200
   4 Subject: Unbreak when XAA is not present.
   5
   6 Turn accel off if loading XAA fails.
   7
   8 Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
   9 Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
  10 ---
  11  src/ffb_driver.c | 9 ++++++---
  12  1 file changed, 6 insertions(+), 3 deletions(-)
  13
  14 diff --git a/src/ffb_driver.c b/src/ffb_driver.c
  15 index af13484..7f17d64 100644
  16 --- a/src/ffb_driver.c
  17 +++ b/src/ffb_driver.c
  18 @@ -413,9 +413,12 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
  19         return FALSE;
  20      }
  21
  22 -    if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
  23 -       FFBFreeRec(pScrn);
  24 -       return FALSE;
  25 +    if (!pFfb->NoAccel) {
  26 +        if (xf86LoadSubModule(pScrn, "xaa") == NULL) {
  27 +            xf86DrvMsg(pScrn->scrnIndex, X_INFO,
  28 +                       "Loading XAA failed, acceleration disabled\n");
  29 +            pFfb->NoAccel = TRUE;
  30 +        }
  31      }
  32
  33      if (pFfb->HWCursor && xf86LoadSubModule(pScrn, "ramdac") == NULL) {
  34 --
  35 cgit v1.1
  36