From: Michel Dänzer <michel.daenzer@xxxxxxx> Preparation for next change, no behaviour change intended. (Ported from amdgpu commit 04a5c5f7cfacad8d9ccffe81e388cc3da2036cb5) Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> --- src/drmmode_display.h | 2 +- src/radeon_kms.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/drmmode_display.h b/src/drmmode_display.h index 23460fdc0..27c23c1a4 100644 --- a/src/drmmode_display.h +++ b/src/drmmode_display.h @@ -88,7 +88,7 @@ typedef struct { Bool ignore_damage; RegionRec scanout_last_region; unsigned scanout_id; - Bool scanout_update_pending; + uintptr_t scanout_update_pending; Bool tear_free; PixmapPtr prime_scanout_pixmap; diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 72e60831e..cdda8962e 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -526,7 +526,7 @@ radeon_scanout_flip_abort(xf86CrtcPtr crtc, void *event_data) RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; - drmmode_crtc->scanout_update_pending = FALSE; + drmmode_crtc->scanout_update_pending = 0; drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, NULL); } @@ -611,7 +611,7 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) { drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; - drmmode_crtc->scanout_update_pending = FALSE; + drmmode_crtc->scanout_update_pending = 0; } void @@ -752,7 +752,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; radeon_prime_scanout_do_update(crtc, 0); - drmmode_crtc->scanout_update_pending = FALSE; + drmmode_crtc->scanout_update_pending = 0; } static void @@ -793,7 +793,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) return; } - drmmode_crtc->scanout_update_pending = TRUE; + drmmode_crtc->scanout_update_pending = drm_queue_seq; } static void @@ -851,7 +851,7 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) } drmmode_crtc->scanout_id = scanout_id; - drmmode_crtc->scanout_update_pending = TRUE; + drmmode_crtc->scanout_update_pending = drm_queue_seq; } static void @@ -1000,7 +1000,7 @@ radeon_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) { drmmode_crtc_private_ptr drmmode_crtc = event_data; - drmmode_crtc->scanout_update_pending = FALSE; + drmmode_crtc->scanout_update_pending = 0; } static void @@ -1077,7 +1077,7 @@ radeon_scanout_update(xf86CrtcPtr xf86_crtc) return; } - drmmode_crtc->scanout_update_pending = TRUE; + drmmode_crtc->scanout_update_pending = drm_queue_seq; } static void @@ -1144,7 +1144,7 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, } drmmode_crtc->scanout_id = scanout_id; - drmmode_crtc->scanout_update_pending = TRUE; + drmmode_crtc->scanout_update_pending = drm_queue_seq; } static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) -- 2.18.0