diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-14 17:58:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-14 18:04:59 -0700 |
| commit | 6c68869907bf3a07df0442c7d5464883410ef86c (patch) | |
| tree | 3e80b88c6e85db40063ed47114d068ff0025be7f | |
| parent | ea9736afb18573264264c6fa0b1e8d1b01c278c7 (diff) | |
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>
| -rw-r--r-- | src/g80_driver.c | 2 | ||||
| -rw-r--r-- | 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; } |