Attachment 122886 Details for Bug 93415 – Handle Zaphod mode correctly in radeon_mode_hotplug

[patch] Handle Zaphod mode correctly in radeon_mode_hotplug

0001-Handle-Zaphod-mode-correctly-in-radeon_mode_hotplug.patch (text/plain), 2.67 KB, created by Michel Dänzer on 2016-04-13 02:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-04-13 02:15:43 UTC

Size: 2.67 KB

patch

obsolete

>From 6c68a7ff8bb8947f74e3d2aa828309247b31f249 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Wed, 13 Apr 2016 11:12:38 +0900
>Subject: [PATCH xf86-video-ati] Handle Zaphod mode correctly in
> radeon_mode_hotplug
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> src/drmmode_display.c | 45 +++++++++++++++++++++++++++++++++++----------
> 1 file changed, 35 insertions(+), 10 deletions(-)
>
>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index bf0db4c..15a3842 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -36,6 +36,7 @@
> #include "damagestr.h"
> #include "micmap.h"
> #include "xf86cmap.h"
>+#include "xf86Priv.h"
> #include "radeon.h"
> #include "radeon_bo_helper.h"
> #include "radeon_glamor.h"
>@@ -2516,10 +2517,12 @@ void
> radeon_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode)
> {
> 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
>+	RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn);
> 	drmModeResPtr mode_res;
>-	int i, j;
>+	int i, j, s;
> 	Bool found;
> 	Bool changed = FALSE;
>+	int num_dvi = 0, num_hdmi = 0;
> 
> 	mode_res = drmModeGetResources(drmmode->fd);
> 	if (!mode_res)
>@@ -2555,21 +2558,43 @@ restart_destroy:
> 	for (i = 0; i < mode_res->count_connectors; i++) {
> 		found = FALSE;
> 
>-		for (j = 0; j < config->num_output; j++) {
>-			xf86OutputPtr output = config->output[j];
>-			drmmode_output_private_ptr drmmode_output;
>+		for (s = 0; !found && s < xf86NumScreens; s++) {
>+			ScrnInfoPtr loop_scrn = xf86Screens[s];
>+			xf86CrtcConfigPtr loop_config =
>+				XF86_CRTC_CONFIG_PTR(loop_scrn);
> 
>-			drmmode_output = output->driver_private;
>-			if (mode_res->connectors[i] == drmmode_output->output_id) {
>-				found = TRUE;
>-				break;
>+			if (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;
>+					}
>+				}
> 			}
> 		}
> 		if (found)
> 			continue;
> 
>-		changed = TRUE;
>-		drmmode_output_init(scrn, drmmode, mode_res, i, NULL, NULL, 1);
>+		if (drmmode_output_init(scrn, drmmode, mode_res, i, &num_dvi,
>+					&num_hdmi, 1) != 0)
>+			changed = TRUE;
> 	}
> 
> 	if (changed) {
>-- 
>2.8.0.rc3
>

Actions: View | Splinter Review

Attachments on bug 93415: 120553 | 122886

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.