[patch] Patch to not call NEO_Sync without XAA

0001-Don-t-call-NEO_Sync-with-no-XAA.patch (text/plain), 1.66 KB, created by Matt Turner on 2012-09-09 20:14:28 UTC

From e566693e979adfdedb639e33f3e2ce7a8f6766a6 Mon Sep 17 00:00:00 2001
From: Matt Turner <[e-mail]>
Date: Sun, 9 Sep 2012 13:10:24 -0700
Subject: [PATCH] Don't call NEO_Sync with no XAA

The commit that makes XAA optional left a use of NEO_Sync while putting
the body inside an #ifdef HAVE_XAA_H block, which caused undefined
symbol errors when loading the driver. NEO_Sync doesn't do anything
without XAA, so don't bother calling it without XAA.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=434468
---
 src/neo_dga.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/neo_dga.c b/src/neo_dga.c
index b6346c5..8ea31a9 100644
--- a/src/neo_dga.c
+++ b/src/neo_dga.c
@@ -38,10 +38,10 @@
 static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
 					int *, int *, int *);
 static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr);
-static void NEO_Sync(ScrnInfoPtr);
 static int  NEO_GetViewport(ScrnInfoPtr);
 static void NEO_SetViewport(ScrnInfoPtr, int, int, int);
 #ifdef HAVE_XAA_H
+static void NEO_Sync(ScrnInfoPtr);
 static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
 static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
 #if 0
@@ -57,8 +57,8 @@ DGAFunctionRec NEODGAFuncs = {
    NEO_SetMode,
    NEO_SetViewport,
    NEO_GetViewport,
-   NEO_Sync,
 #ifdef HAVE_XAA_H
+   NEO_Sync,
    NEO_FillRect,
    NEO_BlitRect,
 #if 0
@@ -219,17 +219,14 @@ NEO_FillRect (
     }
 }
 
-
 static void 
 NEO_Sync(
    ScrnInfoPtr pScrn
 ){
     NEOPtr pNEO = NEOPTR(pScrn);
-#ifdef HAVE_XAA_H
     if(pNEO->AccelInfoRec) {
 	(*pNEO->AccelInfoRec->Sync)(pScrn);
     }
-#endif
 }
 
 static void 
-- 
1.7.8.6