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

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

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index e37cc32ee83ed2af00786f047de87208da35376b..cd61ddb7f46969604c0cb5bc55f0e71311109169 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -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);

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 450098e08faa8388ec1862bd953a4dc42ba2d019..408846fb98f030bd87a5ab7216ef5d23348790bd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -7340,6 +7340,19 @@ fail:
        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;

diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 2849b9ecdc71adcbdc6ff08a21e7c7d68e6995b3..f41480d247142af8ce1a075084aeb624b28b14f4 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -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,