diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2011-02-24 02:33:41 -0500 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2011-02-24 02:33:41 -0500 |
| commit | 04293a3a84acd96ccdf8e5e865cf973325ca43a1 (patch) | |
| tree | db55363d3122d57145a3544bc2b4c3827b3e0535 | |
| parent | 91070cfd75d5607c4a72ace780f830f0ddb40e84 (diff) | |
dri2: disable pageflipping for transformed displays
Based on Ben's nouveau patch.
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
| -rw-r--r-- | src/radeon_dri2.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index e8e16ff..66df03c 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -626,12 +626,21 @@ radeon_dri2_schedule_flip(ScrnInfoPtr scrn, ClientPtr client, } static Bool -can_exchange(DRI2BufferPtr front, DRI2BufferPtr back) +can_exchange(ScrnInfoPtr pScrn, + DRI2BufferPtr front, DRI2BufferPtr back) { struct dri2_buffer_priv *front_priv = front->driverPrivate; struct dri2_buffer_priv *back_priv = back->driverPrivate; PixmapPtr front_pixmap = front_priv->pixmap; PixmapPtr back_pixmap = back_priv->pixmap; + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); + int i; + + for (i = 0; i < xf86_config->num_crtc; i++) { + xf86CrtcPtr crtc = xf86_config->crtc[i]; + if (crtc->enabled && crtc->rotatedData) + return FALSE; + } if (front_pixmap->drawable.width != back_pixmap->drawable.width) return FALSE; @@ -712,7 +721,7 @@ void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, case DRI2_FLIP: if (info->allowPageFlip && DRI2CanFlip(drawable) && - can_exchange(event->front, event->back) && + can_exchange(scrn, event->front, event->back) && radeon_dri2_schedule_flip(scrn, event->client, drawable, @@ -727,7 +736,7 @@ void radeon_dri2_frame_event_handler(unsigned int frame, unsigned int tv_sec, /* else fall through to exchange/blit */ case DRI2_SWAP: if (DRI2CanExchange(drawable) && - can_exchange(event->front, event->back)) { + can_exchange(scrn, event->front, event->back)) { radeon_dri2_exchange_buffers(drawable, event->front, event->back); swap_type = DRI2_EXCHANGE_COMPLETE; } else { @@ -1075,7 +1084,7 @@ static int radeon_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, /* Flips need to be submitted one frame before */ if (info->allowPageFlip && DRI2CanFlip(draw) && - can_exchange(front, back)) { + can_exchange(scrn, front, back)) { swap_type = DRI2_FLIP; flip = 1; } |