DC Patches Jan 28, 2025
cover DC Patches Jan 28, 2025
** resend the patchset because only 5 of 10 patches were sent successully **
This DC patchset brings improvements in multiple areas. In summary, we highlight:
* Fixes on DCN3.2 and DCN4
* Code factoring for SPL module
* Various bug fixes
Ahmed, Muhammad (1):
drm/amd/display: Enable odm 4:1 when debug key is set
Alex Hung (1):
drm/amd/display: Fix out-of-bound accesses
Aric Cyr (1):
drm/amd/display: Request HW cursor on DCN3.2 with SubVP
Brandon Syu (1):
Revert "drm/amd/display: Exit idle optimizations before attempt to
access PHY"
Dillon Varone (1):
drm/amd/display: Fixes for mcache programming in DML21
Dmytro (1):
drm/amd/display: Allow reuse of of DCN4x code
Lo-an Chen (1):
drm/amd/display: Fix seamless boot sequence
Martin Tsai (1):
drm/amd/display: Support multiple options during psr entry.
Samson Tam (1):
drm/amd/display: Move SPL to a new path
Taimur Hassan (1):
drm/amd/display: 3.2.319
drivers/gpu/drm/amd/display/dc/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +-
drivers/gpu/drm/amd/display/dc/dc.h | 4 +-
.../gpu/drm/amd/display/dc/dc_spl_translate.c | 1 -
drivers/gpu/drm/amd/display/dc/dc_types.h | 7 ++++
.../amd/display/dc/dccg/dcn401/dcn401_dccg.c | 24 +++++------
.../amd/display/dc/dccg/dcn401/dcn401_dccg.h | 40 ++++++++++++++++++-
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 ++
.../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 +-
.../dc/dio/dcn30/dcn30_dio_stream_encoder.h | 6 ++-
.../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 12 +++---
.../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 18 +++++++++
.../amd/display/dc/dml/dcn314/dcn314_fpu.c | 3 ++
.../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 1 +
.../dc/dml2/dml21/dml21_translation_helper.c | 4 +-
.../amd/display/dc/dml2/dml21/dml21_utils.c | 1 -
.../amd/display/dc/dml2/dml21/dml21_wrapper.c | 14 +++++++
.../display/dc/dml2/dml21/inc/dml_top_types.h | 1 +
.../dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 30 +++++++++++++-
.../src/dml2_core/dml2_core_dcn4_calcs.c | 3 ++
.../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 21 ++++++++++
.../dml2/dml21/src/dml2_top/dml2_top_soc15.c | 8 ----
.../display/dc/dml2/dml2_translation_helper.c | 6 +--
.../drm/amd/display/dc/dml2/dml2_wrapper.c | 5 ++-
.../drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 1 -
.../drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 1 -
.../amd/display/dc/dsc/dcn401/dcn401_dsc.c | 19 +++------
.../amd/display/dc/dsc/dcn401/dcn401_dsc.h | 7 ++++
.../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.c | 2 +-
.../dc/hpo/dcn32/dcn32_hpo_dp_link_encoder.h | 1 +
.../display/dc/hubbub/dcn30/dcn30_hubbub.c | 3 +-
.../display/dc/hubbub/dcn31/dcn31_hubbub.c | 3 +-
.../display/dc/hubbub/dcn32/dcn32_hubbub.c | 3 +-
.../display/dc/hubbub/dcn35/dcn35_hubbub.c | 17 ++++----
.../display/dc/hubbub/dcn35/dcn35_hubbub.h | 16 ++++++++
.../amd/display/dc/hubp/dcn20/dcn20_hubp.h | 5 +--
.../amd/display/dc/hubp/dcn30/dcn30_hubp.c | 2 +
.../amd/display/dc/hubp/dcn32/dcn32_hubp.c | 2 +
.../amd/display/dc/hubp/dcn35/dcn35_hubp.c | 2 +-
.../amd/display/dc/hubp/dcn35/dcn35_hubp.h | 1 +
.../drm/amd/display/dc/hwss/dce/dce_hwseq.h | 8 ++++
.../amd/display/dc/hwss/dce110/dce110_hwseq.c | 5 ---
.../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 3 +-
.../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 3 +-
.../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 +-
.../gpu/drm/amd/display/dc/inc/core_types.h | 2 +-
.../gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +-
drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 -
.../gpu/drm/amd/display/dc/mmhubbub/Makefile | 2 +-
drivers/gpu/drm/amd/display/dc/mpc/Makefile | 2 +-
.../amd/display/dc/mpc/dcn401/dcn401_mpc.c | 4 +-
.../amd/display/dc/mpc/dcn401/dcn401_mpc.h | 5 ++-
.../amd/display/dc/optc/dcn10/dcn10_optc.h | 14 +++++--
.../amd/display/dc/optc/dcn401/dcn401_optc.c | 22 +++++-----
.../amd/display/dc/optc/dcn401/dcn401_optc.h | 19 +++++++++
.../dc/resource/dcn401/dcn401_resource.c | 4 +-
.../drm/amd/display/dc/{spl => sspl}/Makefile | 2 +-
.../drm/amd/display/dc/{spl => sspl}/dc_spl.c | 0
.../drm/amd/display/dc/{spl => sspl}/dc_spl.h | 0
.../display/dc/{spl => sspl}/dc_spl_filters.c | 0
.../display/dc/{spl => sspl}/dc_spl_filters.h | 0
.../dc/{spl => sspl}/dc_spl_isharp_filters.c | 0
.../dc/{spl => sspl}/dc_spl_isharp_filters.h | 0
.../{spl => sspl}/dc_spl_scl_easf_filters.c | 0
.../{spl => sspl}/dc_spl_scl_easf_filters.h | 0
.../dc/{spl => sspl}/dc_spl_scl_filters.c | 0
.../dc/{spl => sspl}/dc_spl_scl_filters.h | 0
.../display/dc/{spl => sspl}/dc_spl_types.h | 0
.../dc/{spl => sspl}/spl_custom_float.c | 0
.../dc/{spl => sspl}/spl_custom_float.h | 0
.../amd/display/dc/{spl => sspl}/spl_debug.h | 0
.../display/dc/{spl => sspl}/spl_fixpt31_32.c | 0
.../display/dc/{spl => sspl}/spl_fixpt31_32.h | 0
.../display/dc/{spl => sspl}/spl_os_types.h | 0
.../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 +++
75 files changed, 304 insertions(+), 107 deletions(-)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/Makefile (96%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_isharp_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_easf_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_scl_filters.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/dc_spl_types.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_custom_float.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_debug.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.c (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_fixpt31_32.h (100%)
rename drivers/gpu/drm/amd/display/dc/{spl => sspl}/spl_os_types.h (100%)Signature · 1 line
2.43.0
PATCH 1/10 drm/amd/display: Fixes for mcache programming in DML21
From: Dillon Varone <[email protected]>
[WHY & HOW]
- Fix indexing phantom planes for mcache programming in the wrapper
- Fix phantom mcache allocations to align with HW guidance
- Fix mcache assignment for chroma plane for multi-planar formats
--- .../amd/display/dc/dml2/dml21/dml21_utils.c | 1 - .../amd/display/dc/dml2/dml21/dml21_wrapper.c | 14 +++++++++ .../display/dc/dml2/dml21/inc/dml_top_types.h | 1 + .../dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 30 ++++++++++++++++++- .../src/dml2_core/dml2_core_dcn4_calcs.c | 3 ++ .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 21 +++++++++++++ .../dml2/dml21/src/dml2_top/dml2_top_soc15.c | 8 ----- 7 files changed, 68 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c +0 -1
@@ -232,7 +232,6 @@ void dml21_program_dc_pipe(struct dml2_context *dml_ctx, struct dc_state *contex context->bw_ctx.bw.dcn.clk.dppclk_khz = pipe_ctx->plane_res.bw.dppclk_khz;dml21_populate_mall_allocation_size (context, dml_ctx, pln_prog, pipe_ctx); -memcpy (&context->bw_ctx.bw.dcn.mcache_allocations[pipe_ctx->pipe_idx], &pln_prog->mcache_allocation,sizeof (struct dml2_mcache_surface_allocation ));bool sub_vp_enabled =is_sub_vp_enabled (pipe_ctx->stream->ctx->dc, context);
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c +14 -0
@@ -124,6 +124,7 @@ static void dml21_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_stastruct pipe_ctx *dc_main_pipes[__DML2_WRAPPER_MAX_STREAMS_PLANES__];struct pipe_ctx *dc_phantom_pipes[__DML2_WRAPPER_MAX_STREAMS_PLANES__] = {0 };int num_pipes; +unsigned int dml_phantom_prog_idx; context->bw_ctx.bw.dcn.clk.dppclk_khz =0 ;
@@ -137,6 +138,9 @@ static void dml21_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_sta context->bw_ctx.bw.dcn.mall_ss_psr_active_size_bytes =0 ; context->bw_ctx.bw.dcn.mall_subvp_size_bytes =0 ; +/* phantom's start after main planes */ + dml_phantom_prog_idx = in_ctx->v21.mode_programming.programming->display_config.num_planes; +for (dml_prog_idx =0 ; dml_prog_idx <DML2_MAX_PLANES ; dml_prog_idx++) { pln_prog = &in_ctx->v21.mode_programming.programming->plane_programming[dml_prog_idx];
@@ -162,6 +166,16 @@ static void dml21_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_stadml21_program_dc_pipe (in_ctx, context, dc_phantom_pipes[dc_pipe_index], pln_prog, stream_prog); } } + +/* copy per plane mcache allocation */ +memcpy (&context->bw_ctx.bw.dcn.mcache_allocations[dml_prog_idx], &pln_prog->mcache_allocation,sizeof (struct dml2_mcache_surface_allocation )); +if (pln_prog->phantom_plane.valid) { +memcpy (&context->bw_ctx.bw.dcn.mcache_allocations[dml_phantom_prog_idx], + &pln_prog->phantom_plane.mcache_allocation, +sizeof (struct dml2_mcache_surface_allocation )); + + dml_phantom_prog_idx++; + } }/* assign global clocks */
drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h +1 -0
@@ -245,6 +245,7 @@ struct dml2_per_plane_programming {struct {bool valid;struct dml2_plane_parameters descriptor; +struct dml2_mcache_surface_allocation mcache_allocation;struct dml2_dchub_per_pipe_register_set *pipe_regs[DML2_MAX_PLANES ]; } phantom_plane; };
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c +29 -1
@@ -254,7 +254,8 @@ static void expand_implict_subvp(const struct display_configuation_with_meta *distatic void pack_mode_programming_params_with_implicit_subvp (struct dml2_core_instance *core,const struct display_configuation_with_meta *display_cfg,const struct dml2_display_cfg *svp_expanded_display_cfg,struct dml2_display_cfg_programming *programming,struct dml2_core_scratch *scratch) { -unsigned int stream_index, plane_index, pipe_offset, stream_already_populated_mask, main_plane_index; +unsigned int stream_index, plane_index, pipe_offset, stream_already_populated_mask, main_plane_index, mcache_index; +unsigned int total_main_mcaches_required =0 ;int total_pipe_regs_copied =0 ;int dml_internal_pipe_index =0 ;const struct dml2_plane_parameters *main_plane;
@@ -325,6 +326,13 @@ static void pack_mode_programming_params_with_implicit_subvp(struct dml2_core_indml2_core_calcs_get_mall_allocation (&core->clean_me_up.mode_lib, &programming->plane_programming[plane_index].surface_size_mall_bytes, dml_internal_pipe_index); +memcpy (&programming->plane_programming[plane_index].mcache_allocation, + &display_cfg->stage2.mcache_allocations[plane_index], +sizeof (struct dml2_mcache_surface_allocation )); + total_main_mcaches_required += programming->plane_programming[plane_index].mcache_allocation.num_mcaches_plane0 + + programming->plane_programming[plane_index].mcache_allocation.num_mcaches_plane1 - + (programming->plane_programming[plane_index].mcache_allocation.last_slice_sharing.plane0_plane1 ?1 :0 ); +for (pipe_offset =0 ; pipe_offset < programming->plane_programming[plane_index].num_dpps_required; pipe_offset++) {// Assign storage for this pipe's register values programming->plane_programming[plane_index].pipe_regs[pipe_offset] = &programming->pipe_regs[total_pipe_regs_copied];
@@ -363,6 +371,22 @@ static void pack_mode_programming_params_with_implicit_subvp(struct dml2_core_inmemcpy (&programming->plane_programming[main_plane_index].phantom_plane.descriptor, phantom_plane,sizeof (struct dml2_plane_parameters ));dml2_core_calcs_get_mall_allocation (&core->clean_me_up.mode_lib, &programming->plane_programming[main_plane_index].svp_size_mall_bytes, dml_internal_pipe_index); + +/* generate mcache allocation, phantoms use identical mcache configuration, but in the MALL set and unique mcache ID's beginning after all main ID's */ +memcpy (&programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation, + &programming->plane_programming[main_plane_index].mcache_allocation, +sizeof (struct dml2_mcache_surface_allocation )); +for (mcache_index =0 ; mcache_index < programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.num_mcaches_plane0; mcache_index++) { + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_plane0[mcache_index] += total_main_mcaches_required; + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_mall_plane0[mcache_index] = + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_plane0[mcache_index]; + } +for (mcache_index =0 ; mcache_index < programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.num_mcaches_plane1; mcache_index++) { + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_plane1[mcache_index] += total_main_mcaches_required; + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_mall_plane1[mcache_index] = + programming->plane_programming[main_plane_index].phantom_plane.mcache_allocation.global_mcache_ids_plane1[mcache_index]; + } +for (pipe_offset =0 ; pipe_offset < programming->plane_programming[main_plane_index].num_dpps_required; pipe_offset++) {// Assign storage for this pipe's register values programming->plane_programming[main_plane_index].phantom_plane.pipe_regs[pipe_offset] = &programming->pipe_regs[total_pipe_regs_copied];
@@ -572,6 +596,10 @@ bool core_dcn4_mode_programming(struct dml2_core_mode_programming_in_out *in_outdml2_core_calcs_get_mall_allocation (&core->clean_me_up.mode_lib, &in_out->programming->plane_programming[plane_index].surface_size_mall_bytes, dml_internal_pipe_index); +memcpy (&in_out->programming->plane_programming[plane_index].mcache_allocation, + &in_out->display_cfg->stage2.mcache_allocations[plane_index], +sizeof (struct dml2_mcache_surface_allocation )); +for (pipe_offset =0 ; pipe_offset < in_out->programming->plane_programming[plane_index].num_dpps_required; pipe_offset++) { in_out->programming->plane_programming[plane_index].plane_descriptor = &in_out->programming->display_config.plane_descriptors[plane_index];
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c +3 -0
@@ -2637,6 +2637,9 @@ static void calculate_mcache_setting(// Luma/Chroma combine in the last mcache // In the case of Luma/Chroma combine-mCache (with lc_comb_mcache==1), all mCaches except the last segment are filled as much as possible, when stay aligned to mvmpg boundary if (*p->lc_comb_mcache && l->is_dual_plane) { +/* if luma and chroma planes share an mcache, increase total chroma mcache count */ + *p->num_mcaches_c = *p->num_mcaches_c +1 ; +for (n =0 ; n < *p->num_mcaches_l -1 ; n++) p->mcache_offsets_l[n] = (n +1 ) * l->mvmpg_per_mcache_lb_l * l->mvmpg_access_width_l; p->mcache_offsets_l[*p->num_mcaches_l -1 ] = l->full_vp_access_width_l;
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c +21 -0
@@ -1082,12 +1082,21 @@ static bool all_timings_support_svp(const struct dml2_pmo_instance *pmo,const struct dml2_fams2_meta *stream_fams2_meta;unsigned int microschedule_vlines;unsigned int i; +unsigned int mcaches_per_plane; +unsigned int total_mcaches_required =0 ;unsigned int num_planes_per_stream[DML2_MAX_PLANES ] = {0 };/* confirm timing it is not a centered timing */ for (i =0 ; i < display_config->display_config.num_planes; i++) { plane_descriptor = &display_config->display_config.plane_descriptors[i]; + mcaches_per_plane =0 ; + +if (plane_descriptor->surface.dcc.enable) { + mcaches_per_plane += display_config->stage2.mcache_allocations[i].num_mcaches_plane0 + + display_config->stage2.mcache_allocations[i].num_mcaches_plane1 - + (display_config->stage2.mcache_allocations[i].last_slice_sharing.plane0_plane1 ?1 :0 ); + }if (is_bit_set_in_bitfield (mask, (unsigned char )plane_descriptor->stream_index)) { num_planes_per_stream[plane_descriptor->stream_index]++;
@@ -1098,7 +1107,19 @@ static bool all_timings_support_svp(const struct dml2_pmo_instance *pmo, plane_descriptor->composition.rotation_angle != dml2_rotation_0) {return false; } + +/* phantom requires same number of mcaches as main */ +if (plane_descriptor->surface.dcc.enable) { + mcaches_per_plane *=2 ; + } } + + total_mcaches_required += mcaches_per_plane; + } + +if (total_mcaches_required > pmo->soc_bb->num_dcc_mcaches) { +/* too many mcaches required */ +return false; }for (i =0 ; i <DML2_MAX_PLANES ; i++) {
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c +0 -8
@@ -831,7 +831,6 @@ static bool dml2_top_soc15_build_mode_programming(struct dml2_build_mode_programbool uclk_pstate_success = false;bool vmin_success = false;bool stutter_success = false; -unsigned int i;memset (l,0 ,sizeof (struct dml2_build_mode_programming_locals ));memset (in_out->programming,0 ,sizeof (struct dml2_display_cfg_programming ));
@@ -976,13 +975,6 @@ static bool dml2_top_soc15_build_mode_programming(struct dml2_build_mode_program l->base_display_config_with_meta.stage5.success = true; } -/* -* Populate mcache programming -*/ -for (i =0 ; i < in_out->display_config->num_planes; i++) { - in_out->programming->plane_programming[i].mcache_allocation = l->base_display_config_with_meta.stage2.mcache_allocations[i]; - } -/* * Call DPMM to map all requirements to minimum clock state */
Signature · 1 line
2.43.0
PATCH 2/10 drm/amd/display: Fix out-of-bound accesses
In reply to Alex Hung[WHAT & HOW]hpo_stream_to_link_encoder_mapping has size MAX_HPO_DP2_ENCODERS(=4), but location can have size up to 6. As a result, it is necessary to check location against MAX_HPO_DP2_ENCODERS.
Similiarly, disp_cfg_stream_location can be used as an array index which should be 0..5, so the ASSERT's conditions should be less without equal.
--- .../amd/display/dc/dml2/dml21/dml21_translation_helper.c | 4 ++-- .../gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +2 -2
@@ -1017,7 +1017,7 @@ bool dml21_map_dc_state_into_dml_display_cfg(const struct dc *in_dc, struct dc_sif (disp_cfg_stream_location <0 ) disp_cfg_stream_location = dml_dispcfg->num_streams++; -ASSERT (disp_cfg_stream_location >=0 && disp_cfg_stream_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); +ASSERT (disp_cfg_stream_location >=0 && disp_cfg_stream_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__);populate_dml21_timing_config_from_stream_state (&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, context->streams[stream_index], dml_ctx);adjust_dml21_hblank_timing_config_from_pipe_ctx (&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].timing, &context->res_ctx.pipe_ctx[stream_index]);populate_dml21_output_config_from_stream_state (&dml_dispcfg->stream_descriptors[disp_cfg_stream_location].output, context->streams[stream_index], &context->res_ctx.pipe_ctx[stream_index]);
@@ -1042,7 +1042,7 @@ bool dml21_map_dc_state_into_dml_display_cfg(const struct dc *in_dc, struct dc_sif (disp_cfg_plane_location <0 ) disp_cfg_plane_location = dml_dispcfg->num_planes++; -ASSERT (disp_cfg_plane_location >=0 && disp_cfg_plane_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); +ASSERT (disp_cfg_plane_location >=0 && disp_cfg_plane_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__);populate_dml21_surface_config_from_plane_state (in_dc, &dml_dispcfg->plane_descriptors[disp_cfg_plane_location].surface, context->stream_status[stream_index].plane_states[plane_index]);populate_dml21_plane_config_from_plane_state (dml_ctx, &dml_dispcfg->plane_descriptors[disp_cfg_plane_location], context->stream_status[stream_index].plane_states[plane_index], context, stream_index);
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +3 -3
@@ -786,7 +786,7 @@ static void populate_dml_output_cfg_from_stream_state(struct dml_output_cfg_st *case SIGNAL_TYPE_DISPLAY_PORT_MST :case SIGNAL_TYPE_DISPLAY_PORT : out->OutputEncoder[location] = dml_dp; -if (dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location] !=-1 ) +if (location <MAX_HPO_DP2_ENCODERS && dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location] !=-1 ) out->OutputEncoder[dml2->v20.scratch.hpo_stream_to_link_encoder_mapping[location]] = dml_dp2p0;break ;case SIGNAL_TYPE_EDP :
@@ -1343,7 +1343,7 @@ void map_dc_state_into_dml_display_cfg(struct dml2_context *dml2, struct dc_statif (disp_cfg_stream_location <0 ) disp_cfg_stream_location = dml_dispcfg->num_timings++; -ASSERT (disp_cfg_stream_location >=0 && disp_cfg_stream_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); +ASSERT (disp_cfg_stream_location >=0 && disp_cfg_stream_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__);populate_dml_timing_cfg_from_stream_state (&dml_dispcfg->timing, disp_cfg_stream_location, context->streams[i]);populate_dml_output_cfg_from_stream_state (&dml_dispcfg->output, disp_cfg_stream_location, context->streams[i], current_pipe_context, dml2);
@@ -1383,7 +1383,7 @@ void map_dc_state_into_dml_display_cfg(struct dml2_context *dml2, struct dc_statif (disp_cfg_plane_location <0 ) disp_cfg_plane_location = dml_dispcfg->num_surfaces++; -ASSERT (disp_cfg_plane_location >=0 && disp_cfg_plane_location <= __DML2_WRAPPER_MAX_STREAMS_PLANES__); +ASSERT (disp_cfg_plane_location >=0 && disp_cfg_plane_location < __DML2_WRAPPER_MAX_STREAMS_PLANES__);populate_dml_surface_cfg_from_plane_state (dml2->v20.dml_core_ctx.project, &dml_dispcfg->surface, disp_cfg_plane_location, context->stream_status[i].plane_states[j]); populate_dml_plane_cfg_from_plane_state(
Signature · 1 line
2.43.0
PATCH 3/10 Revert "drm/amd/display: Exit idle optimizations before attempt to access PHY"
In reply to Alex HungFrom: Brandon Syu <[email protected]>
This reverts commit de612738e9771bd66aeb20044486c457c512f684.
Reason to revert: screen flashes or gray screen appeared half of the screen after resume from S4/S5.
--- drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +0 -5
@@ -1890,7 +1890,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)bool can_apply_edp_fast_boot = false;bool can_apply_seamless_boot = false;bool keep_edp_vdd_on = false; -struct dc_bios *dcb = dc->ctx->dc_bios;DC_LOGGER_INIT ();
@@ -1967,8 +1966,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context) hws->funcs.edp_backlight_control (edp_link_with_sink, false); }/*resume from S3, no vbios posting, no need to power down again*/ -if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode (dcb)) -clk_mgr_exit_optimized_pwr_state (dc, dc->clk_mgr);power_down_all_hw_blocks (dc);
@@ -1981,8 +1978,6 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)disable_vga_and_power_gate_all_controllers (dc);if (edp_link_with_sink && !keep_edp_vdd_on) dc->hwss.edp_power_control (edp_link_with_sink, false); -if (dcb && dcb->funcs && !dcb->funcs->is_accelerated_mode (dcb)) -clk_mgr_optimize_pwr_state (dc, dc->clk_mgr); }bios_set_scratch_acc_mode_change (dc->ctx->dc_bios,1 ); }
Signature · 1 line
2.43.0
PATCH 4/10 drm/amd/display: Support multiple options during psr entry.
In reply to Alex HungFrom: Martin Tsai <[email protected]>
[WHY]
Some panels may not handle idle pattern properly during PSR entry.
[HOW]
Add a condition to allow multiple options on power down sequence during PSR1 entry.
--- drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +++++++ drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 ++++ drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 6 ++++++ 3 files changed, 17 insertions(+)
drivers/gpu/drm/amd/display/dc/dc_types.h +7 -0
@@ -1033,6 +1033,13 @@ struct psr_settings {unsigned int psr_sdp_transmit_line_num_deadline;uint8_t force_ffu_mode;unsigned int psr_power_opt; + +/** +* Some panels cannot handle idle pattern during PSR entry. +* To power down phy before disable stream to avoid sending +* idle pattern. +*/ +uint8_t power_down_phy_before_disable_stream; };enum replay_coasting_vtotal_type {
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +4 -0
@@ -418,6 +418,10 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, copy_settings_data->relock_delay_frame_cnt =0 ;if (link->dpcd_caps.sink_dev_id ==DP_BRANCH_DEVICE_ID_001CF8 ) copy_settings_data->relock_delay_frame_cnt =2 ; + + copy_settings_data->power_down_phy_before_disable_stream = + link->psr_settings.power_down_phy_before_disable_stream; + copy_settings_data->dsc_slice_height = psr_context->dsc_slice_height;dc_wake_and_execute_dmub_cmd (dc, &cmd,DM_DMUB_WAIT_TYPE_WAIT );
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +6 -0
@@ -3118,6 +3118,12 @@ struct dmub_cmd_psr_copy_settings_data {* Some panels request main link off before xth vertical line */ uint16_t poweroff_before_vertical_line; +/** +* Some panels cannot handle idle pattern during PSR entry. +* To power down phy before disable stream to avoid sending +* idle pattern. +*/ +uint8_t power_down_phy_before_disable_stream; };/**
Signature · 1 line
2.43.0
PATCH 5/10 drm/amd/display: Fix seamless boot sequence
In reply to Alex HungFrom: Lo-an Chen <[email protected]>
[WHY]
When the system powers up eDP with external monitors in seamless boot sequence, stutter get enabled before TTU and HUBP registers being programmed, which resulting in underflow.
[HOW]
Enable TTU in hubp_init.
Change the sequence that do not perpare_bandwidth and optimize_bandwidth while having seamless boot streams.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 2 +- drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 3 ++- drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 3 ++- drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 3 ++- drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 3 ++- drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 2 ++ drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 ++- 8 files changed, 15 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +1 -1
@@ -2192,7 +2192,7 @@ static enum dc_status dc_commit_state_no_check(struct dc *dc, struct dc_state *cdc_enable_stereo (dc, context, dc_streams, context->stream_count); -if (context->stream_count >get_seamless_boot_stream_count (context) || +if (get_seamless_boot_stream_count (context) ==0 || context->stream_count ==0 ) {/* Must wait for no flips to be pending before doing optimize bw */ hwss_wait_for_no_pipes_pending (dc, context);
drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c +2 -1
@@ -129,7 +129,8 @@ bool hubbub3_program_watermarks(REG_UPDATE (DCHUBBUB_ARB_DF_REQ_OUTSTAND ,DCHUBBUB_ARB_MIN_REQ_OUTSTAND ,0x1FF ); -hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); +if (safe_to_lower || hubbub->ctx->dc->debug.disable_stutter) +hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter);return wm_pending; }
drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c +2 -1
@@ -750,7 +750,8 @@ static bool hubbub31_program_watermarks(REG_UPDATE(DCHUBBUB_ARB_DF_REQ_OUTSTAND, DCHUBBUB_ARB_MIN_REQ_OUTSTAND, 0x1FF);*/ -hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); +if (safe_to_lower || hubbub->ctx->dc->debug.disable_stutter) +hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter);return wm_pending; }
drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c +2 -1
@@ -786,7 +786,8 @@ static bool hubbub32_program_watermarks(REG_UPDATE(DCHUBBUB_ARB_DF_REQ_OUTSTAND, DCHUBBUB_ARB_MIN_REQ_OUTSTAND, 0x1FF);*/ -hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); +if (safe_to_lower || hubbub->ctx->dc->debug.disable_stutter) +hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter);hubbub32_force_usr_retraining_allow (hubbub, hubbub->ctx->dc->debug.force_usr_allow);
drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c +2 -1
@@ -326,7 +326,8 @@ static bool hubbub35_program_watermarks( DCHUBBUB_ARB_MIN_REQ_OUTSTAND_COMMIT_THRESHOLD, 0xA);/*hw delta*/REG_UPDATE (DCHUBBUB_ARB_HOSTVM_CNTL ,DCHUBBUB_ARB_MAX_QOS_COMMIT_THRESHOLD ,0xF ); -hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter); +if (safe_to_lower || hubbub->ctx->dc->debug.disable_stutter) +hubbub1_allow_self_refresh_control (hubbub, !hubbub->ctx->dc->debug.disable_stutter);hubbub32_force_usr_retraining_allow (hubbub, hubbub->ctx->dc->debug.force_usr_allow);
drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c +2 -0
@@ -500,6 +500,8 @@ void hubp3_init(struct hubp *hubp)//hubp[i].HUBPREQ_DEBUG.HUBPREQ_DEBUG[26] = 1; REG_WRITE (HUBPREQ_DEBUG ,1 <<26 ); +REG_UPDATE (DCHUBP_CNTL ,HUBP_TTU_DISABLE ,0 ); +hubp_reset (hubp); }
drivers/gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c +2 -0
@@ -168,6 +168,8 @@ void hubp32_init(struct hubp *hubp) {struct dcn20_hubp *hubp2 =TO_DCN20_HUBP (hubp);REG_WRITE (HUBPREQ_DEBUG_DB ,1 <<8 ); + +REG_UPDATE (DCHUBP_CNTL ,HUBP_TTU_DISABLE ,0 ); }static struct hubp_funcs dcn32_hubp_funcs = { .hubp_enable_tripleBuffer = hubp2_enable_triplebuffer,
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +2 -1
@@ -236,7 +236,8 @@ void dcn35_init_hw(struct dc *dc) } hws->funcs.init_pipes (dc, dc->current_state); -if (dc->res_pool->hubbub->funcs->allow_self_refresh_control) +if (dc->res_pool->hubbub->funcs->allow_self_refresh_control && + !dc->res_pool->hubbub->ctx->dc->debug.disable_stutter) dc->res_pool->hubbub->funcs->allow_self_refresh_control (dc->res_pool->hubbub, !dc->res_pool->hubbub->ctx->dc->debug.disable_stutter); }
Signature · 1 line
2.43.0