Refactor amdgpu_mode_hotplug
PATCH 1/2 Refactor amdgpu_mode_hotplug
From: Michel Dänzer <[email protected]>
Preparation for the next change, no functional change intended.
(Cherry picked from radeon commit 35bec4937d89b48a79acfcb4f814b7370cb631b2)
--- src/drmmode_display.c | 57 +++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 24 deletions(-)
src/drmmode_display.c +33 -24
@@ -2365,6 +2365,36 @@ 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 amdgpu_mode_hotplug (ScrnInfoPtr scrn,drmmode_ptr drmmode)
@@ -2413,35 +2443,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) ||AMDGPUEntPriv (loop_scrn) != pAMDGPUEnt)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 ;
Signature · 6 lines
2.10.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20161110033500.7989-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org
PATCH 2/2 Use pAMDGPUEnt to find both screens of a GPU in amdgpu_mode_hotplug
From: Michel Dänzer <[email protected]>
Fixes misbehaviour when hotplugging DisplayPort connectors on secondary GPUs.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98626
(Ported from radeon commit 9760ef33cba5795eddeda4d5c2fcbe2dcce21689)
--- src/amdgpu_kms.c | 5 +++++ src/amdgpu_probe.h | 2 ++ src/drmmode_display.c | 23 ++++++++--------------- 3 files changed, 15 insertions(+), 15 deletions(-)
src/amdgpu_kms.c +5 -0
@@ -1313,6 +1313,11 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags) } } +if (info->IsSecondary) + pAMDGPUEnt->secondary_scrn = pScrn; +else + pAMDGPUEnt->primary_scrn = pScrn; + info->PciInfo =xf86GetPciInfoForEntity (info->pEnt->index); pScrn->monitor = pScrn->confScreen->monitor;
src/amdgpu_probe.h +2 -0
@@ -93,6 +93,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;struct xf86_platform_device *platform_dev; } AMDGPUEntRec, *AMDGPUEntPtr;
src/drmmode_display.c +8 -15
@@ -2402,7 +2402,7 @@ amdgpu_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode)xf86CrtcConfigPtr config =XF86_CRTC_CONFIG_PTR (scrn);AMDGPUEntPtr pAMDGPUEnt =AMDGPUEntPriv (scrn);drmModeResPtr mode_res; -int i, j, s; +int i, j;Bool found;Bool changed = FALSE;int num_dvi =0 , num_hdmi =0 ;
@@ -2439,20 +2439,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) || -AMDGPUEntPriv (loop_scrn) != pAMDGPUEnt) -continue ; - - found =drmmode_find_output (loop_scrn, - mode_res->connectors[i], - &num_dvi, &num_hdmi); - } -if (found) +if (drmmode_find_output (pAMDGPUEnt->primary_scrn, + mode_res->connectors[i], + &num_dvi, &num_hdmi) || + (pAMDGPUEnt->secondary_scrn && +drmmode_find_output (pAMDGPUEnt->secondary_scrn, + mode_res->connectors[i], + &num_dvi, &num_hdmi)))continue ; if (drmmode_output_init(scrn, drmmode, mode_res, i, &num_dvi,
Signature · 6 lines
2.10.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20161110033500.7989-2-michel-otUistvHUpPR7s880joybQ@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH xf86-video-amdgpu 2/2] Use pAMDGPUEnt to find both screens of a GPU in amdgpu_mode_hotplug
Quoted 13 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Michel Dänzer
Sent: Wednesday, November 09, 2016 10:35 PM
To: [email protected]
Subject: [PATCH xf86-video-amdgpu 2/2] Use pAMDGPUEnt to find both screens of a GPU inamdgpu_mode_hotplugFrom: Michel Dänzer <[email protected]>
Fixes misbehaviour when hotplugging DisplayPort connectors on secondary GPUs.
Quoted 6 lines
Fixes 14606e127f4b ("Handle Zaphod mode correctly in
amdgpu_mode_hotplug")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98626
(Ported from radeon commit9760ef33cba5795eddeda4d5c2fcbe2dcce21689)Signed-off-by Michel Dänzer <[email protected]>
Series is:
Quoted 84 lines
--- src/amdgpu_kms.c | 5 +++++ src/amdgpu_probe.h | 2 ++ src/drmmode_display.c | 23 ++++++++--------------- 3 files changed, 15 insertions(+), 15 deletions(-)src/amdgpu_kms.c +5
-0@@ -1313,6 +1313,11 @@ Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags) } } +if (info->IsSecondary) + pAMDGPUEnt->secondary_scrn = pScrn; +else + pAMDGPUEnt->primary_scrn = pScrn; + info->PciInfo =xf86GetPciInfoForEntity (info->pEnt->index); pScrn->monitor = pScrn->confScreen->monitor;src/amdgpu_probe.h +0
-0@@ -93,6 +93,8 @@ typedef struct {unsigned long fd_wakeup_registered;/* server generation for which fd has been registered for wakeup handling */
src/amdgpu_probe.h +2
-0int fd_wakeup_ref;unsigned int assigned_crtcs; +ScrnInfoPtr primary_scrn; +ScrnInfoPtr secondary_scrn;struct xf86_platform_device *platform_dev; } AMDGPUEntRec, *AMDGPUEntPtr;src/drmmode_display.c +1
-1@@ -2402,7 +2402,7 @@ amdgpu_mode_hotplug(ScrnInfoPtr scrn, drmmode_ptr drmmode) xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);AMDGPUEntPtr pAMDGPUEnt =AMDGPUEntPriv (scrn);drmModeResPtr mode_res; -int i, j, s; +int i, j;Bool found;Bool changed = FALSE;src/drmmode_display.c +0
-6int num_dvi =0 , num_hdmi =0 ;@@ -2439,20 +2439,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-Quoted 1 line
driverName) ||
src/drmmode_display.c +7
-8- AMDGPUEntPriv(loop_scrn) != pAMDGPUEnt) -continue ; - - found =drmmode_find_output (loop_scrn, - mode_res->connectors[i], - &num_dvi, &num_hdmi); - } -if (found) +if (drmmode_find_output (pAMDGPUEnt->primary_scrn, + mode_res->connectors[i], + &num_dvi, &num_hdmi) || + (pAMDGPUEnt->secondary_scrn && +drmmode_find_output (pAMDGPUEnt->secondary_scrn, + mode_res->connectors[i], + &num_dvi, &num_hdmi)))continue ; if (drmmode_output_init(scrn, drmmode, mode_res, i,
&num_dvi,
--
2.10.2
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx