diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:55:39 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:55:39 +1000 |
| commit | 9bc0096f9de4b85ca6d6a5db109e49c4364bcee7 (patch) | |
| tree | 36353d2b46503a799519c21709adfff063196a3e /src/i830_driver.c | |
| parent | 9a3b568d62a0b48f4a42ea5377740b2df1af432a (diff) | |
intel: since driver depends on newer server don't need to wrap this
drop resource/RAC interactions
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index f95160b2..f701231a 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. */ |