Explicitly keep track of whether a DRM event is for a flip or not

When an async flip is performed, and TearFree is enabled on the CRTC
used for timing, we schedule a vblank event for completing the page
flip. The DRM event queuing code treated this event like a vblank event,
but it needs to be treated like a page flip event.

Acked-by: Alex Deucher <alexander.deucher@amd.com>

6 files changed, 25 insertions, 37 deletions

diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
index 96b2d17..ff1b94a 100644
--- a/src/amdgpu_dri2.c
+++ b/src/amdgpu_dri2.c
@@ -981,7 +981,7 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
 
 	drm_queue_seq = amdgpu_drm_queue_alloc(crtc, client, AMDGPU_DRM_QUEUE_ID_DEFAULT,
 					       wait_info, amdgpu_dri2_frame_event_handler,
-					       amdgpu_dri2_frame_event_abort);
+					       amdgpu_dri2_frame_event_abort, FALSE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Allocating DRM queue event entry failed.\n");
@@ -1121,7 +1121,7 @@ static int amdgpu_dri2_schedule_swap(ClientPtr client, DrawablePtr draw,
 
 	drm_queue_seq = amdgpu_drm_queue_alloc(crtc, client, AMDGPU_DRM_QUEUE_ID_DEFAULT,
 					       swap_info, amdgpu_dri2_frame_event_handler,
-					       amdgpu_dri2_frame_event_abort);
+					       amdgpu_dri2_frame_event_abort, FALSE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Allocating DRM queue entry failed.\n");
diff --git a/src/amdgpu_drm_queue.c b/src/amdgpu_drm_queue.c
index 4b51d46..808941b 100644
--- a/src/amdgpu_drm_queue.c
+++ b/src/amdgpu_drm_queue.c
@@ -48,6 +48,7 @@ struct amdgpu_drm_queue_entry {
 	xf86CrtcPtr crtc;
 	amdgpu_drm_handler_proc handler;
 	amdgpu_drm_abort_proc abort;
+	Bool is_flip;
 	unsigned int frame;
 };
 
@@ -86,8 +87,8 @@ amdgpu_drm_abort_one(struct amdgpu_drm_queue_entry *e)
 }
 
 static void
