xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/amdgpu_drm_queue.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ca5eb9894fff153c0a1df7bdc4a4745713309e27
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Aug 29 18:50:45 2018 +0200

    Bail early from drm_wait_pending_flip if there's no pending flip
    
    No need to process any events in that case.
    
    v2:
    * Re-check drmmode_crtc->flip_pending after processing each event

diff --git a/src/amdgpu_drm_queue.c b/src/amdgpu_drm_queue.c
index ba841d1..0353562 100644
--- a/src/amdgpu_drm_queue.c
+++ b/src/amdgpu_drm_queue.c
@@ -284,7 +284,8 @@ void amdgpu_drm_wait_pending_flip(xf86CrtcPtr crtc)
 
 	drmmode_crtc->wait_flip_nesting_level++;
 
-	while (!xorg_list_is_empty(&amdgpu_drm_flip_signalled)) {
+	while (drmmode_crtc->flip_pending &&
+	       !xorg_list_is_empty(&amdgpu_drm_flip_signalled)) {
 		e = xorg_list_first_entry(&amdgpu_drm_flip_signalled,
 					  struct amdgpu_drm_queue_entry, list);
 		amdgpu_drm_queue_handle_one(e);