Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Maintenance:5844
xf86-video-ati.openSUSE_Leap_42.2_Update
U_22-Use-pRADEONEnt-to-find-both-screens-of-a-G...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File U_22-Use-pRADEONEnt-to-find-both-screens-of-a-GPU-in-radeon_mode_hotplug.patch of Package xf86-video-ati.openSUSE_Leap_42.2_Update
From: Michel Dänzer <michel.daenzer@amd.com> Date: Tue Nov 8 13:02:43 2016 +0900 Subject: [PATCH 2/2]Use pRADEONEnt to find both screens of a GPU in radeon_mode_hotplug Patch-mainline: Upstream Git-repo: git://anongit.freedesktop.org/xorg/driver/xf86-video-ati Git-commit: 9760ef33cba5795eddeda4d5c2fcbe2dcce21689 References: bsc#1008200 Signed-off-by: Max Staudt <mstaudt@suse.de> Fixes misbehaviour when hotplugging DisplayPort connectors on secondary GPUs. Fixes: c801f9f10a5d ("Handle Zaphod mode correctly in radeon_mode_hotplug") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98626 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> --- 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 574003c..4eb7b77 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -2614,7 +2614,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; @@ -2651,20 +2651,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 9bcf657..d4399b8 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -1638,6 +1638,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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor