[PATCH xf86-video-sunffb] Unbreak when XAA is not present.

[Alex Deucher]

On Mon, Jun 10, 2013 at 3:58 PM, Matthieu Herrb <matthieu.herrb at laas.fr> wrote:
> Turn accel off if loading XAA fails.
>
> Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  src/ffb_driver.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git src/ffb_driver.c src/ffb_driver.c
> index af13484..7f17d64 100644
> --- src/ffb_driver.c
> +++ 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) {
> --
> 1.8.3
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel