Skip to content

Commit 3126c9c

Browse files
committed
Revert "drm/amd/display: Move setup_stream_attribute"
This reverts commit 2681bf4. This results in a blank screen on the HDMI port on some systems. Revert for now so as not to regress 6.18, can be addressed in 6.19 once the issue is root caused. Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4652 Cc: Sunpeng.Li@amd.com Cc: ivan.lipski@amd.com Signed-off-by: Alex Deucher <alexander.deucher@amd.com> (cherry picked from commit d0e9de7)
1 parent 971fb57 commit 3126c9c

5 files changed

Lines changed: 3 additions & 12 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,6 @@ void dce110_enable_stream(struct pipe_ctx *pipe_ctx)
671671
uint32_t early_control = 0;
672672
struct timing_generator *tg = pipe_ctx->stream_res.tg;
673673

674-
link_hwss->setup_stream_attribute(pipe_ctx);
675674
link_hwss->setup_stream_encoder(pipe_ctx);
676675

677676
dc->hwss.update_info_frame(pipe_ctx);

drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3060,8 +3060,6 @@ void dcn20_enable_stream(struct pipe_ctx *pipe_ctx)
30603060
link_enc->transmitter - TRANSMITTER_UNIPHY_A);
30613061
}
30623062

3063-
link_hwss->setup_stream_attribute(pipe_ctx);
3064-
30653063
if (dc->res_pool->dccg->funcs->set_pixel_rate_div)
30663064
dc->res_pool->dccg->funcs->set_pixel_rate_div(
30673065
dc->res_pool->dccg,

drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,8 +971,6 @@ void dcn401_enable_stream(struct pipe_ctx *pipe_ctx)
971971
}
972972
}
973973

974-
link_hwss->setup_stream_attribute(pipe_ctx);
975-
976974
if (dc->res_pool->dccg->funcs->set_pixel_rate_div) {
977975
dc->res_pool->dccg->funcs->set_pixel_rate_div(
978976
dc->res_pool->dccg,

drivers/gpu/drm/amd/display/dc/link/link_dpms.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2458,6 +2458,7 @@ void link_set_dpms_on(
24582458
struct link_encoder *link_enc = pipe_ctx->link_res.dio_link_enc;
24592459
enum otg_out_mux_dest otg_out_dest = OUT_MUX_DIO;
24602460
struct vpg *vpg = pipe_ctx->stream_res.stream_enc->vpg;
2461+
const struct link_hwss *link_hwss = get_link_hwss(link, &pipe_ctx->link_res);
24612462
bool apply_edp_fast_boot_optimization =
24622463
pipe_ctx->stream->apply_edp_fast_boot_optimization;
24632464

@@ -2502,6 +2503,8 @@ void link_set_dpms_on(
25022503
pipe_ctx->stream_res.tg->funcs->set_out_mux(pipe_ctx->stream_res.tg, otg_out_dest);
25032504
}
25042505

2506+
link_hwss->setup_stream_attribute(pipe_ctx);
2507+
25052508
pipe_ctx->stream->apply_edp_fast_boot_optimization = false;
25062509

25072510
// Enable VPG before building infoframe

drivers/gpu/drm/amd/display/dc/virtual/virtual_stream_encoder.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ static void virtual_stream_encoder_dvi_set_stream_attribute(
4444
struct dc_crtc_timing *crtc_timing,
4545
bool is_dual_link) {}
4646

47-
static void virtual_stream_encoder_lvds_set_stream_attribute(
48-
struct stream_encoder *enc,
49-
struct dc_crtc_timing *crtc_timing)
50-
{}
51-
5247
static void virtual_stream_encoder_set_throttled_vcp_size(
5348
struct stream_encoder *enc,
5449
struct fixed31_32 avg_time_slots_per_mtp)
@@ -120,8 +115,6 @@ static const struct stream_encoder_funcs virtual_str_enc_funcs = {
120115
virtual_stream_encoder_hdmi_set_stream_attribute,
121116
.dvi_set_stream_attribute =
122117
virtual_stream_encoder_dvi_set_stream_attribute,
123-
.lvds_set_stream_attribute =
124-
virtual_stream_encoder_lvds_set_stream_attribute,
125118
.set_throttled_vcp_size =
126119
virtual_stream_encoder_set_throttled_vcp_size,
127120
.update_hdmi_info_packets =

0 commit comments

Comments
 (0)