diff options
| author | Tom St Denis <tom.stdenis@amd.com> | 2015-10-05 10:37:50 -0400 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-10-06 16:47:22 +0900 |
| commit | bac21dfc8e60a07f08158b13fab1f3a9b9d27d1b (patch) | |
| tree | f711b54a27ac314fda5cd03c6bff3c0900d774c2 /src/amdgpu_dri2.c | |
| parent | a5f7f2e68bad1935f5ad52286033237467f77302 (diff) | |
Don't attempt a DRI2/Present page flip while the other one is flipping
Based on radeon commit 49f5b0bc301414df049e00d226034e3d6e56421b
Fixes corrupted display and hangs when switching between DRI2 and DRI3
fullscreen apps, e.g. a compositor using DRI3 and a fullscreen app using
DRI2 or vice versa.
Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/amdgpu_dri2.c')
| -rw-r--r-- | src/amdgpu_dri2.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c index 1370551..756d6ad 100644 --- a/src/amdgpu_dri2.c +++ b/src/amdgpu_dri2.c @@ -528,6 +528,7 @@ static void amdgpu_dri2_flip_event_handler(ScrnInfoPtr scrn, uint32_t frame, uint64_t usec, void *event_data) { + AMDGPUInfoPtr info = AMDGPUPTR(scrn); DRI2FrameEventPtr flip = event_data; unsigned tv_sec, tv_usec; DrawablePtr drawable; @@ -572,6 +573,7 @@ amdgpu_dri2_flip_event_handler(ScrnInfoPtr scrn, uint32_t frame, uint64_t usec, DRI2SwapComplete(flip->client, drawable, frame, tv_sec, tv_usec, DRI2_FLIP_COMPLETE, flip->event_complete, flip->event_data); + info->drmmode.dri2_flipping = FALSE; break; default: xf86DrvMsg(scrn->scrnIndex, X_WARNING, @@ -590,6 +592,7 @@ amdgpu_dri2_schedule_flip(ScrnInfoPtr scrn, ClientPtr client, DRI2BufferPtr back, DRI2SwapEventPtr func, void *data, unsigned int target_msc) { + AMDGPUInfoPtr info = AMDGPUPTR(scrn); struct dri2_buffer_priv *back_priv; struct amdgpu_buffer *bo = NULL; DRI2FrameEventPtr flip_info; @@ -616,10 +619,14 @@ amdgpu_dri2_schedule_flip(ScrnInfoPtr scrn, ClientPtr client, back_priv = back->driverPrivate; bo = amdgpu_get_pixmap_bo(back_priv->pixmap); - return amdgpu_do_pageflip(scrn, client, bo, AMDGPU_DRM_QUEUE_ID_DEFAULT, - flip_info, ref_crtc_hw_id, - amdgpu_dri2_flip_event_handler, - amdgpu_dri2_flip_event_abort); + if (amdgpu_do_pageflip(scrn, client, bo, AMDGPU_DRM_QUEUE_ID_DEFAULT, + flip_info, ref_crtc_hw_id, + amdgpu_dri2_flip_event_handler, + amdgpu_dri2_flip_event_abort)) { + info->drmmode.dri2_flipping = TRUE; + return TRUE; + } + return FALSE; } static Bool update_front(DrawablePtr draw, DRI2BufferPtr front) @@ -698,8 +705,11 @@ static Bool can_flip(ScrnInfoPtr pScrn, DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPtr back) { + AMDGPUInfoPtr info = AMDGPUPTR(pScrn); + return draw->type == DRAWABLE_WINDOW && - AMDGPUPTR(pScrn)->allowPageFlip && + info->allowPageFlip && + !info->drmmode.present_flipping && pScrn->vtSema && DRI2CanFlip(draw) && can_exchange(pScrn, draw, front, back); } |