diff options
Diffstat (limited to 'src/amdgpu_kms.c')
| -rw-r--r-- | src/amdgpu_kms.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index cc64eb5..2355a89 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -902,7 +902,9 @@ static void amdgpu_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t usec, void *event_data) { - amdgpu_scanout_do_update(crtc, 0); + drmmode_crtc_private_ptr drmmode_crtc = event_data; + + amdgpu_scanout_do_update(crtc, drmmode_crtc->scanout_id); amdgpu_scanout_update_abort(crtc, event_data); } @@ -921,7 +923,6 @@ amdgpu_scanout_update(xf86CrtcPtr xf86_crtc) if (!xf86_crtc->enabled || drmmode_crtc->scanout_update_pending || - !drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap || drmmode_crtc->pending_dpms_mode != DPMSModeOn) return; @@ -1023,9 +1024,17 @@ amdgpu_scanout_flip(ScreenPtr pScreen, AMDGPUInfoPtr info, if (drmmode_page_flip_target_relative(pAMDGPUEnt, drmmode_crtc, drmmode_crtc->flip_pending->handle, 0, drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", + xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s, " + "TearFree inactive until next modeset\n", __func__, strerror(errno)); amdgpu_drm_abort_entry(drm_queue_seq); + RegionCopy(DamageRegion(drmmode_crtc->scanout_damage), + &drmmode_crtc->scanout_last_region); + RegionEmpty(&drmmode_crtc->scanout_last_region); + amdgpu_scanout_update(xf86_crtc); + drmmode_crtc_scanout_destroy(drmmode_crtc->drmmode, + &drmmode_crtc->scanout[scanout_id]); + drmmode_crtc->tear_free = FALSE; return; } @@ -1071,11 +1080,7 @@ static void AMDGPUBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) if (drmmode_crtc->tear_free) amdgpu_scanout_flip(pScreen, info, crtc); - else if (info->shadow_primary -#if XF86_CRTC_VERSION >= 4 - || crtc->driverIsPerformingTransform -#endif - ) + else if (drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap) amdgpu_scanout_update(crtc); } } |