diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-11-08 13:02:43 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-11-10 12:25:20 +0900 |
| commit | 9760ef33cba5795eddeda4d5c2fcbe2dcce21689 (patch) | |
| tree | 5f71bdfdd5b3be5f54df6ed80db58a9243564721 | |
| parent | 35bec4937d89b48a79acfcb4f814b7370cb631b2 (diff) | |
Use pRADEONEnt to find both screens of a GPU in radeon_mode_hotplug
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>
| -rw-r--r-- | src/drmmode_display.c | 23 | ||||
| -rw-r--r-- | src/radeon_kms.c | 5 | ||||
| -rw-r--r-- | 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 fd5c80e6..070979d3 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 6927f580..ee2becdd 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 258c7be1..573d9889 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 |