drm/amd/display: Restore analog connector support
Subsystems (3)
PATCH 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.
--- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +53 -0
@@ -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) {
@@ -3376,6 +3418,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,
@@ -3513,8 +3564,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
Quoted 97 lines · On 4/15/26 16:41, [email protected] wrote:
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.Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")Cc Timur Kristóf <[email protected]>Signed-off-by Roman Li <[email protected]>--- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +53
-0@@ -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) {@@ -3376,6 +3418,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,@@ -3513,8 +3564,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 = {
Hi,
I'll test this on a few different old GPUs and get back to you.
Thanks,
Timur
Alex Hung <[email protected]> ezt írta (időpont: 2026. ápr. 16., Csü 17:46):
Quoted 116 lines
Reviewed-by Alex Hung <[email protected]>Quoted 10 lines · On 4/15/26 16:41, [email protected] wrote:
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.Review
Quoted 8 lines
Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")Cc Timur Kristóf <[email protected]>Signed-off-by Roman Li <[email protected]>--- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.cdrivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx
Quoted 4 lines
index
5273ca09fe12..e76abc877f4a100644drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0
-0@@ -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 *pipe_ctx, bool enable)
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0bios->funcs->encoder_control (bios, &encoder_control); } +static void +dce110_external_encoder_control(enum bp_external_encoder_control_actionaction,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 6 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +6
-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;drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 12 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +12
-0+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,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 700
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+* so use a reasonably high default value. It seems that ENABLE
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 701
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+* can change the actual pixel clock but doesn't work with higher
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 3 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +3
-0+* pixel clocks than what SETUP was called with. +*/ + .pixel_clock = timing ? timing->pix_clk_100hz / 10 :300000,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 705
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+ .color_depth = timing ? timing->display_color_depth :
COLOR_DEPTH_888,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 7 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0+ }; +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);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable) · line 721
Quoted 7 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0+} + +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);drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c void dce110_enable_tmds_link_output(struct
Quoted 6 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0+} +static bool dce110_dac_load_detect (struct dc_link *link) {@@ -3376,6 +3418,15 @@ void dce110_enable_tmds_link_output(struct
dc_link*link,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c static const struct hw_sequencer_funcs
Quoted 16 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +9
-0link->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,@@ -3513,8 +3564,10 @@ static const struct hw_sequencer_funcs
dce110_funcs= {Quoted 10 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0.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 = {
Hi,
Tested this on the following:
HD 7870 XT - works
R9 280X (Tahiti) - works
R9 380X (Tonga) - works
A10-7850K (Kaveri) - broken
It seems that some other chunks of code were removed which were necessary for external DP bridge encoders to work properly. Those will need to be added back too, otherwise we regress Kaveri APUs.
Best regards,
Timur
Quoted 162 lines · Central European Summer Time Timur Kristóf
Hi,
I'll test this on a few different old GPUs and get back to you.
Thanks,
TimurAlex Hung <[email protected]> ezt írta (időpont: 2026. ápr. 16., Csü 17:46):
Quoted 154 lines
Reviewed-by Alex Hung <[email protected]>Quoted 14 lines · On 4/15/26 16:41, [email protected] wrote:
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.Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")Cc Timur Kristóf <[email protected]>Signed-off-by Roman Li <[email protected]>Review
Quoted 6 lines
---
.../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.cdrivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx
Quoted 4 lines
index
5273ca09fe12..e76abc877f4a100644drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0
-0@@ -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 *pipe_ctx, bool enable)
Quoted 6 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0bios->funcs->encoder_control (bios, &encoder_control); } +static void +dce110_external_encoder_control(enum bp_external_encoder_control_actionaction,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 6 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +6
-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;drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 12 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +12
-0+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,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 701
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+* so use a reasonably high default value. It seems that ENABLE
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 702
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+* can change the actual pixel clock but doesn't work with higher
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +3
-0+* pixel clocks than what SETUP was called with. +*/ + .pixel_clock = timing ? timing->pix_clk_100hz / 10 :300000,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 707
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+ .color_depth = timing ? timing->display_color_depth :
COLOR_DEPTH_888,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 9 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0+ }; +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);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable) · line 721
Quoted 7 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0+} + +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);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c void dce110_enable_tmds_link_output(struct
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0+} +static bool dce110_dac_load_detect (struct dc_link *link) {@@ -3376,6 +3418,15 @@ void dce110_enable_tmds_link_output(struct
dc_link*link,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c static const struct hw_sequencer_funcs
Quoted 20 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +9
-0link->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 structlink_resource*link_res,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0
-0@@ -3513,8 +3564,10 @@ static const struct hw_sequencer_funcs
dce110_funcs= {Quoted 14 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0.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 = {
[Public]
Hi Timur,
Thanks for sharing test results.
I will send V2 shortly.
Thanks,
Roman
Quoted 199 lines
-----Original Message-----
From: Timur Kristóf <[email protected]>
Sent: Friday, April 17, 2026 3:36 PM
To: Hung, Alex <[email protected]>
Cc: Li, Roman <[email protected]>; amd-gfx list <amd- [email protected]>; Deucher, Alexander <[email protected]>; Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Pillai, Aurabindo <[email protected]>
Subject: Re: [PATCH] drm/amd/display: Restore analog connector supportHi,
Tested this on the following:
HD 7870 XT - works
R9 280X (Tahiti) - works
R9 380X (Tonga) - works
A10-7850K (Kaveri) - brokenIt seems that some other chunks of code were removed which were necessary for external DP bridge encoders to work properly. Those will need to be added back too, otherwise we regress Kaveri APUs.
Best regards,
TimurQuoted 28 lines · Central European Summer Time Timur Kristóf
Hi,
I'll test this on a few different old GPUs and get back to you.
Thanks,
TimurAlex Hung <[email protected]> ezt írta (időpont: 2026. ápr. 16., Csü 17:46):
Quoted 20 lines
Reviewed-by Alex Hung <[email protected]>Quoted 17 lines · On 4/15/26 16:41, [email protected] wrote:
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.Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC3.2.373")
Cc Timur Kristóf <[email protected]>Signed-off-by Roman Li <[email protected]>---
.../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53+++++++++++++++++++
Quoted 78 lines
Quoted 78 lines
Quoted 4 lines
1 file changed, 53 insertions(+)diff --git
a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.cdrivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx
Quoted 4 lines
index
5273ca09fe12..e76abc877f4a100644drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0
-0@@ -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 *pipe_ctx, bool enable)
Quoted 7 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +3
-0bios->funcs->encoder_control (bios, &encoder_control); } +static void +dce110_external_encoder_control (enum +bp_external_encoder_control_actionaction,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 5 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +5
-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;drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 13 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +13
-0+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,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 703
Quoted 2 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0+ * so use a reasonably high default value. It seems + thatENABLE
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 705
Quoted 2 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0+ * can change the actual pixel clock but doesn't +work withhigher
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 4 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +3
-0+* pixel clocks than what SETUP was called with. +*/ + .pixel_clock = timing ? timing->pix_clk_100hz / 10 :300000,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx · line 710
Quoted 1 line
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +1
-0+ .color_depth = timing ? timing->display_color_depth :
COLOR_DEPTH_888,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable)
Quoted 9 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0+ }; +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);
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c dce110_dac_encoder_control(struct pipe_ctx *pipe_ctx, bool enable) · line 721
Quoted 6 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +6
-0+} + +static void +dce110_prepare_ddc (struct dc_link *link) { +if (link->ext_enc_id.id) +dce110_external_encoder_control(EXTERNAL_ENCODER_CONTROL_DDC_SE TUP,
Quoted 51 lines
Quoted 51 lines
link,
NULL);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c void dce110_enable_tmds_link_output(struct
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2
-0+} +static bool dce110_dac_load_detect (struct dc_link *link) {@@ -3376,6 +3418,15 @@ void dce110_enable_tmds_link_output(struct
dc_link*link,drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c static const struct hw_sequencer_funcs
Quoted 18 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7
-0link->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,@@ -3513,8 +3564,10 @@ static const struct hw_sequencer_funcs
dce110_funcs= {Quoted 15 lines
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +3
-0.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 = {
Quoted 7 lines · On Wed, Apr 15, 2026 at 6:42 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 5 lines
[How]
This patch restores the functions and pointers required for proper analog and DP bridge encoder support on legacy GPUs.Fixes 66715fc0ecfd ("drm/amd/display: Sync dcn42 with DC 3.2.373")
66715fc0ecfd looks like it also accidently dropped some of the new external encoder handling from bios_parser.c, dc_bios_types.h, and dce110_hwseq.c
Alex
Quoted 89 lines
Cc Timur Kristóf <[email protected]>Signed-off-by Roman Li <[email protected]>--- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+)drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +53
-1@@ -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) {@@ -3376,6 +3418,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,@@ -3513,8 +3564,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