Don't try to load xaa module if not compiled with XAA support

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv/-/merge_requests/22>
This commit is contained in:
Alan Coopersmith
2024-05-14 17:58:43 -07:00
parent ea9736afb1
commit 6c68869907
2 changed files with 7 additions and 2 deletions

View File

@@ -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;

View File

@@ -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;
}