b868c0fb32
- U_21-Refactor-radeon_mode_hotplug.patch U_22-Use-pRADEONEnt-to-find-both-screens-of-a-GPU-in-radeon_mode_hotplug.patch Fix enumeration of connectors per GPU (bsc#1008200). OBS-URL: https://build.opensuse.org/request/show/439508 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=54
98 lines
2.7 KiB
Diff
98 lines
2.7 KiB
Diff
From: Michel Dänzer <michel.daenzer@amd.com>
|
|
Date: Tue Nov 8 13:01:58 2016 +0900
|
|
Subject: [PATCH 1/2]Refactor radeon_mode_hotplug
|
|
Patch-mainline: Upstream
|
|
Git-repo: git://anongit.freedesktop.org/xorg/driver/xf86-video-ati
|
|
Git-commit: 35bec4937d89b48a79acfcb4f814b7370cb631b2
|
|
References: bsc#1008200
|
|
Signed-off-by: Max Staudt <mstaudt@suse.de>
|
|
|
|
Preparation for the next change, no functional change intended.
|
|
|
|
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
|
---
|
|
src/drmmode_display.c | 58 ++++++++++++++++++++++++++++++---------------------
|
|
1 file changed, 34 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
|
|
index 44615d3..574003c 100644
|
|
--- a/src/drmmode_display.c
|
|
+++ b/src/drmmode_display.c
|
|
@@ -2577,6 +2577,37 @@ Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn)
|
|
return TRUE;
|
|
}
|
|
|
|
+static Bool
|
|
+drmmode_find_output(ScrnInfoPtr scrn, int output_id, int *num_dvi,
|
|
+ int *num_hdmi)
|
|
+{
|
|
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < config->num_output; i++) {
|
|
+ xf86OutputPtr output = config->output[i];
|
|
+ drmmode_output_private_ptr drmmode_output = output->driver_private;
|
|
+
|
|
+ if (drmmode_output->output_id == output_id) {
|
|
+ switch(drmmode_output->mode_output->connector_type) {
|
|
+ case DRM_MODE_CONNECTOR_DVII:
|
|
+ case DRM_MODE_CONNECTOR_DVID:
|
|
+ case DRM_MODE_CONNECTOR_DVIA:
|
|
+ (*num_dvi)++;
|
|
+ break;
|
|
+ case DRM_MODE_CONNECTOR_HDMIA:
|
|
+ case DRM_MODE_CONNECTOR_HDMIB:
|
|
+ (*num_hdmi)++;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return TRUE;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return FALSE;
|
|
+}
|
|
+
|
|
void
|
|
radeon_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode)
|
|
{
|
|
@@ -2624,35 +2655,14 @@ restart_destroy:
|
|
|
|
for (s = 0; !found && s < xf86NumScreens; s++) {
|
|
ScrnInfoPtr loop_scrn = xf86Screens[s];
|
|
- xf86CrtcConfigPtr loop_config =
|
|
- XF86_CRTC_CONFIG_PTR(loop_scrn);
|
|
|
|
if (strcmp(loop_scrn->driverName, scrn->driverName) ||
|
|
RADEONEntPriv(loop_scrn) != pRADEONEnt)
|
|
continue;
|
|
|
|
- for (j = 0; !found && j < loop_config->num_output; j++) {
|
|
- xf86OutputPtr output = loop_config->output[j];
|
|
- drmmode_output_private_ptr drmmode_output;
|
|
-
|
|
- drmmode_output = output->driver_private;
|
|
- if (mode_res->connectors[i] ==
|
|
- drmmode_output->output_id) {
|
|
- found = TRUE;
|
|
-
|
|
- switch(drmmode_output->mode_output->connector_type) {
|
|
- case DRM_MODE_CONNECTOR_DVII:
|
|
- case DRM_MODE_CONNECTOR_DVID:
|
|
- case DRM_MODE_CONNECTOR_DVIA:
|
|
- num_dvi++;
|
|
- break;
|
|
- case DRM_MODE_CONNECTOR_HDMIA:
|
|
- case DRM_MODE_CONNECTOR_HDMIB:
|
|
- num_hdmi++;
|
|
- break;
|
|
- }
|
|
- }
|
|
- }
|
|
+ found = drmmode_find_output(loop_scrn,
|
|
+ mode_res->connectors[i],
|
|
+ &num_dvi, &num_hdmi);
|
|
}
|
|
if (found)
|
|
continue;
|