Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: since driver depends on newer server don't need to wrap this 

drop resource/RAC interactions
This commit is contained in:
Dave Airlie 2009-07-28 13:55:39 +10:00
parent 9a3b568d62
commit 9bc0096f9d
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/i810_driver.c
View File

@ -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;
}

17
src/i830_driver.c
View File

@ -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. */