xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

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

New commits:
commit e90721ba654d70db5eeb1cf552308c73151530ee
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Jun 27 18:13:05 2017 +0900

    Only call drmmode_scanout_free for non-GPU screens in LeaveVT
    
    Destroying the scanout buffers of GPU screens resulted in a crash when
    switching back to the Xorg VT.
    
    Fixes: b10ecdbd89b0 ("Use drmmode_crtc_scanout_* helpers for RandR 1.4
                          scanout pixmaps")
    (Ported from radeon commit c9dd28cb0c9c3de676eadac61e727732510f6b9b)
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 143294a..b625250 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1975,7 +1975,8 @@ void AMDGPULeaveVT_KMS(VT_FUNC_ARGS_DECL)
 	amdgpu_drop_drm_master(pScrn);
 
 	xf86RotateFreeShadow(pScrn);
-	drmmode_scanout_free(pScrn);
+	if (!pScrn->is_gpu)
+		drmmode_scanout_free(pScrn);
 
 	xf86_hide_cursors(pScrn);