xf86-video-intel: src/i830_driver.c

[Dave Airlie]

 src/i830_driver.c |   12 ------------
 1 files changed, 12 deletions(-)

New commits:
diff-tree c7920a0e819308762fca3d6fc7ab194bd565b06a (from 37652b68880f1881b90bd22218cfe86eca7e5974)
Author: Dave Airlie <airlied at linux.ie>
Date:   Thu Jul 19 15:09:54 2007 +1000

    strip out remainder of drmmm code in driver

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 3e90eea..9bb12c6 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
 #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;