diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-07-19 15:09:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-07-19 15:09:54 +1000 |
| commit | c7920a0e819308762fca3d6fc7ab194bd565b06a (patch) | |
| tree | 626096fe29188082e3ce4926ef29c0512dc6e012 | |
| parent | 37652b68880f1881b90bd22218cfe86eca7e5974 (diff) | |
strip out remainder of drmmm code in driver
| -rw-r--r-- | src/i830_driver.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 3e90eeab..9bb12c6b 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -2863,11 +2863,7 @@ I830LeaveVT(int scrnIndex, int flags) DRILock(screenInfo.screens[pScrn->scrnIndex], 0); #ifdef XF86DRI_MM if (pI830->mmModeFlags & I830_KERNEL_MM) { -#ifndef XSERVER_LIBDRM_MM - I830DrmMMLock(pI830->drmSubFD, DRM_BO_MEM_TT); -#else drmMMLock(pI830->drmSubFD, DRM_BO_MEM_TT); -#endif } #endif /* XF86DRI_MM */ I830DRISetVBlankInterrupt (pScrn, FALSE); @@ -2972,11 +2968,7 @@ I830EnterVT(int scrnIndex, int flags) #ifdef XF86DRI_MM if (pI830->mmModeFlags & I830_KERNEL_MM) { -#ifndef XSERVER_LIBDRM_MM - I830DrmMMUnlock(pI830->drmSubFD, DRM_BO_MEM_TT); -#else drmMMUnlock(pI830->drmSubFD, DRM_BO_MEM_TT); -#endif } #endif /* XF86DRI_MM */ @@ -3035,11 +3027,7 @@ I830CloseScreen(int scrnIndex, ScreenPtr pScreen) #endif #ifdef XF86DRI_MM if (pI830->mmModeFlags & I830_KERNEL_MM) { -#ifndef XSERVER_LIBDRM_MM - I830DrmMMTakedown(pI830->drmSubFD, DRM_BO_MEM_TT); -#else drmMMTakedown(pI830->drmSubFD, DRM_BO_MEM_TT); -#endif } #endif /* XF86DRI_MM */ pI830->directRenderingOpen = FALSE; |