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

[Dave Airlie]

 src/i810_driver.c |    8 ++++++--
 src/i830_driver.c |    6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 9a3b568d62a0b48f4a42ea5377740b2df1af432a
Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jul 28 13:32:30 2009 +1000

    intel: update for resources/RAC API removal

diff --git a/src/i810_driver.c b/src/i810_driver.c
index 4b8c459..822236a 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -55,8 +55,10 @@ 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"
@@ -549,10 +551,11 @@ 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;
 
@@ -937,9 +940,10 @@ 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 33079fe..f95160b 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -51,8 +51,10 @@ 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"
@@ -1541,12 +1543,14 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
        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;
@@ -1632,8 +1636,10 @@ 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. */