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

[Michel Dänzer]

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

New commits:
commit c7cf00487cd6d4a5d0f39d5b92ff04f6420d6a32
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Nov 27 12:52:28 2015 +0900

    Build RandR 1.4 provider name from chipset name and bus ID
    
    Instead of just "radeon", it's now e.g. "KAVERI @ pci:0000:00:01.0".
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fa46d56..9880ee3 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -40,6 +40,10 @@
 #include "radeon_glamor.h"
 #include "radeon_reg.h"
 
+#ifdef RADEON_PIXMAP_SHARING
+#include <dri.h>
+#endif
+
 #include "drmmode_display.h"
 
 /* DPMS */
@@ -2070,6 +2074,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
 	int i, num_dvi = 0, num_hdmi = 0;
 	drmModeResPtr mode_res;
 	unsigned int crtcs_needed = 0;
+#ifdef RADEON_PIXMAP_SHARING
+	char *bus_id_string, *provider_name;
+#endif
 
 	xf86CrtcConfigInit(pScrn, &drmmode_xf86crtc_config_funcs);
 
@@ -2112,7 +2119,11 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
 	drmmode_clones_init(pScrn, drmmode, mode_res);
 
 #ifdef RADEON_PIXMAP_SHARING
-	xf86ProviderSetup(pScrn, NULL, "radeon");
+	bus_id_string = DRICreatePCIBusID(info->PciInfo);
+	XNFasprintf(&provider_name, "%s @ %s", pScrn->chipset, bus_id_string);
+	free(bus_id_string);
+	xf86ProviderSetup(pScrn, NULL, provider_name);
+	free(provider_name);
 #endif
 
 	xf86InitialConfiguration(pScrn, TRUE);
commit ff9a6b6f079a8419f4e6fadfee778060618bf735
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Dec 11 17:21:27 2015 +0900

    HAS_DIRTYTRACKING_ROTATION also supports multiple CRTCs
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 99dc08b..fa46d56 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -952,7 +952,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
 			if (max_height < iter->mode.VDisplay)
 				max_height = iter->mode.VDisplay;
 		}
-#ifndef HAS_DIRTYTRACKING2
+#if !defined(HAS_DIRTYTRACKING_ROTATION) && !defined(HAS_DIRTYTRACKING2)
 		if (iter != crtc) {
 			ErrorF("Cannot do multiple crtcs without X server dirty tracking 2 interface\n");
 			return FALSE;