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

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

Browse Source 
Perform the missing DDI DP connector cleanup steps after HDMI connector
initialization failure during DDI encoder/connector initialization.

This fixes the leaked DP MST encoder, AUX state, and connector object.

Reported-by: Sashiko <sashiko-bot@kernel.org>
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-2-imre.deak@intel.com
This commit is contained in:
Imre Deak 2026-05-07 09:59:40 +03:00
parent d7a189c0b6
commit ae951de6bc
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4729,6 +4729,15 @@ static int intel_ddi_init_dp_connector(struct intel_digital_port *dig_port)
return 0;
}
static void intel_ddi_cleanup_dp_connector(struct intel_digital_port *dig_port)
{
struct intel_dp *intel_dp = &dig_port->dp;
struct intel_connector *connector = intel_dp->attached_connector;
intel_dp_cleanup_connector(dig_port, connector);
kfree(connector);
}
static int intel_hdmi_reset_link(struct intel_encoder *encoder,
struct drm_modeset_acquire_ctx *ctx)
{
@ -5492,11 +5501,14 @@ 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_dp_connector_init;
goto err_hdmi_connector_init;
}
return;
err_hdmi_connector_init:
if (init_dp)
intel_ddi_cleanup_dp_connector(dig_port);
err_dp_connector_init:
if (intel_encoder_is_tc(encoder))
intel_tc_port_cleanup(dig_port);

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

@ -7340,6 +7340,19 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
return false;
}
void intel_dp_cleanup_connector(struct intel_digital_port *dig_port,
struct intel_connector *connector)
{
struct intel_display *display = to_intel_display(connector);
struct intel_dp *intel_dp = &dig_port->dp;
intel_display_power_flush_work(display);
intel_dp_mst_encoder_cleanup(dig_port);
intel_dp_aux_fini(intel_dp);
drm_connector_cleanup(&connector->base);
}
void intel_dp_mst_suspend(struct intel_display *display)
{
struct intel_encoder *encoder;

3
drivers/gpu/drm/i915/display/intel_dp.h
View File

@ -48,6 +48,9 @@ intel_dp_queue_modeset_retry_for_link(struct intel_atomic_state *state,
const struct intel_crtc_state *crtc_state);
bool intel_dp_init_connector(struct intel_digital_port *dig_port,
struct intel_connector *intel_connector);
void intel_dp_cleanup_connector(struct intel_digital_port *dig_port,
struct intel_connector *connector);
void intel_dp_connector_sync_state(struct intel_connector *connector,
const struct intel_crtc_state *crtc_state);
void intel_dp_set_link_params(struct intel_dp *intel_dp,