summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-11-27 12:52:28 +0900
committerMichel Dänzer <michel@daenzer.net>2015-12-25 12:47:32 +0900
commitc7cf00487cd6d4a5d0f39d5b92ff04f6420d6a32 (patch)
treee4a362949a497016b7a31ebed1ed19d743a5c840
parentff9a6b6f079a8419f4e6fadfee778060618bf735 (diff)
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@amd.com>
-rw-r--r--src/drmmode_display.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index fa46d56a..9880ee37 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);