Attachment 127830 Details for Bug 98626 – Fix radeon_mode_hotplug for GPU screens

[patch] Fix radeon_mode_hotplug for GPU screens

0002-Fix-radeon_mode_hotplug-for-GPU-screens.patch (text/plain), 2.74 KB, created by Michel Dänzer on 2016-11-08 07:48:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-11-08 07:48:08 UTC

Size: 2.74 KB

patch

obsolete

>From 9fdb3587db19582876bddd26a58c1f02b5b3dde5 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:02:43 +0900
>Subject: [PATCH xf86-video-ati 2/2] Fix radeon_mode_hotplug for GPU screens
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>---
> src/drmmode_display.c | 23 ++++++++---------------
> src/radeon_kms.c      |  5 +++++
> src/radeon_probe.h    |  2 ++
> 3 files changed, 15 insertions(+), 15 deletions(-)
>
>diff --git a/src/drmmode_display.c b/src/drmmode_display.c
>index fd5c80e..070979d 100644
>--- a/src/drmmode_display.c
>+++ b/src/drmmode_display.c
>@@ -2580,7 +2580,7 @@ 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, s;
>+	int i, j;
> 	Bool found;
> 	Bool changed = FALSE;
> 	int num_dvi = 0, num_hdmi = 0;
>@@ -2617,20 +2617,13 @@ restart_destroy:
> 
> 	/* find new output ids we don't have outputs for */
> 	for (i = 0; i < mode_res->count_connectors; i++) {
>-		found = FALSE;
>-
>-		for (s = 0; !found && s < xf86NumScreens; s++) {
>-			ScrnInfoPtr loop_scrn = xf86Screens[s];
>-
>-			if (strcmp(loop_scrn->driverName, scrn->driverName) ||
>-			    RADEONEntPriv(loop_scrn) != pRADEONEnt)
>-				continue;
>-
>-			found = drmmode_find_output(loop_scrn,
>-						    mode_res->connectors[i],
>-						    &num_dvi, &num_hdmi);
>-		}
>-		if (found)
>+		if (drmmode_find_output(pRADEONEnt->primary_scrn,
>+					mode_res->connectors[i],
>+					&num_dvi, &num_hdmi) ||
>+		    (pRADEONEnt->secondary_scrn &&
>+		     drmmode_find_output(pRADEONEnt->secondary_scrn,
>+					 mode_res->connectors[i],
>+					 &num_dvi, &num_hdmi)))
> 			continue;
> 
> 		if (drmmode_output_init(scrn, drmmode, mode_res, i, &num_dvi,
>diff --git a/src/radeon_kms.c b/src/radeon_kms.c
>index 6927f58..ee2becd 100644
>--- a/src/radeon_kms.c
>+++ b/src/radeon_kms.c
>@@ -1659,6 +1659,11 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)
>         }
>     }
> 
>+    if (info->IsSecondary)
>+	pRADEONEnt->secondary_scrn = pScrn;
>+    else
>+	pRADEONEnt->primary_scrn = pScrn;
>+
>     info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
>     pScrn->monitor     = pScrn->confScreen->monitor;
> 
>diff --git a/src/radeon_probe.h b/src/radeon_probe.h
>index 258c7be..573d988 100644
>--- a/src/radeon_probe.h
>+++ b/src/radeon_probe.h
>@@ -139,6 +139,8 @@ typedef struct
>     unsigned long     fd_wakeup_registered; /* server generation for which fd has been registered for wakeup handling */
>     int fd_wakeup_ref;
>     unsigned int assigned_crtcs;
>+    ScrnInfoPtr primary_scrn;
>+    ScrnInfoPtr secondary_scrn;
> #ifdef XSERVER_PLATFORM_BUS
>     struct xf86_platform_device *platform_dev;
> #endif
>-- 
>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.