xf86-video-intel: src/i810_driver.c src/i830_driver.c

[Dave Airlie]

 src/i810_driver.c |   13 -------------
 src/i830_driver.c |   17 -----------------
 2 files changed, 30 deletions(-)

New commits:
commit 9bc0096f9de4b85ca6d6a5db109e49c4364bcee7
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 28 13:55:39 2009 +1000

    intel: since driver depends on newer server don't need to wrap this
    
    drop resource/RAC interactions

diff --git a/src/i810_driver.c b/src/i810_driver.c
index 822236a..f158f5d 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -55,10 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
-#include "xf86Resources.h"
-#include "xf86RAC.h"
-#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
@@ -551,11 +547,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
 
    pI810->PciInfo = xf86GetPciInfoForEntity(pI810->pEnt->index);
 
-#ifndef XSERVER_LIBPCIACCESS
-   if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
-      return FALSE;
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-#endif
    /* Set pScrn->monitor */
    pScrn->monitor = pScrn->confScreen->monitor;
 
@@ -940,10 +931,6 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
 
    /*  We won't be using the VGA access after the probe */
    I810SetMMIOAccess(pI810);
-#ifndef XSERVER_LIBPCIACCESS
-   xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
-   xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
-#endif
    return TRUE;
 }
 
diff --git a/src/i830_driver.c b/src/i830_driver.c
index f95160b..f701231 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -51,10 +51,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#ifndef XSERVER_LIBPCIACCESS
-#include "xf86Resources.h"
-#include "xf86RAC.h"
-#endif
 #include "xf86Priv.h"
 #include "xf86cmap.h"
 #include "compiler.h"
@@ -1542,15 +1538,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
    if (!i830_open_drm_master(pScrn))
        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to become DRM master.\n");
 
-
-#ifndef XSERVER_LIBPCIACCESS
-   if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
-      PreInitCleanup(pScrn);
-      return FALSE;
-   }
-
-   pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
-#endif
    pScrn->monitor = pScrn->confScreen->monitor;
    pScrn->progClock = TRUE;
    pScrn->rgbBits = 8;
@@ -1636,10 +1623,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
 
        /*  We won't be using the VGA access after the probe. */
        I830SetMMIOAccess(pI830);
-#ifndef XSERVER_LIBPCIACCESS
-       xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
-       xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
-#endif
    }
 
    /* Load the dri2 module if requested. */