DC Patches July 29, 2024
Subsystems (5)
cover DC Patches July 29, 2024
This DC patchset brings improvements in multiple areas. In summary, we have:
- Clean up some files style problems
- Program the DET segment when initializing pipes in dcn10_hwseq
- Fix overlay with pre-blend color processing
- Disable SubVP if Hardware Rotation is Used
- Fix few things in DML
- Re-enable panel replay feature
- Fix null pointer dereference under mst+dsc
Aric Cyr (1):
drm/amd/display: 3.2.295
Aurabindo Pillai (1):
drm/amd/display: fix a UBSAN warning in DML2.1
Austin Zheng (1):
drm/amd/display: Disable SubVP if Hardware Rotation is Used
Chris Park (1):
drm/amd/display: Address coverity change
Dillon Varone (2):
drm/amd/display: Force enable 3DLUT DMA check for dcn401 in DML drm/amd/display: Add DML2.1 option to disable DRR clamped P-State
Strategies
Fangzhi Zuo (2):
drm/amd/display: Print Pcon FRL Link BW in Debug Message drm/amd/display: Skip Recompute DSC Params if no Stream on Link
Fudong Wang (1):
drm/amd/display: skip crtc power down when ips switch
Gabe Teeger (1):
drm/amd/display: Revert Avoid overflow assignment
Hansen Dsouza (3):
drm/amd/display: Add stream and char control callback drm/amd/display: Add clock control callbacks drm/amd/display: Add clock control callbacks
Joshua Aberback (1):
drm/amd/display: Assume 32 bpp cursor in DML21
Michael Strauss (1):
drm/amd/display: Fix overlay with pre-blend color processing
Rodrigo Siqueira (6):
drm/amd/display: Add missing DCN314 to the DML Makefile drm/amd/display: Cleanup dml2 and dc/resource Makefile drm/amd/display: Remove useless defines drm/amd/display: Remove unused fields from
dmub_cmd_update_dirty_rect_data
drm/amd/display: Remove unused fields from dc_caps drm/amd/display: Add missing program DET segment call to pipe init
Tom Chung (1):
drm/amd/display: Re-enable panel replay feature
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 6 +- drivers/gpu/drm/amd/display/dc/dc.h | 8 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 +- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 528 +++++++++++++++--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 - .../dc/dml2/dml21/dml21_translation_helper.c | 19 +- .../amd/display/dc/dml2/dml21/dml21_wrapper.c | 4 +- .../display/dc/dml2/dml21/inc/dml_top_types.h | 1 + .../src/dml2_core/dml2_core_dcn4_calcs.c | 93 +-- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 10 +- .../drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 9 +- .../display/dc/link/accessories/link_dp_cts.c | 3 +- .../dc/link/protocols/link_dp_capability.c | 2 + .../gpu/drm/amd/display/dc/resource/Makefile | 2 - .../dc/resource/dcn401/dcn401_resource.c | 1 + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 8 - .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 - .../gpu/drm/amd/display/include/dpcd_defs.h | 1 - 22 files changed, 552 insertions(+), 181 deletions(-)
Signature · 1 line
2.37.3
PATCH 1/22 drm/amd/display: Add missing DCN314 to the DML Makefile
From: Rodrigo Siqueira <[email protected]>
Include display_mode_vba_314 and display_rq_dlg_calc_314 to the dml Makefile.
--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dml/Makefile +2 -0
@@ -115,6 +115,8 @@ CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn31/display_rq_dlg_calc_31.o := $(dml_rcfla CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_32.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_rq_dlg_calc_32.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn32/display_mode_vba_util_32.o := $(dml_rcflags) +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_mode_vba_314.o := $(dml_rcflags) +CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn314/display_rq_dlg_calc_314.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dcn301/dcn301_fpu.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/display_mode_lib.o := $(dml_rcflags) CFLAGS_REMOVE_$(AMDDALPATH)/dc/dml/dsc/rc_calc_fpu.o := $(dml_rcflags)
Signature · 1 line
2.37.3
PATCH 2/22 drm/amd/display: Cleanup dml2 and dc/resource Makefile
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Remove some useless lines from DC Makefiles.
--- drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 -- drivers/gpu/drm/amd/display/dc/resource/Makefile | 2 -- 2 files changed, 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/Makefile +0 -2
@@ -67,8 +67,6 @@ frame_warn_flag := -Wframe-larger-than=2048 endif endif -# DRIVER_BUILD is mostly used in DML2.1 source -subdir-ccflags-y += -DDRIVER_BUILD=1 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dml2 subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dml2/dml21/src/dml2_core subdir-ccflags-y += -I$(FULL_AMD_DISPLAY_PATH)/dc/dml2/dml21/src/dml2_mcg/
drivers/gpu/drm/amd/display/dc/resource/Makefile +0 -2
@@ -198,8 +198,6 @@ AMD_DISPLAY_FILES += $(AMD_DAL_RESOURCE_DCN351) ############################################################################### -############################################################################### - RESOURCE_DCN401 = dcn401_resource.o AMD_DAL_RESOURCE_DCN401 = $(addprefix $(AMDDALPATH)/dc/resource/dcn401/,$(RESOURCE_DCN401))
Signature · 1 line
2.37.3
PATCH 3/22 drm/amd/display: Remove useless defines
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Remove __cplusplus defines added by accident.
--- drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/amd/display/dc/spl/dc_spl.h +0 -8
@@ -9,16 +9,8 @@#define BLACK_OFFSET_RGB_Y 0x0#define BLACK_OFFSET_CBCR 0x8000 -#ifdef __cplusplus -extern "C" { -#endif -/* SPL interfaces */ bool spl_calculate_scaler_params (struct spl_in *spl_in,struct spl_out *spl_out); -#ifdef __cplusplus -} -#endif -#endif /* __DC_SPL_H__ */
Signature · 1 line
2.37.3
PATCH 4/22 drm/amd/display: Remove unused fields from dmub_cmd_update_dirty_rect_data
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Drop coasting_vtotal_high and pad from dmub_cmd_update_dirty_rect_data, since it is not used.
--- drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 -------- 1 file changed, 8 deletions(-)
drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h +0 -8
@@ -3028,14 +3028,6 @@ struct dmub_cmd_update_dirty_rect_data {* Currently the support is only for 0 or 1 */ uint8_t panel_inst; -/** -* 16-bit value dicated by driver that indicates the coasting vtotal high byte part. -*/ -uint16_t coasting_vtotal_high; -/** -* Explicit padding to 4 byte boundary. -*/ -uint8_t pad[2 ]; };/**
Signature · 1 line
2.37.3
PATCH 5/22 drm/amd/display: Remove unused fields from dc_caps
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
[Why & How]
Identify few unused fileds in dc_caps. Remove them.
--- drivers/gpu/drm/amd/display/dc/dc.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dc.h +0 -4
@@ -261,10 +261,7 @@ struct dc_caps {bool zstate_support;bool ips_support;uint32_t num_of_internal_disp; -uint32_t max_dwb_htap; -uint32_t max_dwb_vtap;enum dp_protocol_version max_dp_protocol_version; -bool spdif_aud;unsigned int mall_size_per_mem_channel;unsigned int mall_size_total;unsigned int cursor_cache_size;
@@ -1370,7 +1367,6 @@ struct dc_plane_info {int global_alpha_value;bool input_csc_enabled;int layer_index; -bool front_buffer_rendering_active;enum chroma_cositing cositing; };
Signature · 1 line
2.37.3
PATCH 6/22 drm/amd/display: Add missing program DET segment call to pipe init
In reply to Wayne LinFrom: Rodrigo Siqueira <[email protected]>
Add a callback that program the DET segment when initializing pipes.
--- drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +2 -0
@@ -1403,6 +1403,8 @@ void dcn10_init_pipes(struct dc *dc, struct dc_state *context)if (hubbub && hubp) {if (hubbub->funcs->program_det_size) hubbub->funcs->program_det_size (hubbub, hubp->inst,0 ); +if (hubbub->funcs->program_det_segments) + hubbub->funcs->program_det_segments (hubbub, hubp->inst,0 ); } }
Signature · 1 line
2.37.3
PATCH 7/22 drm/amd/display: Fix overlay with pre-blend color processing
In reply to Wayne LinFrom: Michael Strauss <[email protected]>
[WHY]
Overlay works similarly to MPO, but uses global alpha on both planes and sets the desktop as the rear plane instead of the front plane
[HOW]
Ensure that top plane isn't overlay by checking global alpha before applying the previously added MPO fix
--- drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +5 -2
@@ -2586,8 +2586,11 @@ static bool dcn10_is_rear_mpo_fix_required(struct pipe_ctx *pipe_ctx, enum dc_cowhile (top->top_pipe) top = top->top_pipe;// Traverse to top pipe_ctx -if (top->plane_state && top->plane_state->layer_index ==0 ) -return true;// Front MPO plane not hidden +if (top->plane_state && top->plane_state->layer_index ==0 && !top->plane_state->global_alpha) +// Global alpha used by top plane for PIP overlay +// Pre-multiplied/per-pixel alpha used by MPO +// Check top plane's global alpha to ensure layer_index > 0 not caused by PIP +return true;// MPO in use and front plane not hidden } }return false;
Signature · 1 line
2.37.3
PATCH 8/22 drm/amd/display: Add stream and char control callback
In reply to Wayne LinFrom: Hansen Dsouza <[email protected]>
[why & how]
Add new stream and char control functions based on DCCG spec
--- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 132 ++++++++++++++++-- 1 file changed, 122 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +122 -10
@@ -896,7 +896,7 @@ static void dccg35_disable_symclk32_le_new(dccg35_set_symclk32_le_rcg (dccg, inst, true); } -static void dccg35_enable_dpp_new ( +static void dccg35_enable_dpp_clk_new (struct dccg *dccg,int inst,enum dppclk_clock_source src)
@@ -915,7 +915,7 @@ static void dccg35_enable_dpp_new( DPPCLK0_DTO_MODULO, 0xFF); } -static void dccg35_disable_dpp_new ( +static void dccg35_disable_dpp_clk_new (struct dccg *dccg,int inst) {
@@ -956,27 +956,25 @@ static void dccg35_enable_dtbclk_p_new(struct dccg *dccg, }static void dccg35_disable_dtbclk_p_new (struct dccg *dccg, -enum dtbclk_source src,int inst) {dccg35_set_dtbclk_p_src_new (dccg,DTBCLK_REFCLK , inst);dccg35_set_dtbclk_p_rcg (dccg, inst, true); } -static void dccg35_enable_dpstreamclk_new (struct dccg *dccg, -enum dtbclk_source src, +static void dccg35_disable_dpstreamclk_new (struct dccg *dccg,int inst) {dccg35_set_dpstreamclk_src_new (dccg,DP_STREAM_REFCLK , inst);dccg35_set_dpstreamclk_rcg (dccg, inst, true); } -static void dccg35_disable_dpstreamclk_new (struct dccg *dccg, -enum dtbclk_source src, +static void dccg35_enable_dpstreamclk_new (struct dccg *dccg, +enum dp_stream_clk_source src,int inst) {dccg35_set_dpstreamclk_rcg (dccg, inst, false); -dccg35_set_dtbclk_p_src_new (dccg, src, inst); +dccg35_set_dpstreamclk_src_new (dccg, src, inst); }static void dccg35_trigger_dio_fifo_resync (struct dccg *dccg)
@@ -1935,6 +1933,114 @@ static void dccg35_disable_symclk_se(struct dccg *dccg, uint32_t stream_enc_inst } } +static void dccg35_set_dpstreamclk_cb ( +struct dccg *dccg, +enum streamclk_source src, +int otg_inst, +int dp_hpo_inst) +{ + +enum dtbclk_source dtb_clk_src; +enum dp_stream_clk_source dp_stream_clk_src; + +ASSERT (otg_inst >=DP_STREAM_DTBCLK_P5 ); + +switch (src) { +case REFCLK : + dtb_clk_src =DTBCLK_REFCLK ; + dp_stream_clk_src =DP_STREAM_REFCLK ; +break ; +case DPREFCLK : + dtb_clk_src =DTBCLK_DPREFCLK ; + dp_stream_clk_src = (enum dp_stream_clk_source )otg_inst; +break ; +case DTBCLK0 : + dtb_clk_src =DTBCLK_DTBCLK0 ; + dp_stream_clk_src = (enum dp_stream_clk_source )otg_inst; +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } + +if (dtb_clk_src ==DTBCLK_REFCLK && + dp_stream_clk_src ==DP_STREAM_REFCLK ) { +dccg35_disable_dtbclk_p_new (dccg, otg_inst); +dccg35_disable_dpstreamclk_new (dccg, dp_hpo_inst); + }else { +dccg35_enable_dtbclk_p_new (dccg, dtb_clk_src, otg_inst); +dccg35_enable_dpstreamclk_new (dccg, + dp_stream_clk_src, + dp_hpo_inst); + } +} + +static void dccg35_set_dpstreamclk_root_clock_gating_cb ( +struct dccg *dccg, +int dp_hpo_inst, +bool power_on) +{ +/* power_on set indicates we need to ungate +* Currently called from optimize_bandwidth and prepare_bandwidth calls +* Since clock source is not passed restore to refclock on ungate +* Instance 0 is implied here since only one streamclock resource +* Redundant as gating when enabled is acheived through set_dpstreamclk +*/ +if (power_on) +dccg35_enable_dpstreamclk_new (dccg, +DP_STREAM_REFCLK , + dp_hpo_inst); +else +dccg35_disable_dpstreamclk_new (dccg, dp_hpo_inst); +} + +static void dccg35_update_dpp_dto_cb (struct dccg *dccg,int dpp_inst, +int req_dppclk) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +if (dccg->ref_dppclk && req_dppclk) { +int ref_dppclk = dccg->ref_dppclk; +int modulo, phase; + +// phase / modulo = dpp pipe clk / dpp global clk + modulo =0xff ;// use FF at the end + phase = ((modulo * req_dppclk) + ref_dppclk -1 ) / ref_dppclk; + +if (phase >0xff ) { +ASSERT (false); + phase =0xff ; + } + +/* Enable DPP CLK DTO output */ +dccg35_enable_dpp_clk_new (dccg, dpp_inst,DPP_DCCG_DTO ); + +/* Program DTO */ +REG_SET_2 (DPPCLK_DTO_PARAM [dpp_inst],0 , +DPPCLK0_DTO_PHASE , phase, +DPPCLK0_DTO_MODULO , modulo); + }else +dccg35_disable_dpp_clk_new (dccg, dpp_inst); + + dccg->pipe_dppclk_khz[dpp_inst] = req_dppclk; +} + +static void dccg35_dpp_root_clock_control_cb ( +struct dccg *dccg, +unsigned int dpp_inst, +bool power_on) +{ +/* power_on set indicates we need to ungate +* Currently called from optimize_bandwidth and prepare_bandwidth calls +* Since clock source is not passed restore to refclock on ungate +* Redundant as gating when enabled is acheived through update_dpp_dto +*/ +if (power_on) +dccg35_enable_dpp_clk_new (dccg, dpp_inst,DPP_REFCLK ); +else +dccg35_disable_dpp_clk_new (dccg, dpp_inst); +} +static const struct dccg_funcs dccg35_funcs = { .update_dpp_dto = dccg35_update_dpp_dto, .dpp_root_clock_control = dccg35_dpp_root_clock_control,
@@ -2010,14 +2116,20 @@ struct dccg *dccg35_create( (void )&dccg35_disable_symclk32_se_new; (void )&dccg35_enable_symclk32_le_new; (void )&dccg35_disable_symclk32_le_new; - (void )&dccg35_enable_dpp_new; - (void )&dccg35_disable_dpp_new; + (void )&dccg35_enable_dpp_clk_new; + (void )&dccg35_enable_dpp_clk_new; (void )&dccg35_disable_dscclk_new; (void )&dccg35_enable_dscclk_new; (void )&dccg35_enable_dtbclk_p_new; (void )&dccg35_disable_dtbclk_p_new; (void )&dccg35_enable_dpstreamclk_new; (void )&dccg35_disable_dpstreamclk_new; + (void )&dccg35_set_dpstreamclk_cb; + (void )&dccg35_dpp_root_clock_control_cb; + (void )&dccg35_set_dpstreamclk_root_clock_gating_cb; + (void )&dccg35_update_dpp_dto_cb; + (void )&dccg35_dpp_root_clock_control_cb; + base = &dccg_dcn->base; base->ctx = ctx; base->funcs = &dccg35_funcs;
Signature · 1 line
2.37.3
PATCH 9/22 drm/amd/display: fix a UBSAN warning in DML2.1
In reply to Wayne LinFrom: Aurabindo Pillai <[email protected]>
When programming phantom pipe, since cursor_width is explicity set to 0, this causes calculation logic to trigger overflow for an unsigned int triggering the kernel's UBSAN check as below:
[ 40.962845] UBSAN: shift-out-of-bounds in /tmp/amd.EfpumTkO/amd/amdgpu/../display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c:3312:34 [ 40.962849] shift exponent 4294967170 is too large for 32-bit type 'unsigned int' [ 40.962852] CPU: 1 PID: 1670 Comm: gnome-shell Tainted: G W OE 6.5.0-41-generic #41~22.04.2-Ubuntu [ 40.962854] Hardware name: Gigabyte Technology Co., Ltd. X670E AORUS PRO X/X670E AORUS PRO X, BIOS F21 01/10/2024 [ 40.962856] Call Trace: [ 40.962857] <TASK> [ 40.962860] dump_stack_lvl+0x48/0x70 [ 40.962870] dump_stack+0x10/0x20 [ 40.962872] __ubsan_handle_shift_out_of_bounds+0x1ac/0x360 [ 40.962878] calculate_cursor_req_attributes.cold+0x1b/0x28 [amdgpu] [ 40.963099] dml_core_mode_support+0x6b91/0x16bc0 [amdgpu] [ 40.963327] ? srso_alias_return_thunk+0x5/0x7f [ 40.963331] ? CalculateWatermarksMALLUseAndDRAMSpeedChangeSupport+0x18b8/0x2790 [amdgpu] [ 40.963534] ? srso_alias_return_thunk+0x5/0x7f [ 40.963536] ? dml_core_mode_support+0xb3db/0x16bc0 [amdgpu] [ 40.963730] dml2_core_calcs_mode_support_ex+0x2c/0x90 [amdgpu] [ 40.963906] ? srso_alias_return_thunk+0x5/0x7f [ 40.963909] ? dml2_core_calcs_mode_support_ex+0x2c/0x90 [amdgpu] [ 40.964078] core_dcn4_mode_support+0x72/0xbf0 [amdgpu] [ 40.964247] dml2_top_optimization_perform_optimization_phase+0x1d3/0x2a0 [amdgpu] [ 40.964420] dml2_build_mode_programming+0x23d/0x750 [amdgpu] [ 40.964587] dml21_validate+0x274/0x770 [amdgpu] [ 40.964761] ? srso_alias_return_thunk+0x5/0x7f [ 40.964763] ? resource_append_dpp_pipes_for_plane_composition+0x27c/0x3b0 [amdgpu] [ 40.964942] dml2_validate+0x504/0x750 [amdgpu] [ 40.965117] ? dml21_copy+0x95/0xb0 [amdgpu] [ 40.965291] ? srso_alias_return_thunk+0x5/0x7f [ 40.965295] dcn401_validate_bandwidth+0x4e/0x70 [amdgpu] [ 40.965491] update_planes_and_stream_state+0x38d/0x5c0 [amdgpu] [ 40.965672] update_planes_and_stream_v3+0x52/0x1e0 [amdgpu] [ 40.965845] ? srso_alias_return_thunk+0x5/0x7f [ 40.965849] dc_update_planes_and_stream+0x71/0xb0 [amdgpu]
Fix this by adding a guard for checking cursor width before triggering the size calculation.
--- .../src/dml2_core/dml2_core_dcn4_calcs.c | 93 ++++++++++--------- 1 file changed, 49 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c +49 -44
@@ -7247,10 +7247,9 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_out/* Cursor Support Check */ mode_lib->ms.support.CursorSupport = true;for (k =0 ; k < mode_lib->ms.num_active_planes; k++) { -if (display_cfg->plane_descriptors[k].cursor.cursor_width >0.0 ) { -if (display_cfg->plane_descriptors[k].cursor.cursor_bpp ==64 && mode_lib->ip.cursor_64bpp_support == false) { +if (display_cfg->plane_descriptors[k].cursor.num_cursors >0 ) { +if (display_cfg->plane_descriptors[k].cursor.cursor_bpp ==64 && mode_lib->ip.cursor_64bpp_support == false) mode_lib->ms.support.CursorSupport = false; - } } }
@@ -8111,27 +8110,31 @@ static bool dml_core_mode_support(struct dml2_core_calcs_mode_support_ex *in_outfor (k =0 ; k < mode_lib->ms.num_active_planes; ++k) {double line_time_us = (double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 );bool cursor_not_enough_urgent_latency_hiding =0 ; -calculate_cursor_req_attributes ( - display_cfg->plane_descriptors[k].cursor.cursor_width, - display_cfg->plane_descriptors[k].cursor.cursor_bpp, -// output - &s->cursor_lines_per_chunk[k], - &s->cursor_bytes_per_line[k], - &s->cursor_bytes_per_chunk[k], - &s->cursor_bytes[k]); - -calculate_cursor_urgent_burst_factor ( - mode_lib->ip.cursor_buffer_size, - display_cfg->plane_descriptors[k].cursor.cursor_width, - s->cursor_bytes_per_chunk[k], - s->cursor_lines_per_chunk[k], - line_time_us, - mode_lib->ms.UrgLatency, +if (display_cfg->plane_descriptors[k].cursor.num_cursors >0 ) { +calculate_cursor_req_attributes ( + display_cfg->plane_descriptors[k].cursor.cursor_width, + display_cfg->plane_descriptors[k].cursor.cursor_bpp, + +// output + &s->cursor_lines_per_chunk[k], + &s->cursor_bytes_per_line[k], + &s->cursor_bytes_per_chunk[k], + &s->cursor_bytes[k]); + +calculate_cursor_urgent_burst_factor ( + mode_lib->ip.cursor_buffer_size, + display_cfg->plane_descriptors[k].cursor.cursor_width, + s->cursor_bytes_per_chunk[k], + s->cursor_lines_per_chunk[k], + line_time_us, + mode_lib->ms.UrgLatency, + +// output + &mode_lib->ms.UrgentBurstFactorCursor[k], + &cursor_not_enough_urgent_latency_hiding); + } -// output - &mode_lib->ms.UrgentBurstFactorCursor[k], - &cursor_not_enough_urgent_latency_hiding); mode_lib->ms.UrgentBurstFactorCursorPre[k] = mode_lib->ms.UrgentBurstFactorCursor[k];#ifdef __DML_VBA_DEBUG__
@@ -10608,31 +10611,33 @@ static bool dml_core_mode_programming(struct dml2_core_calcs_mode_programming_exfor (k =0 ; k < s->num_active_planes; ++k) {bool cursor_not_enough_urgent_latency_hiding =0 ; -double line_time_us; +double line_time_us =0.0 ; -calculate_cursor_req_attributes ( - display_cfg->plane_descriptors[k].cursor.cursor_width, - display_cfg->plane_descriptors[k].cursor.cursor_bpp, + line_time_us = display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / + ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 ); +if (display_cfg->plane_descriptors[k].cursor.num_cursors >0 ) { +calculate_cursor_req_attributes ( + display_cfg->plane_descriptors[k].cursor.cursor_width, + display_cfg->plane_descriptors[k].cursor.cursor_bpp, -// output - &s->cursor_lines_per_chunk[k], - &s->cursor_bytes_per_line[k], - &s->cursor_bytes_per_chunk[k], - &s->cursor_bytes[k]); - - line_time_us = display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.h_total / ((double )display_cfg->stream_descriptors[display_cfg->plane_descriptors[k].stream_index].timing.pixel_clock_khz /1000 ); - -calculate_cursor_urgent_burst_factor ( - mode_lib->ip.cursor_buffer_size, - display_cfg->plane_descriptors[k].cursor.cursor_width, - s->cursor_bytes_per_chunk[k], - s->cursor_lines_per_chunk[k], - line_time_us, - mode_lib->mp.UrgentLatency, +// output + &s->cursor_lines_per_chunk[k], + &s->cursor_bytes_per_line[k], + &s->cursor_bytes_per_chunk[k], + &s->cursor_bytes[k]); + +calculate_cursor_urgent_burst_factor ( + mode_lib->ip.cursor_buffer_size, + display_cfg->plane_descriptors[k].cursor.cursor_width, + s->cursor_bytes_per_chunk[k], + s->cursor_lines_per_chunk[k], + line_time_us, + mode_lib->mp.UrgentLatency, -// output - &mode_lib->mp.UrgentBurstFactorCursor[k], - &cursor_not_enough_urgent_latency_hiding); +// output + &mode_lib->mp.UrgentBurstFactorCursor[k], + &cursor_not_enough_urgent_latency_hiding); + } mode_lib->mp.UrgentBurstFactorCursorPre[k] = mode_lib->mp.UrgentBurstFactorCursor[k]; CalculateUrgentBurstFactor(
Signature · 1 line
2.37.3
PATCH 10/22 drm/amd/display: Print Pcon FRL Link BW in Debug Message
In reply to Wayne LinFrom: Fangzhi Zuo <[email protected]>
Under autonomous mode, source reads dpcd DP_PCON_HDMI_POST_FRL_STATUS for the frl link status.
Without dsc passthrough, it serves as bw bottleneck on the entire link, compared with the dp link from source to the converter where dsc is available.
--- .../gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +2 -0
@@ -1166,6 +1166,8 @@ static void get_active_converter_info( link->dpcd_caps.dongle_caps.dp_hdmi_frl_max_link_bw_in_kbps =intersect_frl_link_bw_support ( link->dpcd_caps.dongle_caps.dp_hdmi_frl_max_link_bw_in_kbps, hdmi_encoded_link_bw); +DC_LOG_DC ("%s: pcon frl link bw = %u\n" , __func__, + link->dpcd_caps.dongle_caps.dp_hdmi_frl_max_link_bw_in_kbps); }if (link->dpcd_caps.dongle_caps.dp_hdmi_frl_max_link_bw_in_kbps >0 )
Signature · 1 line
2.37.3
PATCH 11/22 drm/amd/display: Disable SubVP if Hardware Rotation is Used
In reply to Wayne LinFrom: Austin Zheng <[email protected]>
[Why and How]
SubVP is not supported when hardware rotation is being used
--- .../display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c +2 -1
@@ -1058,7 +1058,8 @@ static bool all_timings_support_svp(const struct dml2_pmo_instance *pmo,/* check recout height covers entire otg vactive, and single plane */ if (num_planes_per_stream[plane_descriptor->stream_index] >1 || - !plane_descriptor->composition.rect_out_height_spans_vactive) { + !plane_descriptor->composition.rect_out_height_spans_vactive || + plane_descriptor->composition.rotation_angle != dml2_rotation_0) {return false; } }
Signature · 1 line
2.37.3
PATCH 12/22 drm/amd/display: Assume 32 bpp cursor in DML21
In reply to Wayne LinFrom: Joshua Aberback <[email protected]>
[Why]
Cursor size can change dynamically at runtime without re-validation, so DML should calculate with the max size cursor to cover all cases.
--- .../dc/dml2/dml21/dml21_translation_helper.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +1 -12
@@ -725,18 +725,7 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dmconst struct scaler_data *scaler_data =get_scaler_data_for_plane (dml_ctx, plane_state, context);struct dc_stream_state *stream = context->streams[stream_index]; -if (stream->cursor_attributes.color_format ==CURSOR_MODE_MONO ) - plane->cursor.cursor_bpp =2 ; -else if (stream->cursor_attributes.color_format ==CURSOR_MODE_COLOR_1BIT_AND - || stream->cursor_attributes.color_format ==CURSOR_MODE_COLOR_PRE_MULTIPLIED_ALPHA - || stream->cursor_attributes.color_format ==CURSOR_MODE_COLOR_UN_PRE_MULTIPLIED_ALPHA ) { - plane->cursor.cursor_bpp =32 ; - }else if (stream->cursor_attributes.color_format ==CURSOR_MODE_COLOR_64BIT_FP_PRE_MULTIPLIED - || stream->cursor_attributes.color_format ==CURSOR_MODE_COLOR_64BIT_FP_UN_PRE_MULTIPLIED ) { - plane->cursor.cursor_bpp =64 ; - }else - plane->cursor.cursor_bpp =32 ; - + plane->cursor.cursor_bpp =32 ; plane->cursor.cursor_width =256 ; plane->cursor.num_cursors =1 ;
Signature · 1 line
2.37.3
PATCH 13/22 drm/amd/display: Force enable 3DLUT DMA check for dcn401 in DML
In reply to Wayne LinFrom: Dillon Varone <[email protected]>
[WHY]
Currently TR0 (trip 0) is not properly budgeting for urgent latency in DML2.1. This results in overly aggressive prefetch schedules that are vulnerable to request return jitter, resulting in severe underflow at the start of the frame.
[HOW]
Forcing 3DLUT DMA check to enable causes urgent latency to be budgeted properly into the prefetch schedule, avoiding the vulnerability.
--- .../amd/display/dc/dml2/dml21/dml21_translation_helper.c | 6 ++++-- drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + .../drm/amd/display/dc/resource/dcn401/dcn401_resource.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c +4 -2
@@ -816,6 +816,7 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dmif (plane_state->mcm_luts.lut3d_data.lut3d_src ==DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM ) { plane->tdlut.setup_for_tdlut = true; +switch (plane_state->mcm_luts.lut3d_data.gpu_mem_params.layout) {case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_RGB :case DC_CM2_GPU_MEM_LAYOUT_3D_SWIZZLE_LINEAR_BGR :
@@ -825,6 +826,7 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dm plane->tdlut.tdlut_addressing_mode = dml2_tdlut_simple_linear;break ; } +switch (plane_state->mcm_luts.lut3d_data.gpu_mem_params.size) {case DC_CM2_GPU_MEM_SIZE_171717 : plane->tdlut.tdlut_width_mode = dml2_tdlut_width_17_cube;
@@ -833,8 +835,8 @@ static void populate_dml21_plane_config_from_plane_state(struct dml2_context *dm//plane->tdlut.tdlut_width_mode = dml2_tdlut_width_flatten; // dml2_tdlut_width_flatten undefined break ; } - }else - plane->tdlut.setup_for_tdlut = false; + } + plane->tdlut.setup_for_tdlut |= dml_ctx->config.force_tdlut_enable; plane->dynamic_meta_data.enable = false; plane->dynamic_meta_data.lines_before_active_required =0 ;
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h +1 -0
@@ -236,6 +236,7 @@ struct dml2_configuration_options {bool use_clock_dc_limits;bool gpuvm_enable; +bool force_tdlut_enable;struct dml2_soc_bb *bb_from_dmub; };
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c +1 -0
@@ -2099,6 +2099,7 @@ static bool dcn401_resource_construct( dc->dml2_options.use_native_soc_bb_construction = true; dc->dml2_options.minimize_dispclk_using_odm = true; dc->dml2_options.map_dc_pipes_with_callbacks = true; + dc->dml2_options.force_tdlut_enable = true;resource_init_common_dml2_callbacks (dc, &dc->dml2_options); dc->dml2_options.callbacks.can_support_mclk_switch_using_fw_based_vblank_stretch = &dcn30_can_support_mclk_switch_using_fw_based_vblank_stretch;
Signature · 1 line
2.37.3
PATCH 14/22 drm/amd/display: Re-enable panel replay feature
In reply to Wayne LinFrom: Tom Chung <[email protected]>
[Why & How]
Fixed the replay issues and now re-enable the panel replay feature.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +8 -12
@@ -4850,18 +4850,14 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)/* Determine whether to enable Replay support by default. */ if (!(amdgpu_dc_debug_mask &DC_DISABLE_REPLAY )) {switch (amdgpu_ip_version (adev,DCE_HWIP ,0 )) { -/* -* Disabled by default due to https://gitlab.freedesktop.org/drm/amd/-/issues/3344 -* case IP_VERSION(3, 1, 4): -* case IP_VERSION(3, 1, 5): -* case IP_VERSION(3, 1, 6): -* case IP_VERSION(3, 2, 0): -* case IP_VERSION(3, 2, 1): -* case IP_VERSION(3, 5, 0): -* case IP_VERSION(3, 5, 1): -* replay_feature_enabled = true; -* break; -*/ +case IP_VERSION (3 ,1 ,4 ): +case IP_VERSION (3 ,2 ,0 ): +case IP_VERSION (3 ,2 ,1 ): +case IP_VERSION (3 ,5 ,0 ): +case IP_VERSION (3 ,5 ,1 ): + replay_feature_enabled = true; +break ; +default : replay_feature_enabled = amdgpu_dc_feature_mask &DC_REPLAY_MASK ;break ;
Signature · 1 line
2.37.3
PATCH 15/22 drm/amd/display: Add clock control callbacks
In reply to Wayne LinFrom: Hansen Dsouza <[email protected]>
[why & how]
Add clock source selection an control functions based on spec
--- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 281 ++++++++++++++++-- 1 file changed, 252 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +252 -29
@@ -41,13 +41,22 @@#define DC_LOGGER \ dccg->ctx->logger -enum physymclk_fe_source { -PHYSYMCLK_FE_SYMCLK_A =0 ,// Select functional clock from backend symclk A -PHYSYMCLK_FE_SYMCLK_B , -PHYSYMCLK_FE_SYMCLK_C , -PHYSYMCLK_FE_SYMCLK_D , -PHYSYMCLK_FE_SYMCLK_E , -PHYSYMCLK_FE_REFCLK =0xFF ,// Arbitrary value to pass refclk selection in software +enum symclk_fe_source { +SYMCLK_FE_SYMCLK_A =0 ,// Select functional clock from backend symclk A +SYMCLK_FE_SYMCLK_B , +SYMCLK_FE_SYMCLK_C , +SYMCLK_FE_SYMCLK_D , +SYMCLK_FE_SYMCLK_E , +SYMCLK_FE_REFCLK =0xFF ,// Arbitrary value to pass refclk selection in software +}; + +enum symclk_be_source { +SYMCLK_BE_PHYCLK =0 ,// Select phy clk when sym_clk_enable = 1 +SYMCLK_BE_DPIACLK_810 =4 , +SYMCLK_BE_DPIACLK_162 =5 , +SYMCLK_BE_DPIACLK_540 =6 , +SYMCLK_BE_DPIACLK_270 =7 , +SYMCLK_BE_REFCLK =0xFF ,// Arbitrary value to pass refclk selection in software };enum physymclk_source {
@@ -252,7 +261,7 @@ static void dccg35_set_physymclk_rcg( } } -static void dccg35_set_physymclk_fe_rcg ( +static void dccg35_set_symclk_fe_rcg (struct dccg *dccg,int inst,bool enable)
@@ -289,6 +298,45 @@ static void dccg35_set_physymclk_fe_rcg( } } +static void dccg35_set_symclk_be_rcg ( +struct dccg *dccg, +int inst, +bool enable) +{ + +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +/* TBD add symclk_be in rcg control bits */ +if (!dccg->ctx->dc->debug.root_clock_optimization.bits.physymclk) +return ; + +switch (inst) { +case 0 : +REG_UPDATE (DCCG_GATE_DISABLE_CNTL5 , +SYMCLKA_ROOT_GATE_DISABLE , enable ?0 :1 ); +break ; +case 1 : +REG_UPDATE (DCCG_GATE_DISABLE_CNTL5 , +SYMCLKB_ROOT_GATE_DISABLE , enable ?0 :1 ); +break ; +case 2 : +REG_UPDATE (DCCG_GATE_DISABLE_CNTL5 , +SYMCLKC_ROOT_GATE_DISABLE , enable ?0 :1 ); +break ; +case 3 : +REG_UPDATE (DCCG_GATE_DISABLE_CNTL5 , +SYMCLKD_ROOT_GATE_DISABLE , enable ?0 :1 ); +break ; +case 4 : +REG_UPDATE (DCCG_GATE_DISABLE_CNTL5 , +SYMCLKE_ROOT_GATE_DISABLE , enable ?0 :1 ); +break ; +default : +BREAK_TO_DEBUGGER (); +return ; + } +} +static void dccg35_set_dtbclk_p_rcg (struct dccg *dccg,int inst,bool enable) {
@@ -665,6 +713,42 @@ static void dccg35_set_physymclk_src_new( } } +static void dccg35_set_symclk_be_src_new ( +struct dccg *dccg, +enum symclk_be_source src, +int inst) +{ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); + +switch (inst) { +case 0 : +REG_UPDATE_2 (SYMCLKA_CLOCK_ENABLE , +SYMCLKA_CLOCK_ENABLE , (src ==SYMCLK_BE_REFCLK ) ?0 :1 , +SYMCLKA_SRC_SEL , (src ==SYMCLK_BE_REFCLK ) ?0 : src); +break ; +case 1 : +REG_UPDATE_2 (SYMCLKB_CLOCK_ENABLE , +SYMCLKB_CLOCK_ENABLE , (src ==SYMCLK_BE_REFCLK ) ?0 :1 , +SYMCLKB_SRC_SEL , (src ==SYMCLK_BE_REFCLK ) ?0 : src); +break ; +case 2 : +REG_UPDATE_2 (SYMCLKC_CLOCK_ENABLE , +SYMCLKC_CLOCK_ENABLE , (src ==SYMCLK_BE_REFCLK ) ?0 :1 , +SYMCLKC_SRC_SEL , (src ==SYMCLK_BE_REFCLK ) ?0 : src); +break ; +case 3 : +REG_UPDATE_2 (SYMCLKD_CLOCK_ENABLE , +SYMCLKD_CLOCK_ENABLE , (src ==SYMCLK_BE_REFCLK ) ?0 :1 , +SYMCLKD_SRC_SEL , (src ==SYMCLK_BE_REFCLK ) ?0 : src); +break ; +case 4 : +REG_UPDATE_2 (SYMCLKE_CLOCK_ENABLE , +SYMCLKE_CLOCK_ENABLE , (src ==SYMCLK_BE_REFCLK ) ?0 :1 , +SYMCLKE_SRC_SEL , (src ==SYMCLK_BE_REFCLK ) ?0 : src); +break ; + } +} +static int dccg35_is_symclk_fe_src_functional_be (struct dccg *dccg,int symclk_fe_inst,int symclk_be_inst)
@@ -699,35 +783,35 @@ static int dccg35_is_symclk_fe_src_functional_be(struct dccg *dccg,return 0 ; } -static void dccg35_set_symclk_fe_src_new (struct dccg *dccg,enum physymclk_fe_source src,int inst) +static void dccg35_set_symclk_fe_src_new (struct dccg *dccg,enum symclk_fe_source src,int inst) {struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg);switch (inst) {case 0 :REG_UPDATE_2 (SYMCLKA_CLOCK_ENABLE , -SYMCLKA_FE_EN , (src ==PHYSYMCLK_FE_REFCLK ) ?0 :1 , -SYMCLKA_FE_SRC_SEL , (src ==PHYSYMCLK_FE_REFCLK ) ?0 : src); +SYMCLKA_FE_EN , (src ==SYMCLK_FE_REFCLK ) ?0 :1 , +SYMCLKA_FE_SRC_SEL , (src ==SYMCLK_FE_REFCLK ) ?0 : src);break ;case 1 :REG_UPDATE_2 (SYMCLKB_CLOCK_ENABLE , -SYMCLKB_FE_EN , (src ==PHYSYMCLK_FE_REFCLK ) ?0 :1 , -SYMCLKB_FE_SRC_SEL , (src ==PHYSYMCLK_FE_REFCLK ) ?0 : src); +SYMCLKB_FE_EN , (src ==SYMCLK_FE_REFCLK ) ?0 :1 , +SYMCLKB_FE_SRC_SEL , (src ==SYMCLK_FE_REFCLK ) ?0 : src);break ;case 2 :REG_UPDATE_2 (SYMCLKC_CLOCK_ENABLE , -SYMCLKC_FE_EN , (src ==PHYSYMCLK_FE_REFCLK ) ?0 :1 , -SYMCLKC_FE_SRC_SEL , (src ==PHYSYMCLK_FE_REFCLK ) ?0 : src); +SYMCLKC_FE_EN , (src ==SYMCLK_FE_REFCLK ) ?0 :1 , +SYMCLKC_FE_SRC_SEL , (src ==SYMCLK_FE_REFCLK ) ?0 : src);break ;case 3 :REG_UPDATE_2 (SYMCLKD_CLOCK_ENABLE , -SYMCLKD_FE_EN , (src ==PHYSYMCLK_FE_REFCLK ) ?0 :1 , -SYMCLKD_FE_SRC_SEL , (src ==PHYSYMCLK_FE_REFCLK ) ?0 : src); +SYMCLKD_FE_EN , (src ==SYMCLK_FE_REFCLK ) ?0 :1 , +SYMCLKD_FE_SRC_SEL , (src ==SYMCLK_FE_REFCLK ) ?0 : src);break ;case 4 :REG_UPDATE_2 (SYMCLKE_CLOCK_ENABLE , -SYMCLKE_FE_EN , (src ==PHYSYMCLK_FE_REFCLK ) ?0 :1 , -SYMCLKE_FE_SRC_SEL , (src ==PHYSYMCLK_FE_REFCLK ) ?0 : src); +SYMCLKE_FE_EN , (src ==SYMCLK_FE_REFCLK ) ?0 :1 , +SYMCLKE_FE_SRC_SEL , (src ==SYMCLK_FE_REFCLK ) ?0 : src);break ; } }
@@ -804,9 +888,9 @@ static uint32_t dccg35_is_symclk32_se_rcg(struct dccg *dccg, int inst)static void dccg35_enable_symclk_fe_new (struct dccg *dccg,int inst, -enum physymclk_fe_source src) +enum symclk_fe_source src) { -dccg35_set_physymclk_fe_rcg (dccg, inst, false); +dccg35_set_symclk_fe_rcg (dccg, inst, false);dccg35_set_symclk_fe_src_new (dccg, src, inst); }
@@ -814,17 +898,17 @@ static void dccg35_disable_symclk_fe_new(struct dccg *dccg, int inst) { -dccg35_set_symclk_fe_src_new (dccg ,PHYSYMCLK_FE_REFCLK ,inst ); -dccg35_set_physymclk_fe_rcg (dccg, inst, true); +dccg35_set_symclk_fe_src_new (dccg ,SYMCLK_FE_REFCLK ,inst ); +dccg35_set_symclk_fe_rcg (dccg, inst, true); }static void dccg35_enable_symclk_be_new (struct dccg *dccg,int inst, -enum physymclk_source src) +enum symclk_be_source src) { -dccg35_set_physymclk_rcg (dccg, inst, false); -dccg35_set_physymclk_src_new (dccg, inst, src); +dccg35_set_symclk_be_rcg (dccg, inst, false); +dccg35_set_symclk_be_src_new (dccg, inst, src); } static void dccg35_disable_symclk_be_new(
@@ -834,7 +918,7 @@ static void dccg35_disable_symclk_be_new(int i;/* Switch from functional clock to refclock */ -dccg35_set_physymclk_src_new (dccg, inst,PHYSYMCLK_REFCLK ); +dccg35_set_symclk_be_src_new (dccg, inst,SYMCLK_BE_REFCLK );/* Check if any other SE connected LE and disable them */ for (i =0 ; i <4 ; i++) {
@@ -845,7 +929,7 @@ static void dccg35_disable_symclk_be_new( } }/* Safe to RCG SYMCLK*/ -dccg35_set_physymclk_rcg (dccg, inst, true); +dccg35_set_symclk_be_rcg (dccg, inst, true); } static void dccg35_enable_symclk32_se_new(
@@ -2041,6 +2125,132 @@ static void dccg35_dpp_root_clock_control_cb(dccg35_disable_dpp_clk_new (dccg, dpp_inst); } +static void dccg35_enable_symclk32_se_cb ( +struct dccg *dccg, +int inst, +enum phyd32clk_clock_source phyd32clk) +{ +dccg35_enable_symclk32_se_new (dccg, inst, (enum symclk32_se_clk_source )phyd32clk); +} + +static void dccg35_disable_symclk32_se_cb (struct dccg *dccg,int inst) +{ +dccg35_disable_symclk32_se_new (dccg, inst); +} + +static void dccg35_disable_symclk32_le_cb (struct dccg *dccg,int inst) +{ +dccg35_disable_symclk32_le_new (dccg, inst); +} + +static void dccg35_set_symclk32_le_root_clock_gating ( +struct dccg *dccg, +int inst, +bool power_on) +{ +/* power_on set indicates we need to ungate +* Currently called from optimize_bandwidth and prepare_bandwidth calls +* Since clock source is not passed restore to refclock on ungate +* Redundant as gating when enabled is acheived through disable_symclk32_le +*/ +if (power_on) +dccg35_enable_symclk32_le_new (dccg, inst,SYMCLK32_LE_REFCLK ); +else +dccg35_disable_symclk32_le_new (dccg, inst); +} + +static void dccg35_set_dtbclk_p_src_cb ( +struct dccg *dccg, +enum streamclk_source src, +uint32_t inst) +{ +if (src ==DTBCLK0 ) +dccg35_enable_dtbclk_p_new (dccg,DTBCLK_DTBCLK0 , inst); +else +dccg35_disable_dtbclk_p_new (dccg, inst); +} + +static void dccg35_set_dtbclk_dto_cb ( +struct dccg *dccg, +const struct dtbclk_dto_params *params) +{ +/* set_dtbclk_p_src typ called earlier to switch to DTBCLK +* if params->ref_dtbclk_khz and req_dtbclk_khz are 0 switch to ref-clock +*/ +struct dcn_dccg *dccg_dcn =TO_DCN_DCCG (dccg); +/* DTO Output Rate / Pixel Rate = 1/4 */ +int req_dtbclk_khz = params->pixclk_khz /4 ; + +if (params->ref_dtbclk_khz && req_dtbclk_khz) { +uint32_t modulo, phase; + +dccg35_enable_dtbclk_p_new (dccg,DTBCLK_DTBCLK0 , params->otg_inst); + +// phase / modulo = dtbclk / dtbclk ref + modulo = params->ref_dtbclk_khz *1000 ; + phase = req_dtbclk_khz *1000 ; + +REG_WRITE (DTBCLK_DTO_MODULO [params->otg_inst], modulo); +REG_WRITE (DTBCLK_DTO_PHASE [params->otg_inst], phase); + +REG_UPDATE (OTG_PIXEL_RATE_CNTL [params->otg_inst], +DTBCLK_DTO_ENABLE [params->otg_inst],1 ); + +REG_WAIT (OTG_PIXEL_RATE_CNTL [params->otg_inst], +DTBCLKDTO_ENABLE_STATUS [params->otg_inst],1 , +1 ,100 ); + +/* program OTG_PIXEL_RATE_DIV for DIVK1 and DIVK2 fields */ +dccg35_set_pixel_rate_div (dccg, params->otg_inst,PIXEL_RATE_DIV_BY_1 ,PIXEL_RATE_DIV_BY_1 ); + +/* The recommended programming sequence to enable DTBCLK DTO to generate +* valid pixel HPO DPSTREAM ENCODER, specifies that DTO source select should +* be set only after DTO is enabled +*/ +REG_UPDATE (OTG_PIXEL_RATE_CNTL [params->otg_inst], +PIPE_DTO_SRC_SEL [params->otg_inst],2 ); + }else { +dccg35_disable_dtbclk_p_new (dccg, params->otg_inst); + +REG_UPDATE_2 (OTG_PIXEL_RATE_CNTL [params->otg_inst], +DTBCLK_DTO_ENABLE [params->otg_inst],0 , +PIPE_DTO_SRC_SEL [params->otg_inst], params->is_hdmi ?0 :1 ); + +REG_WRITE (DTBCLK_DTO_MODULO [params->otg_inst],0 ); +REG_WRITE (DTBCLK_DTO_PHASE [params->otg_inst],0 ); + } +} + +static void dccg35_disable_dscclk_cb (struct dccg *dccg, +int inst) +{ +dccg35_disable_dscclk_new (dccg, inst); +} + +static void dccg35_enable_dscclk_cb (struct dccg *dccg,int inst) +{ +dccg35_enable_dscclk_new (dccg, inst,DSC_DTO_TUNED_CK_GPU_DISCLK_3 ); +} + +static void dccg35_enable_symclk_se_cb (struct dccg *dccg,uint32_t stream_enc_inst,uint32_t link_enc_inst) +{ +/* Switch to functional clock if already not selected */ +dccg35_enable_symclk_be_new (dccg,SYMCLK_BE_PHYCLK , link_enc_inst); + +dccg35_enable_symclk_fe_new (dccg, stream_enc_inst, (enum symclk_fe_source ) link_enc_inst); + +} + +static void dccg35_disable_symclk_se_cb ( +struct dccg *dccg, +uint32_t stream_enc_inst, +uint32_t link_enc_inst) +{ +dccg35_disable_symclk_fe_new (dccg, stream_enc_inst); + +/* DMU PHY sequence switches SYMCLK_BE (link_enc_inst) to ref clock once PHY is turned off */ +} +static const struct dccg_funcs dccg35_funcs = { .update_dpp_dto = dccg35_update_dpp_dto, .dpp_root_clock_control = dccg35_dpp_root_clock_control,
@@ -2070,6 +2280,7 @@ static const struct dccg_funcs dccg35_funcs = { .enable_symclk_se = dccg35_enable_symclk_se, .disable_symclk_se = dccg35_disable_symclk_se, .set_dtbclk_p_src = dccg35_set_dtbclk_p_src, + }; struct dccg *dccg35_create(
@@ -2091,7 +2302,7 @@ struct dccg *dccg35_create( (void )&dccg35_set_symclk32_se_rcg; (void )&dccg35_set_symclk32_le_rcg; (void )&dccg35_set_physymclk_rcg; - (void )&dccg35_set_physymclk_fe_rcg; + (void )&dccg35_set_symclk_fe_rcg; (void )&dccg35_set_dtbclk_p_rcg; (void )&dccg35_set_dppclk_rcg; (void )&dccg35_set_dpstreamclk_rcg;
@@ -2129,6 +2340,18 @@ struct dccg *dccg35_create( (void )&dccg35_set_dpstreamclk_root_clock_gating_cb; (void )&dccg35_update_dpp_dto_cb; (void )&dccg35_dpp_root_clock_control_cb; + (void )&dccg35_disable_symclk_se_cb; + (void )&dccg35_enable_symclk_se_cb; + (void )&dccg35_enable_dscclk_cb; + (void )&dccg35_disable_dscclk_cb; + (void )&dccg35_set_dtbclk_dto_cb; + (void )&dccg35_set_dtbclk_p_src_cb; + (void )&dccg35_set_symclk32_le_root_clock_gating; + (void )&dccg35_disable_symclk32_le_cb; + (void )&dccg35_set_symclk_be_src_new; + (void )&dccg35_set_symclk_be_rcg; + (void )&dccg35_enable_symclk32_se_cb; + (void )&dccg35_disable_symclk32_se_cb; base = &dccg_dcn->base; base->ctx = ctx;
Signature · 1 line
2.37.3
PATCH 16/22 drm/amd/display: skip crtc power down when ips switch
In reply to Wayne LinFrom: Fudong Wang <[email protected]>
[Why & How]
Add a dc debug option to keep crtc on when ips switch.
--- drivers/gpu/drm/amd/display/dc/dc.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -979,6 +979,7 @@ struct dc_debug_options {bool disable_z10;bool enable_z9_disable_interface;bool psr_skip_crtc_disable; +uint32_t ips_skip_crtc_disable_mask;union dpia_debug_options dpia_debug;bool disable_fixed_vs_aux_timeout_wa;uint32_t fixed_vs_aux_delay_config_wa;
Signature · 1 line
2.37.3
PATCH 17/22 drm/amd/display: Skip Recompute DSC Params if no Stream on Link
In reply to Wayne LinFrom: Fangzhi Zuo <[email protected]>
[why]
Encounter NULL pointer dereference uner mst + dsc setup.
BUG: kernel NULL pointer dereference, address: 0000000000000008
PGD 0 P4D 0
Oops: 0000 [#1] PREEMPT SMP NOPTI
CPU: 4 PID: 917 Comm: sway Not tainted 6.3.9-arch1-1 #1 124dc55df4f5272ccb409f39ef4872fc2b3376a2
Hardware name: LENOVO 20NKS01Y00/20NKS01Y00, BIOS R12ET61W(1.31 ) 07/28/2022
RIP: 0010:drm_dp_atomic_find_time_slots+0x5e/0x260 [drm_display_helper]
Code: 01 00 00 48 8b 85 60 05 00 00 48 63 80 88 00 00 00 3b 43 28 0f 8d 2e 01 00 00 48 8b 53 30 48 8d 04 80 48 8d 04 c2 48 8b 40 18 <48> 8>
RSP: 0018:ffff960cc2df77d8 EFLAGS: 00010293
RAX: 0000000000000000 RBX: ffff8afb87e81280 RCX: 0000000000000224
RDX: ffff8afb9ee37c00 RSI: ffff8afb8da1a578 RDI: ffff8afb87e81280
RBP: ffff8afb83d67000 R08: 0000000000000001 R09: ffff8afb9652f850
R10: ffff960cc2df7908 R11: 0000000000000002 R12: 0000000000000000
R13: ffff8afb8d7688a0 R14: ffff8afb8da1a578 R15: 0000000000000224
FS: 00007f4dac35ce00(0000) GS:ffff8afe30b00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 0000000000000008 CR3: 000000010ddc6000 CR4: 00000000003506e0
Call Trace:
<TASK>
? __die+0x23/0x70
? page_fault_oops+0x171/0x4e0
? plist_add+0xbe/0x100
? exc_page_fault+0x7c/0x180
? asm_exc_page_fault+0x26/0x30
? drm_dp_atomic_find_time_slots+0x5e/0x260 [drm_display_helper 0e67723696438d8e02b741593dd50d80b44c2026]
? drm_dp_atomic_find_time_slots+0x28/0x260 [drm_display_helper 0e67723696438d8e02b741593dd50d80b44c2026]
compute_mst_dsc_configs_for_link+0x2ff/0xa40 [amdgpu 62e600d2a75e9158e1cd0a243bdc8e6da040c054]
? fill_plane_buffer_attributes+0x419/0x510 [amdgpu 62e600d2a75e9158e1cd0a243bdc8e6da040c054]
compute_mst_dsc_configs_for_state+0x1e1/0x250 [amdgpu 62e600d2a75e9158e1cd0a243bdc8e6da040c054]
amdgpu_dm_atomic_check+0xecd/0x1190 [amdgpu 62e600d2a75e9158e1cd0a243bdc8e6da040c054]
drm_atomic_check_only+0x5c5/0xa40
drm_mode_atomic_ioctl+0x76e/0xbc0[how]
dsc recompute should be skipped if no mode change detected on the new request. If detected, keep checking whether the stream is already on current state or not.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +3 -0
@@ -1269,6 +1269,9 @@ static bool is_dsc_need_re_compute( } } +if (new_stream_on_link_num ==0 ) +return false; +/* check current_state if there stream on link but it is not in * new request state */
Signature · 1 line
2.37.3
PATCH 18/22 drm/amd/display: Address coverity change
In reply to Wayne LinFrom: Chris Park <[email protected]>
[Why]
Coverity picks up a defect with regards to array underflow.
[How]
Address coverity issue as recommended.
--- .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c +4 -2
@@ -517,10 +517,12 @@ static void dcn401_update_clocks_update_dtb_dto(struct clk_mgr_internal *clk_mgrif (!use_hpo_encoder)continue ; - otg_master->clock_source->funcs->program_pix_clk ( +if (otg_master->stream_res.pix_clk_params.controller_id >CONTROLLER_ID_UNDEFINED ) + otg_master->clock_source->funcs->program_pix_clk ( otg_master->clock_source, &otg_master->stream_res.pix_clk_params, - dccg->ctx->dc->link_srv->dp_get_encoding_format (&otg_master->link_config.dp_link_settings), + dccg->ctx->dc->link_srv->dp_get_encoding_format ( + &otg_master->link_config.dp_link_settings), &otg_master->pll_settings); } }
Signature · 1 line
2.37.3
PATCH 19/22 drm/amd/display: Add clock control callbacks
In reply to Wayne LinFrom: Hansen Dsouza <[email protected]>
[why & how]
Add clock source selection control functions based on spec
--- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 153 +++++++++++------- 1 file changed, 99 insertions(+), 54 deletions(-)
drivers/gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c +99 -54
@@ -980,6 +980,21 @@ static void dccg35_disable_symclk32_le_new(dccg35_set_symclk32_le_rcg (dccg, inst, true); } +static void dccg35_enable_physymclk_new (struct dccg *dccg, +int inst, +enum physymclk_source src) +{ +dccg35_set_physymclk_rcg (dccg, inst, false); +dccg35_set_physymclk_src_new (dccg, src, inst); +} + +static void dccg35_disable_physymclk_new (struct dccg *dccg, +int inst) +{ +dccg35_set_physymclk_src_new (dccg,PHYSYMCLK_REFCLK , inst); +dccg35_set_physymclk_rcg (dccg, inst, true); +} + static void dccg35_enable_dpp_clk_new( struct dccg *dccg, int inst,
@@ -2138,11 +2153,62 @@ static void dccg35_disable_symclk32_se_cb(struct dccg *dccg, int inst)dccg35_disable_symclk32_se_new (dccg, inst); } +static void dccg35_enable_symclk32_le_cb ( +struct dccg *dccg, +int inst, +enum phyd32clk_clock_source src) +{ +dccg35_enable_symclk32_le_new (dccg, inst, (enum symclk32_le_clk_source ) src); +} +static void dccg35_disable_symclk32_le_cb (struct dccg *dccg,int inst) {dccg35_disable_symclk32_le_new (dccg, inst); } +static void dccg35_set_symclk32_le_root_clock_gating_cb ( +struct dccg *dccg, +int inst, +bool power_on) +{ +/* power_on set indicates we need to ungate +* Currently called from optimize_bandwidth and prepare_bandwidth calls +* Since clock source is not passed restore to refclock on ungate +* Redundant as gating when enabled is acheived through disable_symclk32_le +*/ +if (power_on) +dccg35_enable_symclk32_le_new (dccg, inst,SYMCLK32_LE_REFCLK ); +else +dccg35_disable_symclk32_le_new (dccg, inst); +} + +static void dccg35_set_physymclk_cb ( +struct dccg *dccg, +int inst, +enum physymclk_clock_source clk_src, +bool force_enable) +{ +/* force_enable = 0 indicates we can switch to ref clock */ +if (force_enable) +dccg35_enable_physymclk_new (dccg, inst, (enum physymclk_source )clk_src); +else +dccg35_disable_physymclk_new (dccg, inst); +} + +static void dccg35_set_physymclk_root_clock_gating_cb ( +struct dccg *dccg, +int inst, +bool power_on) +{ +/* Redundant RCG already done in disable_physymclk +* power_on = 1 indicates we need to ungate +*/ +if (power_on) +dccg35_enable_physymclk_new (dccg, inst,PHYSYMCLK_REFCLK ); +else +dccg35_disable_physymclk_new (dccg, inst); +} + static void dccg35_set_symclk32_le_root_clock_gating( struct dccg *dccg, int inst,
@@ -2251,6 +2317,37 @@ static void dccg35_disable_symclk_se_cb(/* DMU PHY sequence switches SYMCLK_BE (link_enc_inst) to ref clock once PHY is turned off */ } +static const struct dccg_funcs dccg35_funcs_new = { + .update_dpp_dto = dccg35_update_dpp_dto_cb, + .dpp_root_clock_control = dccg35_dpp_root_clock_control_cb, + .get_dccg_ref_freq = dccg31_get_dccg_ref_freq, + .dccg_init = dccg35_init, + .set_dpstreamclk = dccg35_set_dpstreamclk_cb, + .set_dpstreamclk_root_clock_gating = dccg35_set_dpstreamclk_root_clock_gating_cb, + .enable_symclk32_se = dccg35_enable_symclk32_se_cb, + .disable_symclk32_se = dccg35_disable_symclk32_se_cb, + .enable_symclk32_le = dccg35_enable_symclk32_le_cb, + .disable_symclk32_le = dccg35_disable_symclk32_le_cb, + .set_symclk32_le_root_clock_gating = dccg35_set_symclk32_le_root_clock_gating_cb, + .set_physymclk = dccg35_set_physymclk_cb, + .set_physymclk_root_clock_gating = dccg35_set_physymclk_root_clock_gating_cb, + .set_dtbclk_dto = dccg35_set_dtbclk_dto_cb, + .set_audio_dtbclk_dto = dccg31_set_audio_dtbclk_dto, + .set_fifo_errdet_ovr_en = dccg2_set_fifo_errdet_ovr_en, + .otg_add_pixel = dccg31_otg_add_pixel, + .otg_drop_pixel = dccg31_otg_drop_pixel, + .set_dispclk_change_mode = dccg31_set_dispclk_change_mode, + .disable_dsc = dccg35_disable_dscclk_cb, + .enable_dsc = dccg35_enable_dscclk_cb, + .set_pixel_rate_div = dccg35_set_pixel_rate_div, + .get_pixel_rate_div = dccg35_get_pixel_rate_div, + .trigger_dio_fifo_resync = dccg35_trigger_dio_fifo_resync, + .set_valid_pixel_rate = dccg35_set_valid_pixel_rate, + .enable_symclk_se = dccg35_enable_symclk_se_cb, + .disable_symclk_se = dccg35_disable_symclk_se_cb, + .set_dtbclk_p_src = dccg35_set_dtbclk_p_src_cb, +}; +static const struct dccg_funcs dccg35_funcs = { .update_dpp_dto = dccg35_update_dpp_dto, .dpp_root_clock_control = dccg35_dpp_root_clock_control,
@@ -2296,62 +2393,10 @@ struct dccg *dccg35_create(BREAK_TO_DEBUGGER ();return NULL ; } - -/* Temporary declaration to handle unused static functions */ - (void )&dccg35_set_dsc_clk_rcg; - (void )&dccg35_set_symclk32_se_rcg; - (void )&dccg35_set_symclk32_le_rcg; - (void )&dccg35_set_physymclk_rcg; - (void )&dccg35_set_symclk_fe_rcg; - (void )&dccg35_set_dtbclk_p_rcg; - (void )&dccg35_set_dppclk_rcg; - (void )&dccg35_set_dpstreamclk_rcg; - (void )&dccg35_set_smclk32_se_rcg; - (void )&dccg35_set_dsc_clk_src_new; - (void )&dccg35_set_symclk32_se_src_new; - (void )&dccg35_is_symclk32_se_src_functional_le_new; - (void )&dccg35_set_symclk32_le_src_new; - (void )&dcn35_set_dppclk_src_new; - (void )&dccg35_set_dtbclk_p_src_new; - (void )&dccg35_set_dpstreamclk_src_new; - (void )&dccg35_set_physymclk_src_new; - (void )&dccg35_is_symclk_fe_src_functional_be; - (void )&dccg35_set_symclk_fe_src_new; - (void )&dccg35_is_fe_rcg; - (void )&dccg35_is_symclk32_se_rcg; - (void )&dccg35_enable_symclk_fe_new; - (void )&dccg35_disable_symclk_fe_new; - (void )&dccg35_enable_symclk_be_new; (void )&dccg35_disable_symclk_be_new; - (void )&dccg35_enable_symclk32_se_new; - (void )&dccg35_disable_symclk32_se_new; - (void )&dccg35_enable_symclk32_le_new; - (void )&dccg35_disable_symclk32_le_new; - (void )&dccg35_enable_dpp_clk_new; - (void )&dccg35_enable_dpp_clk_new; - (void )&dccg35_disable_dscclk_new; - (void )&dccg35_enable_dscclk_new; - (void )&dccg35_enable_dtbclk_p_new; - (void )&dccg35_disable_dtbclk_p_new; - (void )&dccg35_enable_dpstreamclk_new; - (void )&dccg35_disable_dpstreamclk_new; - (void )&dccg35_set_dpstreamclk_cb; - (void )&dccg35_dpp_root_clock_control_cb; - (void )&dccg35_set_dpstreamclk_root_clock_gating_cb; - (void )&dccg35_update_dpp_dto_cb; - (void )&dccg35_dpp_root_clock_control_cb; - (void )&dccg35_disable_symclk_se_cb; - (void )&dccg35_enable_symclk_se_cb; - (void )&dccg35_enable_dscclk_cb; - (void )&dccg35_disable_dscclk_cb; - (void )&dccg35_set_dtbclk_dto_cb; - (void )&dccg35_set_dtbclk_p_src_cb; (void )&dccg35_set_symclk32_le_root_clock_gating; - (void )&dccg35_disable_symclk32_le_cb; - (void )&dccg35_set_symclk_be_src_new; - (void )&dccg35_set_symclk_be_rcg; - (void )&dccg35_enable_symclk32_se_cb; - (void )&dccg35_disable_symclk32_se_cb; + (void )&dccg35_set_smclk32_se_rcg; + (void )&dccg35_funcs_new; base = &dccg_dcn->base; base->ctx = ctx;
Signature · 1 line
2.37.3
PATCH 20/22 drm/amd/display: Revert Avoid overflow assignment
In reply to Wayne LinFrom: Gabe Teeger <[email protected]>
This reverts commit 4362962f41b8 ("drm/amd/display: Avoid overflow assignment in link_dp_cts") Due to regression causing DPMS hang.
--- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 +- drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c | 3 +-- drivers/gpu/drm/amd/display/include/dpcd_defs.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dp_types.h +1 -1
@@ -727,7 +727,7 @@ struct dp_audio_test_data_flags {struct dp_audio_test_data {struct dp_audio_test_data_flags flags; -uint32_t sampling_rate; +uint8_t sampling_rate;uint8_t channel_count;uint8_t pattern_type;uint8_t pattern_period[8 ];
drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c +1 -2
@@ -775,8 +775,7 @@ bool dp_set_test_pattern(core_link_read_dpcd (link,DP_TRAINING_PATTERN_SET , &training_pattern.raw,sizeof (training_pattern)); -if (pattern <=PHY_TEST_PATTERN_END_DP11 ) - training_pattern.v1_3.LINK_QUAL_PATTERN_SET = pattern; + training_pattern.v1_3.LINK_QUAL_PATTERN_SET = pattern;core_link_write_dpcd (link,DP_TRAINING_PATTERN_SET , &training_pattern.raw,sizeof (training_pattern));
drivers/gpu/drm/amd/display/include/dpcd_defs.h +0 -1
@@ -76,7 +76,6 @@ enum dpcd_phy_test_patterns {PHY_TEST_PATTERN_D10_2 ,PHY_TEST_PATTERN_SYMBOL_ERROR ,PHY_TEST_PATTERN_PRBS7 , -PHY_TEST_PATTERN_END_DP11 =PHY_TEST_PATTERN_PRBS7 ,PHY_TEST_PATTERN_80BIT_CUSTOM ,/* For DP1.2 only */ PHY_TEST_PATTERN_CP2520_1 , PHY_TEST_PATTERN_CP2520_2,
Signature · 1 line
2.37.3
PATCH 21/22 drm/amd/display: Add DML2.1 option to disable DRR clamped P-State Strategies
In reply to Wayne LinFrom: Dillon Varone <[email protected]>
[WHY & HOW]
When DRR is active with variable refresh rate, add the ability to block DRR clamped P-State strategies (such as SubVP).
--- drivers/gpu/drm/amd/display/dc/dc.h | 1 + drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 4 +++- .../gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h | 1 + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 7 +++++-- 4 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -511,6 +511,7 @@ enum in_game_fams_config {INGAME_FAMS_SINGLE_DISP_ENABLE ,// enable in-game fams INGAME_FAMS_DISABLE ,// disable in-game fams INGAME_FAMS_MULTI_DISP_ENABLE ,//enable in-game fams for multi-display + INGAME_FAMS_MULTI_DISP_CLAMPED_ONLY, //enable in-game fams for multi-display only for clamped RR strategies };/**
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c +3 -1
@@ -66,7 +66,9 @@ static void dml21_apply_debug_options(const struct dc *in_dc, struct dml2_contex disable_fams2; pmo_options->disable_fams2 = disable_fams2; - pmo_options->disable_drr_var_when_var_active = in_dc->debug.disable_fams_gaming; + pmo_options->disable_drr_var_when_var_active = in_dc->debug.disable_fams_gaming ==INGAME_FAMS_DISABLE || + in_dc->debug.disable_fams_gaming ==INGAME_FAMS_MULTI_DISP_CLAMPED_ONLY ; + pmo_options->disable_drr_clamped_when_var_active = in_dc->debug.disable_fams_gaming ==INGAME_FAMS_DISABLE ; }static void dml21_init (const struct dc *in_dc,struct dml2_context **dml_ctx,const struct dml2_configuration_options *config)
drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h +1 -0
@@ -74,6 +74,7 @@ struct dml2_pmo_options {bool disable_drr_var;bool disable_drr_clamped;bool disable_drr_var_when_var_active; +bool disable_drr_clamped_when_var_active;bool disable_fams2;bool disable_vactive_det_fill_bw_pad;/* dml2_project_dcn4x_stage2_auto_drr_svp and above only */ bool disable_dyn_odm;
drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c +5 -2
@@ -1441,8 +1441,11 @@ static bool stream_matches_drr_policy(struct dml2_pmo_instance *pmo, strategy_matches_drr_requirements = false; }else if (is_bit_set_in_bitfield (PMO_DRR_CLAMPED_STRATEGY_MASK , stream_pstate_method) && (pmo->options->disable_drr_clamped || - !stream_descriptor->timing.drr_config.enabled || - (!stream_descriptor->timing.drr_config.drr_active_fixed && !stream_descriptor->timing.drr_config.drr_active_variable))) { + (!stream_descriptor->timing.drr_config.enabled || + (!stream_descriptor->timing.drr_config.drr_active_fixed && !stream_descriptor->timing.drr_config.drr_active_variable)) || + (pmo->options->disable_drr_clamped_when_var_active && + stream_descriptor->timing.drr_config.enabled && + stream_descriptor->timing.drr_config.drr_active_variable))) {/* DRR fixed strategies are disallowed due to settings or policy */ strategy_matches_drr_requirements = false; } else if (is_bit_set_in_bitfield(PMO_FW_STRATEGY_MASK, stream_pstate_method) &&
Signature · 1 line
2.37.3
PATCH 22/22 drm/amd/display: 3.2.295
In reply to Wayne LinFrom: Aric Cyr <[email protected]>
This version brings along following fixes:
- Clean up some files style problems
- Program the DET segment when initializing pipes in dcn10_hwseq
- Fix overlay with pre-blend color processing
- Disable SubVP if Hardware Rotation is Used
- Fix few things in DML
- Re-enable panel replay feature
- Fix null pointer dereference under mst+dsc
--- drivers/gpu/drm/amd/display/dc/dc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dc.h +1 -1
@@ -55,7 +55,7 @@ struct aux_payload;struct set_config_cmd_payload ;struct dmub_notification ; -#define DC_VER "3.2.294" +#define DC_VER "3.2.295"#define MAX_SURFACES 3#define MAX_PLANES 6
Signature · 1 line
2.37.3
[Public]
Hi all,
This week this patchset was tested on the following systems:
* Lenovo ThinkBook T13s Gen4 with AMD Ryzen 5 6600U
* MSI Gaming X Trio RX 6800
* Gigabyte Gaming OC RX 7900 XTX
These systems were tested on the following display/connection types:
* eDP, (1080p 60hz [5650U]) (1920x1200 60hz [6600U]) (2560x1600 120hz[6600U])
* DP/HDMI/USB-C (1440p 170hz, 4k 60hz, 4k 144hz, 4k 240hz [Includes USB-C to DP/HDMI adapters])
* Thunderbolt (LG Ultrafine 5k)
* MST (Startech MST14DP123DP [DP to 3x DP] and 2x 4k 60Hz displays)
* DSC (with Cable Matters 101075 [DP to 3x DP] with 3x 4k60 displays, and HP Hook G2 with 1 4k60 display)
* USB 4 (Kensington SD5700T and 1x 4k 60Hz display)
* PCON (Club3D CAC-1085 and 1x 4k 144Hz display [at 4k 120HZ, as that is the max the adapter supports])
The testing is a mix of automated and manual tests. Manual testing includes (but is not limited to):
* Changing display configurations and settings
* Benchmark testing
* Feature testing (Freesync, etc.)
Automated testing includes (but is not limited to):
* Script testing (scripts to automate some of the manual checks)
* IGT testing
The patchset consists of the amd-staging-drm-next branch (Head commit - 2b693c21335d67a2c9958db79fa15464b0d194ba -> drm/amd/display: 3.2.294) with new patches added on top of it.
Tested on Ubuntu 24.04.1, on Wayland and X11, using KDE Plasma and Gnome.
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
amd.com
-----Original Message-----
From: Wayne Lin <[email protected]>
Sent: Tuesday, July 30, 2024 3:18 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Siqueira, Rodrigo <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Lin, Wayne <[email protected]>; Gutierrez, Agustin <[email protected]>; Chung, ChiaHsuan (Tom) <[email protected]>; Zuo, Jerry <[email protected]>; Mohamed, Zaeem <[email protected]>; Lin, Wayne <[email protected]>; Wheeler, Daniel <[email protected]>
Subject: [PATCH 00/22] DC Patches July 29, 2024
This DC patchset brings improvements in multiple areas. In summary, we have:
- Clean up some files style problems
- Program the DET segment when initializing pipes in dcn10_hwseq
- Fix overlay with pre-blend color processing
- Disable SubVP if Hardware Rotation is Used
- Fix few things in DML
- Re-enable panel replay feature
- Fix null pointer dereference under mst+dsc
Aric Cyr (1):
drm/amd/display: 3.2.295
Aurabindo Pillai (1):
drm/amd/display: fix a UBSAN warning in DML2.1
Austin Zheng (1):
drm/amd/display: Disable SubVP if Hardware Rotation is Used
Chris Park (1):
drm/amd/display: Address coverity change
Dillon Varone (2):
drm/amd/display: Force enable 3DLUT DMA check for dcn401 in DML drm/amd/display: Add DML2.1 option to disable DRR clamped P-State
Strategies
Fangzhi Zuo (2):
drm/amd/display: Print Pcon FRL Link BW in Debug Message drm/amd/display: Skip Recompute DSC Params if no Stream on Link
Fudong Wang (1):
drm/amd/display: skip crtc power down when ips switch
Gabe Teeger (1):
drm/amd/display: Revert Avoid overflow assignment
Hansen Dsouza (3):
drm/amd/display: Add stream and char control callback drm/amd/display: Add clock control callbacks drm/amd/display: Add clock control callbacks
Joshua Aberback (1):
drm/amd/display: Assume 32 bpp cursor in DML21
Michael Strauss (1):
drm/amd/display: Fix overlay with pre-blend color processing
Rodrigo Siqueira (6):
drm/amd/display: Add missing DCN314 to the DML Makefile drm/amd/display: Cleanup dml2 and dc/resource Makefile drm/amd/display: Remove useless defines drm/amd/display: Remove unused fields from
dmub_cmd_update_dirty_rect_data
drm/amd/display: Remove unused fields from dc_caps drm/amd/display: Add missing program DET segment call to pipe init
Tom Chung (1):
drm/amd/display: Re-enable panel replay feature
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 20 +- .../display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 6 +- drivers/gpu/drm/amd/display/dc/dc.h | 8 +- drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 +- .../amd/display/dc/dccg/dcn35/dcn35_dccg.c | 528 +++++++++++++++--- drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 2 - .../dc/dml2/dml21/dml21_translation_helper.c | 19 +- .../amd/display/dc/dml2/dml21/dml21_wrapper.c | 4 +- .../display/dc/dml2/dml21/inc/dml_top_types.h | 1 + .../src/dml2_core/dml2_core_dcn4_calcs.c | 93 +-- .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 10 +- .../drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 9 +- .../display/dc/link/accessories/link_dp_cts.c | 3 +- .../dc/link/protocols/link_dp_capability.c | 2 + .../gpu/drm/amd/display/dc/resource/Makefile | 2 - .../dc/resource/dcn401/dcn401_resource.c | 1 + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 8 - .../gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 8 - .../gpu/drm/amd/display/include/dpcd_defs.h | 1 - 22 files changed, 552 insertions(+), 181 deletions(-)
--
2.37.3