-amdgpu_drm_queue_handler(struct xorg_list *signalled, unsigned int frame,
-			 unsigned int sec, unsigned int usec, void *user_ptr)
+amdgpu_drm_queue_handler(int fd, unsigned int frame, unsigned int sec,
+			 unsigned int usec, void *user_ptr)
 {
 	uintptr_t seq = (uintptr_t)user_ptr;
 	struct amdgpu_drm_queue_entry *e, *tmp;
@@ -102,35 +103,15 @@ amdgpu_drm_queue_handler(struct xorg_list *signalled, unsigned int frame,
 			xorg_list_del(&e->list);
 			e->usec = (uint64_t)sec * 1000000 + usec;
 			e->frame = frame;
-			xorg_list_append(&e->list, signalled);
+			xorg_list_append(&e->list, e->is_flip ?
+					 &amdgpu_drm_flip_signalled :
+					 &amdgpu_drm_vblank_signalled);
 			break;
 		}
 	}
 }
 
 /*
- * Signal a DRM page flip event
- */
-static void
-amdgpu_drm_page_flip_handler(int fd, unsigned int frame, unsigned int sec,
-			     unsigned int usec, void *user_ptr)
-{
-	amdgpu_drm_queue_handler(&amdgpu_drm_flip_signalled, frame, sec, usec,
-				 user_ptr);
-}
-
-/*
- * Signal a DRM vblank event
- */
-static void
-amdgpu_drm_vblank_handler(int fd, unsigned int frame, unsigned int sec,
-			  unsigned int usec, void *user_ptr)
-{
-	amdgpu_drm_queue_handler(&amdgpu_drm_vblank_signalled, frame, sec, usec,
-				 user_ptr);
-}
-
-/*
  * Handle deferred DRM vblank events
  *
  * This function must be called after amdgpu_drm_wait_pending_flip, once
@@ -162,7 +143,8 @@ uintptr_t
 amdgpu_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr client,
 		       uint64_t id, void *data,
 		       amdgpu_drm_handler_proc handler,
-		       amdgpu_drm_abort_proc abort)
+		       amdgpu_drm_abort_proc abort,
+		       Bool is_flip)
 {
 	struct amdgpu_drm_queue_entry *e;
 
@@ -180,6 +162,7 @@ amdgpu_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr client,
 	e->data = data;
 	e->handler = handler;
 	e->abort = abort;
+	e->is_flip = is_flip;
 
 	xorg_list_append(&e->list, &amdgpu_drm_queue);
 
@@ -306,8 +289,8 @@ amdgpu_drm_queue_init(ScrnInfoPtr scrn)
 	drmmode_ptr drmmode = &info->drmmode;
 
 	drmmode->event_context.version = 2;
-	drmmode->event_context.vblank_handler = amdgpu_drm_vblank_handler;
-	drmmode->event_context.page_flip_handler = amdgpu_drm_page_flip_handler;
+	drmmode->event_context.vblank_handler = amdgpu_drm_queue_handler;
+	drmmode->event_context.page_flip_handler = amdgpu_drm_queue_handler;
 
 	if (amdgpu_drm_queue_refcnt++)
 		return;
diff --git a/src/amdgpu_drm_queue.h b/src/amdgpu_drm_queue.h
index 4e7c8f4..72ab036 100644
--- a/src/amdgpu_drm_queue.h
+++ b/src/amdgpu_drm_queue.h
@@ -46,7 +46,8 @@ void amdgpu_drm_queue_handle_deferred(xf86CrtcPtr crtc);
 uintptr_t amdgpu_drm_queue_alloc(xf86CrtcPtr crtc, ClientPtr client,
 				 uint64_t id, void *data,
 				 amdgpu_drm_handler_proc handler,
-				 amdgpu_drm_abort_proc abort);
+				 amdgpu_drm_abort_proc abort,
+				 Bool is_flip);
 void amdgpu_drm_abort_client(ClientPtr client);
 void amdgpu_drm_abort_entry(uintptr_t seq);
 void amdgpu_drm_abort_id(uint64_t id);
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 5a5fee2..2622409 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -664,7 +664,8 @@ amdgpu_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
 					       AMDGPU_DRM_QUEUE_CLIENT_DEFAULT,
 					       AMDGPU_DRM_QUEUE_ID_DEFAULT, NULL,
 					       amdgpu_prime_scanout_update_handler,
-					       amdgpu_prime_scanout_update_abort);
+					       amdgpu_prime_scanout_update_abort,
+					       FALSE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "amdgpu_drm_queue_alloc failed for PRIME update\n");
@@ -712,7 +713,7 @@ amdgpu_prime_scanout_flip(PixmapDirtyUpdatePtr ent)
 					       AMDGPU_DRM_QUEUE_ID_DEFAULT,
 					       NULL,
 					       amdgpu_scanout_flip_handler,
-					       amdgpu_scanout_flip_abort);
+					       amdgpu_scanout_flip_abort, TRUE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Allocating DRM event queue entry failed for PRIME flip.\n");
@@ -940,7 +941,8 @@ amdgpu_scanout_update(xf86CrtcPtr xf86_crtc)
 					       AMDGPU_DRM_QUEUE_ID_DEFAULT,
 					       drmmode_crtc,
 					       amdgpu_scanout_update_handler,
-					       amdgpu_scanout_update_abort);
+					       amdgpu_scanout_update_abort,
+					       FALSE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "amdgpu_drm_queue_alloc failed for scanout update\n");
@@ -989,7 +991,7 @@ amdgpu_scanout_flip(ScreenPtr pScreen, AMDGPUInfoPtr info,
 					       AMDGPU_DRM_QUEUE_ID_DEFAULT,
 					       NULL,
 					       amdgpu_scanout_flip_handler,
-					       amdgpu_scanout_flip_abort);
+					       amdgpu_scanout_flip_abort, TRUE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Allocating DRM event queue entry failed.\n");
diff --git a/src/amdgpu_present.c b/src/amdgpu_present.c
index eabe0f3..f9e07a5 100644
--- a/src/amdgpu_present.c
+++ b/src/amdgpu_present.c
@@ -157,7 +157,8 @@ amdgpu_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc)
 					       AMDGPU_DRM_QUEUE_CLIENT_DEFAULT,
 					       event_id, event,
 					       amdgpu_present_vblank_handler,
-					       amdgpu_present_vblank_abort);
+					       amdgpu_present_vblank_abort,
+					       FALSE);
 	if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 		free(event);
 		return BadAlloc;
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 871a645..23c7349 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -3973,7 +3973,8 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
 		drm_queue_seq = amdgpu_drm_queue_alloc(crtc, client, id,
 						       flipdata,
 						       drmmode_flip_handler,
-						       drmmode_flip_abort);
+						       drmmode_flip_abort,
+						       TRUE);
 		if (drm_queue_seq == AMDGPU_DRM_QUEUE_ERROR) {
 			xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 				   "Allocating DRM queue event entry failed.\n");