xf86-video-nv: src/g80_driver.c

[GitLab Mirror]

 src/g80_driver.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1e72f5804433382683790441d84312bfcb8c0cfe
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jul 20 12:21:16 2025 -0700

    g80: Avoid segfault if AccelMethod isn't set and XAA isn't built
    
    Fixes: b1b6f64 ("g80: dont set accelmethod to xaa when xaa is disabled")
    Reviewed-by: Yusuf Khan <yusisamerican at gmail.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv/-/merge_requests/27>

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 3af9dd9..f6f4a63 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -284,9 +284,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
 #ifdef HAVE_XAA_H
     if(!s || !strcasecmp(s, "xaa"))
         pNv->AccelMethod = XAA;
-    else
+    else if(!strcasecmp(s, "exa"))
+#else
+    if(!s || !strcasecmp(s, "exa"))
 #endif
-    if(!strcasecmp(s, "exa"))
         pNv->AccelMethod = EXA;
     else {
         xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unrecognized AccelMethod "