Skip to contentSkip to conversation

drm/amd/display: Restore analog connector support

PATCH Superseded [email protected] 2 participants 3 messages Apr 17

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drm/amd/display: Restore analog connector support

From: Roman Li <[email protected]>

[Why]
The analog connector support was accidentally removed, causing a crash when connecting an analog monitor.

[How]
This patch restores the functions and pointers required for proper analog and DP bridge encoder support on legacy GPUs.

V2: Restore the external encoder control functions.

Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")
---
 .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +64 -0
index 5273ca09fe12..73fb808dc016 100644
@@ -677,6 +677,48 @@ dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
 	bios->funcs->encoder_control(bios, &encoder_control);
 }
 
+static void
+dce110_external_encoder_control(enum bp_external_encoder_control_action action,
+				struct dc_link *link,
+				struct dc_crtc_timing *timing)
+{
+	struct dc *dc = link->ctx->dc;
+	struct dc_bios *bios = link->ctx->dc_bios;
+	const struct dc_link_settings *link_settings = &link->cur_link_settings;
+	enum bp_result bp_result = BP_RESULT_OK;
+	struct bp_external_encoder_control ext_cntl = {
+		.action = action,
+		.connector_obj_id = link->link_enc->connector,
+		.encoder_id = link->ext_enc_id,
+		.lanes_number = link_settings->lane_count,
+		.link_rate = link_settings->link_rate,
+
+		/* Use signal type of the real link encoder, ie. DP */
+		.signal = link->connector_signal,
+
+		/* We don't know the timing yet when executing the SETUP action,
+		 * so use a reasonably high default value. It seems that ENABLE
+		 * can change the actual pixel clock but doesn't work with higher
+		 * pixel clocks than what SETUP was called with.
+		 */
+		.pixel_clock = timing ? timing->pix_clk_100hz / 10 : 300000,
+		.color_depth = timing ? timing->display_color_depth : COLOR_DEPTH_888,
+	};
+	DC_LOGGER_INIT(dc->ctx);
+
+	bp_result = bios->funcs->external_encoder_control(bios, &ext_cntl);
+
+	if (bp_result != BP_RESULT_OK)
+		DC_LOG_ERROR("Failed to execute external encoder action: 0x%x\n", action);
+}
+
+static void
+dce110_prepare_ddc(struct dc_link *link)
+{
+	if (link->ext_enc_id.id)
+		dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DDC_SETUP, link, NULL);
+}
+
 static bool
 dce110_dac_load_detect(struct dc_link *link)
 {
@@ -721,6 +763,9 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
 
 	if (dc_is_rgb_signal(pipe_ctx->stream->signal))
 		dce110_dac_encoder_control(pipe_ctx, true);
+
+	if (link->ext_enc_id.id)
+		dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_ENABLE, link, timing);
 }
 
 static enum bp_result link_transmitter_control(
@@ -1221,6 +1266,9 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
 
 	if (dc_is_rgb_signal(pipe_ctx->stream->signal))
 		dce110_dac_encoder_control(pipe_ctx, false);
+
+	if (link->ext_enc_id.id)
+		dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DISABLE, link, NULL);
 }
 
 void dce110_unblank_stream(struct pipe_ctx *pipe_ctx,
@@ -3376,6 +3424,15 @@ void dce110_enable_tmds_link_output(struct dc_link *link,
 	link->phy_state.symclk_state = SYMCLK_ON_TX_ON;
 }
 
+static void dce110_enable_analog_link_output(
+		struct dc_link *link,
+		uint32_t pix_clk_100hz)
+{
+	link->link_enc->funcs->enable_analog_output(
+			link->link_enc,
+			pix_clk_100hz);
+}
+
 void dce110_enable_dp_link_output(
 		struct dc_link *link,
 		const struct link_resource *link_res,
@@ -3423,6 +3480,11 @@ void dce110_enable_dp_link_output(
 		}
 	}
 
+	if (link->ext_enc_id.id) {
+		dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_INIT, link, NULL);
+		dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_SETUP, link, NULL);
+	}
+
 	if (dc->link_srv->dp_get_encoding_format(link_settings) == DP_8b_10b_ENCODING) {
 		if (dc->clk_mgr->funcs->notify_link_rate_change)
 			dc->clk_mgr->funcs->notify_link_rate_change(dc->clk_mgr, link);
@@ -3513,8 +3575,10 @@ static const struct hw_sequencer_funcs dce110_funcs = {
 	.enable_lvds_link_output = dce110_enable_lvds_link_output,
 	.enable_tmds_link_output = dce110_enable_tmds_link_output,
 	.enable_dp_link_output = dce110_enable_dp_link_output,
+	.enable_analog_link_output = dce110_enable_analog_link_output,
 	.disable_link_output = dce110_disable_link_output,
 	.dac_load_detect = dce110_dac_load_detect,
+	.prepare_ddc = dce110_prepare_ddc,
 };
 
 static const struct hwseq_private_funcs dce110_private_funcs = {
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · On Fri, Apr 17, 2026 at 5:04 PM <[email protected]> wrote:

From: Roman Li <[email protected]>

[Why]
The analog connector support was accidentally removed, causing a crash when connecting an analog monitor.

Quoted 7 lines

[How]
This patch restores the functions and pointers required for proper analog and DP bridge encoder support on legacy GPUs.

V2: Restore the external encoder control functions.

Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")

I think you also need to revert this hunk:

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +0 -0
@@ -794,13 +794,11 @@ static enum bp_result

bios_parser_external_encoder_control(

static enum bp_result bios_parser_dac_load_detection(
struct dc_bios *dcb,

-       enum engine_id engine_id,
-       struct graphics_object_id ext_enc_id)
+       enum engine_id engine_id)
 {
        struct bios_parser *bp = BP_FROM_DCB(dcb);
        struct dc_context *ctx = dcb->ctx;
        struct bp_load_detection_parameters bp_params = {0};
-       struct bp_external_encoder_control ext_cntl = {0};
        enum bp_result bp_result = BP_RESULT_UNSUPPORTED;
        uint32_t bios_0_scratch;
        uint32_t device_id_mask = 0;

@@ -826,13 +824,6 @@ static enum bp_result bios_parser_dac_load_detection(

                bp_params.engine_id = engine_id;
                bp_result = bp->cmd_tbl.dac_load_detection(bp, &bp_params);

- } else if (ext_enc_id.id) {
- if (!bp->cmd_tbl.external_encoder_control)
- return BP_RESULT_UNSUPPORTED;
-

-               ext_cntl.action = EXTERNAL_ENCODER_CONTROL_DAC_LOAD_DETECT;
-               ext_cntl.encoder_id = ext_enc_id;
-               bp_result = bp->cmd_tbl.external_encoder_control(bp, &ext_cntl);
        }

        if (bp_result != BP_RESULT_OK)
Quoted 123 lines
---
 .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +64 -1
index 5273ca09fe12..73fb808dc016 100644
@@ -677,6 +677,48 @@ dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
        bios->funcs->encoder_control(bios, &encoder_control);
 }
 
+static void
+dce110_external_encoder_control(enum bp_external_encoder_control_action action,
+                               struct dc_link *link,
+                               struct dc_crtc_timing *timing)
+{
+       struct dc *dc = link->ctx->dc;
+       struct dc_bios *bios = link->ctx->dc_bios;
+       const struct dc_link_settings *link_settings = &link->cur_link_settings;
+       enum bp_result bp_result = BP_RESULT_OK;
+       struct bp_external_encoder_control ext_cntl = {
+               .action = action,
+               .connector_obj_id = link->link_enc->connector,
+               .encoder_id = link->ext_enc_id,
+               .lanes_number = link_settings->lane_count,
+               .link_rate = link_settings->link_rate,
+
+               /* Use signal type of the real link encoder, ie. DP */
+               .signal = link->connector_signal,
+
+               /* We don't know the timing yet when executing the SETUP action,
+                * so use a reasonably high default value. It seems that ENABLE
+                * can change the actual pixel clock but doesn't work with higher
+                * pixel clocks than what SETUP was called with.
+                */
+               .pixel_clock = timing ? timing->pix_clk_100hz / 10 : 300000,
+               .color_depth = timing ? timing->display_color_depth : COLOR_DEPTH_888,
+       };
+       DC_LOGGER_INIT(dc->ctx);
+
+       bp_result = bios->funcs->external_encoder_control(bios, &ext_cntl);
+
+       if (bp_result != BP_RESULT_OK)
+               DC_LOG_ERROR("Failed to execute external encoder action: 0x%x\n", action);
+}
+
+static void
+dce110_prepare_ddc(struct dc_link *link)
+{
+       if (link->ext_enc_id.id)
+               dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DDC_SETUP, link, NULL);
+}
+
 static bool
 dce110_dac_load_detect(struct dc_link *link)
 {
@@ -721,6 +763,9 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
 
        if (dc_is_rgb_signal(pipe_ctx->stream->signal))
                dce110_dac_encoder_control(pipe_ctx, true);
+
+       if (link->ext_enc_id.id)
+               dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_ENABLE, link, timing);
 }
 
 static enum bp_result link_transmitter_control(
@@ -1221,6 +1266,9 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx)
 
        if (dc_is_rgb_signal(pipe_ctx->stream->signal))
                dce110_dac_encoder_control(pipe_ctx, false);
