xf86-video-amdgpu: Branch 'master'

[GitLab Mirror]

 src/drmmode_display.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f6cd72e64e85896b6d155bee0930e59771dcb701
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Aug 16 16:31:01 2018 +0200

    Use correct FB handle in amdgpu_do_pageflip
    
    We were always using the handle of the client provided FB, which
    prevented RandR transforms from working, and could result in a black
    screen.
    
    Fixes: 9b6782c821e0 "Store FB for each CRTC in drmmode_flipdata_rec"
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 9919c09..46be29d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -3958,7 +3958,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
 		if (crtc == ref_crtc) {
 			if (drmmode_page_flip_target_absolute(pAMDGPUEnt,
 							      drmmode_crtc,
-							      fb->handle,
+							      flipdata->fb[i]->handle,
 							      flip_flags,
 							      drm_queue_seq,
 							      target_msc) != 0)
@@ -3966,7 +3966,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
 		} else {
 			if (drmmode_page_flip_target_relative(pAMDGPUEnt,
 							      drmmode_crtc,
-							      fb->handle,
+							      flipdata->fb[i]->handle,
 							      flip_flags,
 							      drm_queue_seq, 0) != 0)
 				goto flip_error;