xf86-video-ati: Branch 'master' - 2 commits

[Michel Dänzer]

 src/radeon_kms.c   |    3 ++-
 src/radeon_probe.c |    5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit c9dd28cb0c9c3de676eadac61e727732510f6b9b
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jun 22 12:38:55 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: 4cfa4615f79f ("Use drmmode_crtc_scanout_* helpers for RandR 1.4
                          scanout pixmaps")
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index c4bdfcfa..5637e7f8 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -2478,7 +2478,8 @@ void RADEONLeaveVT_KMS(VT_FUNC_ARGS_DECL)
     radeon_drop_drm_master(pScrn);
 
     xf86RotateFreeShadow(pScrn);
-    drmmode_scanout_free(pScrn);
+    if (!pScrn->is_gpu)
+	drmmode_scanout_free(pScrn);
 
     xf86_hide_cursors (pScrn);
     info->accel_state->XInited3D = FALSE;
commit 78fad9ca1635cca04b89807e3db029477cf46681
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon Jun 26 18:58:30 2017 +0900

    Include xf86Pci.h for DRICreatePCIBusID with xserver Git master
    
    The declaration has been moved there from dri.h.
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/radeon_probe.c b/src/radeon_probe.c
index aaace2b5..19295f00 100644
--- a/src/radeon_probe.c
+++ b/src/radeon_probe.c
@@ -48,7 +48,12 @@
 #include "xf86.h"
 
 #include "xf86drmMode.h"
+
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,19,99,1,0)
+#include <xf86Pci.h>
+#else
 #include "dri.h"
+#endif
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <xf86_OSproc.h>