+
+       if (link->ext_enc_id.id)
+               dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DISABLE, link, NULL);
 }
 
 void dce110_unblank_stream(struct pipe_ctx *pipe_ctx,
@@ -3376,6 +3424,15 @@ void dce110_enable_tmds_link_output(struct dc_link *link,
        link->phy_state.symclk_state = SYMCLK_ON_TX_ON;
 }
 
+static void dce110_enable_analog_link_output(
+               struct dc_link *link,
+               uint32_t pix_clk_100hz)
+{
+       link->link_enc->funcs->enable_analog_output(
+                       link->link_enc,
+                       pix_clk_100hz);
+}
+
 void dce110_enable_dp_link_output(
                struct dc_link *link,
                const struct link_resource *link_res,
@@ -3423,6 +3480,11 @@ void dce110_enable_dp_link_output(
                }
        }
 
+       if (link->ext_enc_id.id) {
+               dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_INIT, link, NULL);
+               dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_SETUP, link, NULL);
+       }
+
        if (dc->link_srv->dp_get_encoding_format(link_settings) == DP_8b_10b_ENCODING) {
                if (dc->clk_mgr->funcs->notify_link_rate_change)
                        dc->clk_mgr->funcs->notify_link_rate_change(dc->clk_mgr, link);
@@ -3513,8 +3575,10 @@ static const struct hw_sequencer_funcs dce110_funcs = {
        .enable_lvds_link_output = dce110_enable_lvds_link_output,
        .enable_tmds_link_output = dce110_enable_tmds_link_output,
        .enable_dp_link_output = dce110_enable_dp_link_output,
+       .enable_analog_link_output = dce110_enable_analog_link_output,
        .disable_link_output = dce110_disable_link_output,
        .dac_load_detect = dce110_dac_load_detect,
+       .prepare_ddc = dce110_prepare_ddc,
 };
 
 static const struct hwseq_private_funcs dce110_private_funcs = {
--

2.34.1

author
#2 lore raw

[Public]

Hi Alex,

You're right. Will be fixed in upcoming V3.

Thanks,
Roman

Quoted 202 lines

-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Friday, April 17, 2026 5:08 PM
To: Li, Roman <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>; Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Pillai, Aurabindo <[email protected]>; Hung, Alex <[email protected]>; Timur Kristóf <[email protected]>
Subject: Re: [PATCH v2] drm/amd/display: Restore analog connector support

Quoted 7 lines · On Fri, Apr 17, 2026 at 5:04 PM <[email protected]> wrote:

From: Roman Li <[email protected]>

[Why]
The analog connector support was accidentally removed, causing a crash when connecting an analog monitor.

Quoted 7 lines

[How]
This patch restores the functions and pointers required for proper analog and DP bridge encoder support on legacy GPUs.

V2: Restore the external encoder control functions.

Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")

I think you also need to revert this hunk:

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +0 -0
@@ -794,13 +794,11 @@ static enum bp_result

bios_parser_external_encoder_control(

static enum bp_result bios_parser_dac_load_detection(
struct dc_bios *dcb,

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +1 -10
-       enum engine_id engine_id,
-       struct graphics_object_id ext_enc_id)
+       enum engine_id engine_id)
 {
        struct bios_parser *bp = BP_FROM_DCB(dcb);
        struct dc_context *ctx = dcb->ctx;
        struct bp_load_detection_parameters bp_params = {0};
-       struct bp_external_encoder_control ext_cntl = {0};
        enum bp_result bp_result = BP_RESULT_UNSUPPORTED;
        uint32_t bios_0_scratch;
        uint32_t device_id_mask = 0;
@@ -826,13 +824,6 @@ static enum bp_result bios_parser_dac_load_detection(
 
                bp_params.engine_id = engine_id;
                bp_result = bp->cmd_tbl.dac_load_detection(bp, &bp_params);
-       } else if (ext_enc_id.id) {
-               if (!bp->cmd_tbl.external_encoder_control)
-                       return BP_RESULT_UNSUPPORTED;
-
-               ext_cntl.action =
 EXTERNAL_ENCODER_CONTROL_DAC_LOAD_DETECT;
-               ext_cntl.encoder_id = ext_enc_id;
-               bp_result = bp->cmd_tbl.external_encoder_control(bp, &ext_cntl);
        }
 
        if (bp_result != BP_RESULT_OK)

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx

Quoted 15 lines
---
 .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 64
+++++++++++++++++++
 1 file changed, 64 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0 -0
index 5273ca09fe12..73fb808dc016 100644
@@ -677,6 +677,48 @@ dce110_dac_encoder_control(struct pipe_ctx

*pipe_ctx, bool enable)

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 680

Quoted 4 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -0
        bios->funcs->encoder_control(bios, &encoder_control);  }
 
+static void
+dce110_external_encoder_control(enum bp_external_encoder_control_action

action,

Quoted 13 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +13 -0
+                               struct dc_link *link,
+                               struct dc_crtc_timing *timing) {
+       struct dc *dc = link->ctx->dc;
+       struct dc_bios *bios = link->ctx->dc_bios;
+       const struct dc_link_settings *link_settings = &link->cur_link_settings;
+       enum bp_result bp_result = BP_RESULT_OK;
+       struct bp_external_encoder_control ext_cntl = {
+               .action = action,
+               .connector_obj_id = link->link_enc->connector,
+               .encoder_id = link->ext_enc_id,
+               .lanes_number = link_settings->lane_count,
+               .link_rate = link_settings->link_rate,
+

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 703

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +10 -0
+               /* Use signal type of the real link encoder, ie. DP */
+               .signal = link->connector_signal,
+
+               /* We don't know the timing yet when executing the SETUP action,
+                * so use a reasonably high default value. It seems that ENABLE
+                * can change the actual pixel clock but doesn't work with higher
+                * pixel clocks than what SETUP was called with.
+                */
+               .pixel_clock = timing ? timing->pix_clk_100hz / 10 : 300000,
+               .color_depth = timing ? timing->display_color_depth :

COLOR_DEPTH_888,

Quoted 5 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +5 -0
+       };
+       DC_LOGGER_INIT(dc->ctx);
+
+       bp_result = bios->funcs->external_encoder_control(bios,
+ &ext_cntl);

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 718

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +9 -0
+
+       if (bp_result != BP_RESULT_OK)
+               DC_LOG_ERROR("Failed to execute external encoder
+action: 0x%x\n", action); }
+
+static void
+dce110_prepare_ddc(struct dc_link *link) {
+       if (link->ext_enc_id.id)
+
 

+dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DDC_S ETUP,

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx

Quoted 12 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +6 -0
+link, NULL); }
+
 static bool
 dce110_dac_load_detect(struct dc_link *link)  { @@ -721,6 +763,9 @@
 void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
 
        if (dc_is_rgb_signal(pipe_ctx->stream->signal))
                dce110_dac_encoder_control(pipe_ctx, true);
+
+       if (link->ext_enc_id.id)
+
+

dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_ENABLE,

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

Quoted 12 lines

+ link, timing);
}

static enum bp_result link_transmitter_control( @@ -1221,6 +1266,9 @@
void dce110_disable_stream(struct pipe_ctx *pipe_ctx)

        if (dc_is_rgb_signal(pipe_ctx->stream->signal))
                dce110_dac_encoder_control(pipe_ctx, false);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +4 -0
+
+       if (link->ext_enc_id.id)
+
+

dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DISABLE ,

Quoted 13 lines

+ link, NULL);
}

void dce110_unblank_stream(struct pipe_ctx *pipe_ctx, @@ -3376,6
+3424,15 @@ void dce110_enable_tmds_link_output(struct dc_link *link,

        link->phy_state.symclk_state = SYMCLK_ON_TX_ON;  }
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +6 -0
+static void dce110_enable_analog_link_output(
+               struct dc_link *link,
+               uint32_t pix_clk_100hz) {
+       link->link_enc->funcs->enable_analog_output(
+                       link->link_enc,
+                       pix_clk_100hz); }

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

Quoted 10 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +4 -0
+
 void dce110_enable_dp_link_output(
                struct dc_link *link,
                const struct link_resource *link_res, @@ -3423,6
+3480,11 @@ void dce110_enable_dp_link_output(
                }
        }
 
+       if (link->ext_enc_id.id) {
+

dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_INIT, link, NULL);

Quoted 1 line

+

dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_SETUP, link, NULL);

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c

Quoted 3 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -0
+       }
+
        if (dc->link_srv->dp_get_encoding_format(link_settings) ==

DP_8b_10b_ENCODING) {

Quoted 3 lines
                if (dc->clk_mgr->funcs->notify_link_rate_change)

dc->clk_mgr->funcs->notify_link_rate_change(dc->clk_mgr, link); @@ -3513,8

+3575,10 @@ static const struct hw_sequencer_funcs dce110_funcs = {

Quoted 13 lines

.enable_lvds_link_output = dce110_enable_lvds_link_output, .enable_tmds_link_output = dce110_enable_tmds_link_output, .enable_dp_link_output = dce110_enable_dp_link_output,

drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -1
+       .enable_analog_link_output = dce110_enable_analog_link_output,
        .disable_link_output = dce110_disable_link_output,
        .dac_load_detect = dce110_dac_load_detect,
+       .prepare_ddc = dce110_prepare_ddc,
 };
 
 static const struct hwseq_private_funcs dce110_private_funcs = {
--

2.34.1