XLibre/xf86-video-amdgpu
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-amdgpu.git synced 2026-03-24 01:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor amdgpu_mode_hotplug

Browse Source 
Preparation for the next change, no functional change intended.

(Cherry picked from radeon commit 35bec4937d89b48a79acfcb4f814b7370cb631b2)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2016-11-10 12:28:03 +09:00
parent 1352a1d2f7
commit 257be5b085
1 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/drmmode_display.c
View File

@@ -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;