github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/ddi: Fix cleanup after DP connector init failure

Browse Source 
Fix the error path during DDI encoder/connector initialization by
calling the missing TC port cleanup function.

This fixes the leaked TC port state.

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patch.msgid.link/20260507065940.2046690-1-imre.deak@intel.com
This commit is contained in:
Imre Deak 2026-05-07 09:59:39 +03:00
parent 5b9eb61b37
commit d7a189c0b6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/i915/display/intel_ddi.c
View File

@ -5411,7 +5411,7 @@ void intel_ddi_init(struct intel_display *display,
if (need_aux_ch(encoder, init_dp)) {
dig_port->aux_ch = intel_dp_aux_ch(encoder);
if (dig_port->aux_ch == AUX_CH_NONE)
goto err;
goto err_aux_ch_init;
}
/*
@ -5447,7 +5447,7 @@ void intel_ddi_init(struct intel_display *display,
dig_port->unlock = intel_tc_port_unlock;
if (intel_tc_port_init(dig_port, is_legacy) < 0)
goto err;
goto err_aux_ch_init;
}
drm_WARN_ON(display->drm, port > PORT_I);
@ -5478,7 +5478,7 @@ void intel_ddi_init(struct intel_display *display,
if (init_dp) {
if (intel_ddi_init_dp_connector(dig_port))
goto err;
goto err_dp_connector_init;
dig_port->hpd_pulse = intel_dp_hpd_pulse;
@ -5492,12 +5492,15 @@ void intel_ddi_init(struct intel_display *display,
*/
if (encoder->type != INTEL_OUTPUT_EDP && init_hdmi) {
if (intel_ddi_init_hdmi_connector(dig_port))
goto err;
goto err_dp_connector_init;
}
return;
err:
err_dp_connector_init:
if (intel_encoder_is_tc(encoder))
intel_tc_port_cleanup(dig_port);
err_aux_ch_init:
drm_encoder_cleanup(&encoder->base);
kfree(dig_port);
}