xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/amdgpu_dri2.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit fb06fb814700a47464abd756e1111dcc76d0d776
Author: Flora Cui <flora.cui at amd.com>
Date:   Wed May 29 14:18:50 2019 +0800

    dri2: reply to client for WaitMSC request in any case
    
    otherwise client would wait for reply forever and desktop appears hang.
    
    Signed-off-by: Flora Cui <flora.cui at amd.com>
    Acked-by: Feifei Xu <Feifei.Xu at amd.com>
    Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c
index 44316ac..d205428 100644
--- a/src/amdgpu_dri2.c
+++ b/src/amdgpu_dri2.c
@@ -1062,6 +1062,9 @@ static int amdgpu_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw,
 out_complete:
 	if (wait_info)
 		amdgpu_dri2_deferred_event(NULL, 0, wait_info);
+	else
+		DRI2WaitMSCComplete(client, draw, 0, 0, 0);
+
 	return TRUE;
 }