From b1b6f64bde0215c13e22615553a79f433368af80 Mon Sep 17 00:00:00 2001
From: Yusuf Khan <yusisamerican@gmail.com>
Date: Fri, 19 Apr 2024 00:44:20 -0500
Subject: g80: dont set accelmethod to xaa when xaa is disabled

Signed-off-by: Yusuf Khan <yusisamerican@gmail.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv/-/merge_requests/15>
---
 src/g80_driver.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/g80_driver.c')

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 10b81db..b022159 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -281,9 +281,12 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
     }
     s = xf86GetOptValString(pNv->Options, OPTION_ACCEL_METHOD);
+#ifdef HAVE_XAA_H
     if(!s || !strcasecmp(s, "xaa"))
         pNv->AccelMethod = XAA;
-    else if(!strcasecmp(s, "exa"))
+    else
+#endif
+    if(!strcasecmp(s, "exa"))
         pNv->AccelMethod = EXA;
     else {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unrecognized AccelMethod "
-- 
cgit v1.2.3