diff options
| -rw-r--r-- | src/msm-accel.c | 7 | ||||
| -rw-r--r-- | src/msm-driver.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/msm-accel.c b/src/msm-accel.c index 7cfb630..268437c 100644 --- a/src/msm-accel.c +++ b/src/msm-accel.c @@ -197,7 +197,7 @@ MSMSetupAccel(ScreenPtr pScreen) pMsm->pipe = fd_pipe_new(pMsm->dev, FD_PIPE_2D); #ifdef HAVE_XA - if (!pMsm->pipe) { + if (!pMsm->pipe && !pMsm->NoAccel) { struct fd_pipe *p; INFO_MSG("no 2D, trying 3D/XA"); @@ -235,6 +235,11 @@ no_xa: goto out; } + if (pMsm->NoAccel) { + INFO_MSG("Acceleration disabled in config file"); + softexa = TRUE; + } + pMsm->ring.context_bos[0] = fd_bo_new(pMsm->dev, 0x1000, DRM_FREEDRENO_GEM_TYPE_KMEM); pMsm->ring.context_bos[1] = fd_bo_new(pMsm->dev, 0x9000, diff --git a/src/msm-driver.c b/src/msm-driver.c index 88a60bd..620527f 100644 --- a/src/msm-driver.c +++ b/src/msm-driver.c @@ -243,6 +243,9 @@ MSMPreInit(ScrnInfoPtr pScrn, int flags) /* Determine if the user wants debug messages turned on: */ msmDebug = xf86ReturnOptValBool(pMsm->options, OPTION_DEBUG, FALSE); + /* NoAccel - default FALSE */ + pMsm->NoAccel = xf86ReturnOptValBool(pMsm->options, OPTION_NOACCEL, FALSE); + /* SWCursor - default FALSE */ pMsm->HWCursor = !xf86ReturnOptValBool(pMsm->options, OPTION_SWCURSOR, FALSE); |