diff options
| author | Owain G. Ainsworth <oga@openbsd.org> | 2010-06-22 21:32:09 +0100 |
|---|---|---|
| committer | Owain G. Ainsworth <oga@openbsd.org> | 2010-06-22 21:32:09 +0100 |
| commit | 043b167efbcf0e0084928bddeaf451f3ac4d280b (patch) | |
| tree | 58098110d893d82126ca55d060c7fe281102aa29 | |
| parent | b4f1021db7eb847f080116437c4f11554c6c304b (diff) | |
Temporarily disable the pageflipping stuff. It isn't 100% on ironlake
yet, and apparently vblanks vanishing on 945 is still common on linux
(and openbsd).
conditional enabling will probably happen soonish...
| -rw-r--r-- | src/i830.h | 2 | ||||
| -rw-r--r-- | src/i830_dri.c | 4 | ||||
| -rw-r--r-- | src/i830_driver.c | 4 |
3 files changed, 10 insertions, 0 deletions
@@ -644,7 +644,9 @@ typedef struct intel_screen_private { Bool directRenderingOpen; int drmSubFD; +#ifdef notyet drmEventContext event_context; +#endif char *deviceName; /* Broken-out options. */ diff --git a/src/i830_dri.c b/src/i830_dri.c index eadb25b8..ab895df7 100644 --- a/src/i830_dri.c +++ b/src/i830_dri.c @@ -486,6 +486,7 @@ I830DRI2ExchangeBuffers(DrawablePtr draw, DRI2BufferPtr front, } } +#ifdef notyet void I830DRI2FrameEventHandler(unsigned int frame, unsigned int tv_sec, unsigned int tv_usec, void *event_data) { @@ -933,6 +934,7 @@ out_complete: return TRUE; } #endif +#endif Bool I830DRI2ScreenInit(ScreenPtr screen) { @@ -985,6 +987,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) info.CopyRegion = I830DRI2CopyRegion; #if DRI2INFOREC_VERSION >= 4 +#ifdef notyet info.version = 4; info.ScheduleSwap = I830DRI2ScheduleSwap; info.GetMSC = I830DRI2GetMSC; @@ -993,6 +996,7 @@ Bool I830DRI2ScreenInit(ScreenPtr screen) info.driverNames = driverNames; driverNames[0] = info.driverName; #endif +#endif return DRI2ScreenInit(screen, &info); } diff --git a/src/i830_driver.c b/src/i830_driver.c index ec1e3edd..af57830d 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1342,6 +1342,7 @@ static void i830_check_dri_option(ScrnInfoPtr scrn) } } +#ifdef notyet static void drm_vblank_handler(int fd, unsigned int frame, unsigned int tv_sec, unsigned int tv_usec, void *event_data) @@ -1358,6 +1359,7 @@ drm_wakeup_handler(pointer data, int err, pointer p) if (err >= 0 && FD_ISSET(intel->drmSubFD, read_mask)) drmHandleEvent(intel->drmSubFD, &intel->event_context); } +#endif static Bool i830_user_modesetting_init(ScrnInfoPtr scrn) { @@ -1393,11 +1395,13 @@ static Bool i830_user_modesetting_init(ScrnInfoPtr scrn) RestoreHWState(scrn); intel->stolen_size = I830DetectMemory(scrn); +#ifdef notyet intel->event_context.version = DRM_EVENT_CONTEXT_VERSION; intel->event_context.vblank_handler = drm_vblank_handler; AddGeneralSocket(intel->drmSubFD); RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, drm_wakeup_handler, intel); +#endif return TRUE; |