From 6c68869907bf3a07df0442c7d5464883410ef86c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 14 May 2024 17:58:43 -0700 Subject: Don't try to load xaa module if not compiled with XAA support Signed-off-by: Alan Coopersmith Part-of: --- src/g80_driver.c | 2 ++ src/nv_driver.c | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/g80_driver.c b/src/g80_driver.c index b022159..3af9dd9 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -434,9 +434,11 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) if(!pNv->NoAccel) { switch(pNv->AccelMethod) { +#ifdef HAVE_XAA_H case XAA: if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1; break; +#endif case EXA: if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1; break; diff --git a/src/nv_driver.c b/src/nv_driver.c index 150aac3..7ac0332 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -2088,8 +2088,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) /* Load XAA if needed */ if (!pNv->NoAccel) { - if (!xf86LoadSubModule(pScrn, "xaa")) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n"); +#ifdef HAVE_XAA_H + if (!xf86LoadSubModule(pScrn, "xaa")) +#endif + { + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); pNv->NoAccel = 1; pNv->ShadowFB = 1; } -- cgit v1.2.3