diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:30 +1000 |
| commit | a7c9dd7039005cc656108d00c95fc7eb75b74642 (patch) | |
| tree | f9362696327f13847474b38be4a6545297a71810 | |
| parent | f74a51285651c2eea31efb43734600b79caa0507 (diff) | |
glint: update for resources/RAC API removal
| -rw-r--r-- | src/glint_driver.c | 8 | ||||
| -rw-r--r-- | src/glint_shadow.c | 1 | ||||
| -rw-r--r-- | src/pm3_video.c | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/glint_driver.c b/src/glint_driver.c index efb624f..78caa87 100644 --- a/src/glint_driver.c +++ b/src/glint_driver.c @@ -42,8 +42,10 @@ #include "xf86cmap.h" #include "shadowfb.h" #include "fbdevhw.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86int10.h" #include "dixstruct.h" #include "vbe.h" @@ -934,12 +936,13 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } +#ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVga, pGlint->pEnt->index, ResDisableOpr); /* Operations for which memory access is required. */ pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; /* @@ -1266,6 +1269,7 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) pGlint->irq = pGlint->pEnt->device->irq; +#ifndef XSERVER_LIBPCIACCESS /* Register all entities */ for (i = 0; i < pScrn->numEntities; i++) { EntityInfoPtr pEnt; @@ -1276,8 +1280,10 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } } +#endif } + #if !defined(__sparc__) /* Initialize the card through int10 interface if needed */ if (pGlint->Chipset != PCI_VENDOR_3DLABS_CHIP_GAMMA && diff --git a/src/glint_shadow.c b/src/glint_shadow.c index a0a9819..6b36a1b 100644 --- a/src/glint_shadow.c +++ b/src/glint_shadow.c @@ -12,7 +12,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "xf86PciInfo.h" #include "xf86Pci.h" #include "glint.h" diff --git a/src/pm3_video.c b/src/pm3_video.c index 6f07ed3..f0d34a9 100644 --- a/src/pm3_video.c +++ b/src/pm3_video.c @@ -30,7 +30,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86Resources.h" #include "compiler.h" #include "xf86PciInfo.h" #include "xf86Pci.h" |