Skip to content

Dp init error fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ideak wants to merge 2 commits into
base: drm-tip
Choose a base branch
from
Open

Dp init error fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ec2143
drm/i915/dp: Fix error handling of DDI DP connector init failure
ideak May 6, 2026
4f0b565
drm/i915/dp: Fix error handling of DDI HDMI connector init failure
ideak May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions drivers/gpu/drm/i915/display/intel_ddi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -5411,7 +5420,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;
}

/*
Expand Down Expand Up @@ -5447,7 +5456,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);
Expand Down Expand Up @@ -5478,7 +5487,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;

Expand All @@ -5492,12 +5501,16 @@ 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_hdmi_connector_init;
}

return;

err:
err_hdmi_connector_init:
intel_ddi_cleanup_dp_connector(dig_port);
err_dp_connector_init:
intel_tc_port_cleanup(dig_port);
err_aux_ch_init:
drm_encoder_cleanup(&encoder->base);
kfree(dig_port);
}
13 changes: 13 additions & 0 deletions drivers/gpu/drm/i915/display/intel_dp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7346,6 +7346,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;
Expand Down
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/display/intel_dp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down