diff options
| author | Rob Clark <rob@ti.com> | 2012-01-08 17:30:55 -0600 |
|---|---|---|
| committer | Rob Clark <rob@ti.com> | 2012-01-13 11:23:33 -0600 |
| commit | cb065caecaa1bb5690334cc91b8097039cb0dab9 (patch) | |
| tree | a3299e8350b6ba491ac05bb5e7c6957489c50a67 | |
| parent | 83f49e071aa75d229096fca8dba3644a79643006 (diff) | |
updates to build with 1.12.0 RC 1 xserver
Some PCI related refactorings.. also don't require DRI1 to be enabled.
| -rw-r--r-- | src/drmmode_display.c | 8 | ||||
| -rw-r--r-- | src/omap_driver.c | 2 | ||||
| -rw-r--r-- | src/omap_driver.h | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index b388452..99f5449 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -55,12 +55,6 @@ #define PPC_MMIO_IS_BE #include "compiler.h" -/* Drivers for PCI hardware need this */ -#include "xf86PciInfo.h" - -/* Drivers that need to access the PCI config space directly need this */ -#include "xf86Pci.h" - /* All drivers initialising the SW cursor need this */ #include "mipointer.h" @@ -1080,9 +1074,7 @@ static void page_flip_handler(int fd, unsigned int sequence, unsigned int tv_sec, unsigned int tv_usec, void *user_data) { -#ifdef XF86DRI OMAPDRI2SwapComplete(user_data); -#endif } static drmEventContext event_context = { diff --git a/src/omap_driver.c b/src/omap_driver.c index fdcd045..6bc1c28 100644 --- a/src/omap_driver.c +++ b/src/omap_driver.c @@ -860,11 +860,9 @@ OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen) } } -#ifdef XF86DRI if (pOMAP->dri) { OMAPDRI2CloseScreen(pScreen); } -#endif OMAPUnmapMem(pScrn); diff --git a/src/omap_driver.h b/src/omap_driver.h index 817de9b..f9d7e9f 100644 --- a/src/omap_driver.h +++ b/src/omap_driver.h @@ -54,10 +54,7 @@ #include "xf86Crtc.h" #include "xf86RandR12.h" #include "xf86drm.h" -#ifdef XF86DRI -#define _XF86DRI_SERVER_ #include "dri2.h" -#endif #include <omap_drm.h> #include <omap_drmif.h> @@ -250,11 +247,9 @@ Bool drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv); /** * DRI2 functions.. */ -#ifdef XF86DRI typedef struct _OMAPDRISwapCmd OMAPDRISwapCmd; Bool OMAPDRI2ScreenInit(ScreenPtr pScreen); void OMAPDRI2CloseScreen(ScreenPtr pScreen); void OMAPDRI2SwapComplete(OMAPDRISwapCmd *cmd); -#endif #endif /* OMAP_DRV_H_ */ |