Attachment 127829 Details for Bug 98626 – Refactor radeon_mode_hotplug

[patch] Refactor radeon_mode_hotplug

0001-Refactor-radeon_mode_hotplug.patch (text/plain), 2.59 KB, created by Michel Dänzer on 2016-11-08 07:47:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-11-08 07:47:16 UTC

Size: 2.59 KB

patch

obsolete

>From ce3e2c11ba13de2908a26a0426fe4572c87032ca Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Tue, 8 Nov 2016 13:01:58 +0900
>Subject: [PATCH xf86-video-ati 1/2] Refactor radeon_mode_hotplug
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> 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 28b932e..fd5c80e 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -2543,6 +2543,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)
> {
>@@ -2590,35 +2621,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;
>-- 
>2.10.2
>

Actions: View | Splinter Review

Attachments on bug 98626: 127814 | 127829 | 127830

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.