DC Patches Apr 20 2026
cover DC Patches Apr 20 2026
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Add allow_clock_gating to dcn42 dccg.
- Bypass post csc for additional color spaces in dcn42.
- Remove unused dml2_project.
- Unset Replay desync error verification by default.
- Align HWSS fast commit path with legacy path.
- Fix implicit narrowing conversion warnings.
- Enable driver power gating.
- Fix double free.
- Introduce power module on Linux.
- Add power module on Linux.
- Fix fpu guard warning.
- Add Replay/PSR active check in link loss status check.
- Remove SYMCLK F and G values from link encoder and MANUAL_FLOW_CONTROL from optc.
- Add minimum vfp requirement.
- Fix narrowing boundaries and eDP parser assignment.
- Fix dml2_0 narrowing boundaries.
- Add README.md file to DML2_0 repository.
- Fix DPMS using partially updated pipe context.
- Move dml2_destroy to non-FPU compilation unit.
Allen Li (2):
drm/amd/display: Unset Replay desync error verification by default drm/amd/display: Add Replay/PSR active check in link loss status check
Andrew Lichmanov (1):
drm/amd/display: Remove SYMCLK F and G values from link encoder and
MANUAL_FLOW_CONTROL from optc
Dillon Varone (1):
drm/amd/display: Add minimum vfp requirement
Dominik Kaszewski (1):
drm/amd/display: Fix DPMS using partially updated pipe context
Gaghik Khachatrian (3):
drm/amd/display: Fix implicit narrowing conversion warnings drm/amd/display: Fix narrowing boundaries and eDP parser assignment drm/amd/display: Fix dml2_0 narrowing boundaries
Ilya Bakoulin (1):
drm/amd/display: Fix double free
Rafal Ostrowski (2):
drm/amd/display: Align HWSS fast commit path with legacy path drm/amd/display: Move dml2_destroy to non-FPU compilation unit
Ray Wu (2):
drm/amd/display: Introduce power module on Linux drm/amd/display: Add power module on Linux
Roman Li (3):
drm/amd/display: Add allow_clock_gating to dcn42 dccg drm/amd/display: bypass post csc for additional color spaces in dcn42 drm/amd/display: Remove unused dml2_project
Samson Tam (1):
drm/amd/display: Add README.md file to DML2_0 repository
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.379
Wayne Lin (1):
drm/amd/display: Fix fpu guard warning
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 344 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 36 +- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 74 +- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 5 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 60 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 26 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 242 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 13 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 143 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.h | 28 +- .../display/amdgpu_dm/amdgpu_dm_services.c | 27 + .../drm/amd/display/dc/basics/custom_float.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +- .../drm/amd/display/dc/bios/bios_parser2.c | 21 +- .../drm/amd/display/dc/bios/command_table.c | 12 +- .../drm/amd/display/dc/bios/command_table2.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 39 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 13 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 15 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 15 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 16 +- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 40 +- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 22 +- .../amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 1 - drivers/gpu/drm/amd/display/dc/core/dc.c | 206 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 565 ++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 66 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 26 +- .../gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 137 +- drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 6 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 12 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 38 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 30 + .../amd/display/dc/dccg/dcn31/dcn31_dccg.c | 4 +- .../amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 +- .../amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- .../drm/amd/display/dc/dce/dce_clock_source.c | 24 +- .../gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 2 +- .../gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 +- .../drm/amd/display/dc/dce/dce_panel_cntl.c | 4 +- .../drm/amd/display/dc/dce/dce_transform.c | 8 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 14 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 12 +- .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 23 +- .../display/dc/dce80/dce80_timing_generator.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 4 +- .../drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 16 +- .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 2 +- .../dc/dio/dcn42/dcn42_dio_link_encoder.h | 2 - .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 4 +- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 5 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 9 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 2 +- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 6 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 6 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 37 +- .../gpu/drm/amd/display/dc/dml2_0/README.md | 31 + .../amd/display/dc/dml2_0/display_mode_core.c | 14 +- .../amd/display/dc/dml2_0/display_mode_util.c | 20 +- .../dml2_0/dml21/dml21_translation_helper.c | 15 +- .../amd/display/dc/dml2_0/dml21/dml21_utils.c | 2 +- .../display/dc/dml2_0/dml21/dml21_wrapper.c | 4 +- .../dc/dml2_0/dml21/inc/dml_top_types.h | 1 - .../dml21/src/dml2_core/dml2_core_factory.c | 1 - .../dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - .../dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - .../dml21/src/dml2_pmo/dml2_pmo_factory.c | 3 +- .../dml21/src/dml2_top/dml2_top_interfaces.c | 1 - .../amd/display/dc/dml2_0/dml2_mall_phantom.c | 100 +- .../drm/amd/display/dc/dml2_0/dml2_policy.c | 6 +- .../dc/dml2_0/dml2_translation_helper.c | 4 +- .../drm/amd/display/dc/dml2_0/dml2_utils.c | 40 +- .../drm/amd/display/dc/dml2_0/dml2_wrapper.c | 11 + .../amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 10 - .../drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 6 +- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 16 +- .../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 33 +- drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 2 +- .../gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 9 + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- .../display/dc/hubbub/dcn10/dcn10_hubbub.c | 16 +- .../display/dc/hubbub/dcn20/dcn20_hubbub.c | 28 +- .../display/dc/hubbub/dcn20/dcn20_hubbub.h | 3 + .../display/dc/hubbub/dcn21/dcn21_hubbub.c | 12 +- .../display/dc/hubbub/dcn30/dcn30_hubbub.c | 12 +- .../display/dc/hubbub/dcn31/dcn31_hubbub.c | 12 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 4 +- .../amd/display/dc/hubp/dcn21/dcn21_hubp.c | 4 +- .../amd/display/dc/hubp/dcn30/dcn30_hubp.c | 4 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 33 +- .../amd/display/dc/hwss/dce120/dce120_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 13 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 8 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 16 +- .../amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 18 +- .../drm/amd/display/dc/hwss/hw_sequencer.h | 138 + drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- .../dc/irq/dce110/irq_service_dce110.c | 2 +- .../display/dc/link/accessories/link_dp_cts.c | 37 +- .../display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- .../drm/amd/display/dc/link/link_detection.c | 4 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 16 +- .../drm/amd/display/dc/link/link_factory.c | 6 +- .../amd/display/dc/link/protocols/link_ddc.c | 5 +- .../dc/link/protocols/link_dp_capability.c | 2 +- .../display/dc/link/protocols/link_dp_dpia.c | 2 +- .../dc/link/protocols/link_dp_dpia_bw.c | 10 +- .../dc/link/protocols/link_dp_irq_handler.c | 57 +- .../dc/link/protocols/link_dp_panel_replay.c | 27 +- .../link/protocols/link_dp_training_8b_10b.c | 10 +- .../link/protocols/link_edp_panel_control.c | 41 +- .../dc/mmhubbub/dcn20/dcn20_mmhubbub.c | 4 +- .../dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- .../amd/display/dc/optc/dcn20/dcn20_optc.c | 4 +- .../amd/display/dc/optc/dcn42/dcn42_optc.h | 1 - .../dc/resource/dce110/dce110_resource.c | 4 +- .../dc/resource/dcn10/dcn10_resource.c | 4 +- .../dc/resource/dcn20/dcn20_resource.c | 24 +- .../dc/resource/dcn21/dcn21_resource.c | 9 +- .../dc/resource/dcn30/dcn30_resource.c | 14 +- .../dc/resource/dcn301/dcn301_resource.c | 8 +- .../dc/resource/dcn302/dcn302_resource.c | 4 +- .../dc/resource/dcn303/dcn303_resource.c | 4 +- .../dc/resource/dcn31/dcn31_resource.c | 11 +- .../dc/resource/dcn314/dcn314_resource.c | 4 +- .../dc/resource/dcn315/dcn315_resource.c | 11 +- .../dc/resource/dcn316/dcn316_resource.c | 11 +- .../dc/resource/dcn32/dcn32_resource.c | 20 +- .../resource/dcn32/dcn32_resource_helpers.c | 2 +- .../dc/resource/dcn321/dcn321_resource.c | 4 +- .../dc/resource/dcn35/dcn35_resource.c | 4 +- .../dc/resource/dcn351/dcn351_resource.c | 4 +- .../dc/resource/dcn36/dcn36_resource.c | 4 +- .../dc/resource/dcn401/dcn401_resource.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 4 +- .../dcn401/dcn401_soc_and_ip_translator.c | 42 +- .../dcn42/dcn42_soc_and_ip_translator.c | 14 +- .../drm/amd/display/modules/inc/mod_power.h | 415 +++ .../display/modules/info_packet/info_packet.c | 2 +- .../drm/amd/display/modules/power/Makefile | 2 +- .../gpu/drm/amd/display/modules/power/power.c | 3030 +++++++++++++++++ .../amd/display/modules/power/power_helpers.c | 16 +- 159 files changed, 5833 insertions(+), 1416 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/README.md create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_power.h create mode 100644 drivers/gpu/drm/amd/display/modules/power/power.c
Signature · 1 line
2.43.0
PATCH 1/19 drm/amd/display: Add allow_clock_gating to dcn42 dccg
From: Roman Li <[email protected]>
[Why]
The allow_clock_gating function is present in all other DCN versions and is required to properly migrate DCCG registers access from hwseq to the dccg component, resolving register conflicts.
[How]
Add the missing .allow_clock_gating function pointer to the dccg42_funcs struct.
--- drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c +2 -0
@@ -6,6 +6,7 @@#include "core_types.h" #include "dcn35/dcn35_dccg.h" #include "dcn42_dccg.h" +#include "dcn20/dcn20_dccg.h" #define TO_DCN_DCCG (dccg)\ container_of(dccg, struct dcn_dccg, base)
@@ -306,6 +307,7 @@ static const struct dccg_funcs dccg42_funcs = { .dccg_root_gate_disable_control = dccg35_root_gate_disable_control, .dccg_read_reg_state = dccg31_read_reg_state, .dccg_enable_global_fgcg = dccg42_enable_global_fgcg, + .allow_clock_gating = dccg2_allow_clock_gating }; struct dccg *dccg42_create(
Signature · 1 line
2.43.0
PATCH 2/19 drm/amd/display: bypass post csc for additional color spaces in dcn42
In reply to Chenyu ChenFrom: Roman Li <[email protected]>
[Why]
This aligns dcn42 with:
"drm/amd/display: bypass post csc for additional color spaces in dal"
[How]
Apply the same post csc bypass logic to dcn42 dpp using the helper function.
--- drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c +3 -3
@@ -269,10 +269,10 @@ static void dpp42_dpp_setup( tbl_entry.color_space = input_color_space; -if (color_space >=COLOR_SPACE_YCBCR601 ) - select =INPUT_CSC_SELECT_ICSC ; -else +if (dpp3_should_bypass_post_csc_for_colorspace (color_space)) select =INPUT_CSC_SELECT_BYPASS ; +else + select =INPUT_CSC_SELECT_ICSC ;dpp3_program_post_csc (dpp_base, color_space, select, &tbl_entry);
Signature · 1 line
2.43.0
PATCH 3/19 drm/amd/display: Remove unused dml2_project
In reply to Chenyu ChenFrom: Roman Li <[email protected]>
Remove all references to dml2_project_dcn40 from dml2. The project is not used.
--- .../gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 - .../display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 1 - .../display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - .../display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - .../display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 3 +-- .../display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c | 1 - 6 files changed, 1 insertion(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h +0 -1
@@ -19,7 +19,6 @@ enum dml2_project_id { dml2_project_dcn4x_stage1, dml2_project_dcn4x_stage2, dml2_project_dcn4x_stage2_auto_drr_svp, - dml2_project_dcn40, dml2_project_dcn42, };
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c +0 -1
@@ -21,7 +21,6 @@ bool dml2_core_create(enum dml2_project_id project_id, struct dml2_core_instancecase dml2_project_dcn4x_stage1: result = false;break ; -case dml2_project_dcn40:case dml2_project_dcn4x_stage2:case dml2_project_dcn4x_stage2_auto_drr_svp: out->initialize = &core_dcn4_initialize;
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c +0 -1
@@ -33,7 +33,6 @@ bool dml2_dpmm_create(enum dml2_project_id project_id, struct dml2_dpmm_instance out->map_watermarks = &dummy_map_watermarks; result = true;break ; -case dml2_project_dcn40:case dml2_project_dcn4x_stage2: out->map_mode_to_soc_dpm = &dpmm_dcn3_map_mode_to_soc_dpm; out->map_watermarks = &dummy_map_watermarks;
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c +0 -1
@@ -27,7 +27,6 @@ bool dml2_mcg_create(enum dml2_project_id project_id, struct dml2_mcg_instance * out->build_min_clock_table = &dummy_build_min_clock_table; result = true;break ; -case dml2_project_dcn40:case dml2_project_dcn4x_stage2:case dml2_project_dcn4x_stage2_auto_drr_svp: out->build_min_clock_table = &mcg_dcn4_build_min_clock_table;
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c +1 -2
@@ -3,8 +3,8 @@// Copyright 2024 Advanced Micro Devices, Inc. #include "dml2_pmo_factory.h" -#include "dml2_pmo_dcn3.h" #include "dml2_pmo_dcn4_fams2.h" +#include "dml2_pmo_dcn3.h" #include "dml2_external_lib_deps.h" static bool dummy_init_for_stutter (struct dml2_pmo_init_for_stutter_in_out *in_out)
@@ -40,7 +40,6 @@ bool dml2_pmo_create(enum dml2_project_id project_id, struct dml2_pmo_instance * out->optimize_dcc_mcache = pmo_dcn4_fams2_optimize_dcc_mcache; result = true;break ; -case dml2_project_dcn40:case dml2_project_dcn4x_stage2: out->initialize = pmo_dcn3_initialize;
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c +0 -1
@@ -17,7 +17,6 @@ bool dml2_initialize_instance(struct dml2_initialize_instance_in_out *in_out)case dml2_project_dcn4x_stage1:case dml2_project_dcn4x_stage2:case dml2_project_dcn4x_stage2_auto_drr_svp: -case dml2_project_dcn40:case dml2_project_dcn42:return dml2_top_soc15_initialize_instance (in_out);case dml2_project_invalid:
Signature · 1 line
2.43.0
PATCH 4/19 drm/amd/display: Unset Replay desync error verification by default
In reply to Chenyu ChenFrom: Allen Li <[email protected]>
[Why & How]
There will be an unexpected desync error while doing PSR -> Replay transit, so we want to disable the replay desync error detection by default.
--- .../drm/amd/display/dc/link/protocols/link_edp_panel_control.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +1 -2
@@ -1050,8 +1050,7 @@ bool edp_setup_freesync_replay(struct dc_link *link, const struct dc_stream_statif (link->replay_settings.replay_feature_enabled) { replay_config.bits.FREESYNC_PANEL_REPLAY_MODE =1 ; - replay_config.bits.TIMING_DESYNC_ERROR_VERIFICATION = - link->replay_settings.config.replay_timing_sync_supported; + replay_config.bits.TIMING_DESYNC_ERROR_VERIFICATION =0 ; replay_config.bits.STATE_TRANSITION_ERROR_DETECTION =1 ; dm_helpers_dp_write_dpcd(link->ctx, link, DP_SINK_PR_ENABLE_AND_CONFIGURATION,
Signature · 1 line
2.43.0
PATCH 5/19 drm/amd/display: Align HWSS fast commit path with legacy path
In reply to Chenyu ChenFrom: Rafal Ostrowski <[email protected]>
Add missing operations to commit_planes_for_stream_fast and hwss_build_fast_sequence to match the legacy commit_planes_for_stream behavior for UPDATE_TYPE_FAST updates.
- Add stream-level fast update flags (cursor_attr, cursor_pos, periodic_interrupt, info_frame, dmdata, dither) to dc_stream.h
- Add stream-level fields to dc_fast_update struct for fast/full update classification in populate_fast_updates/fast_updates_exist
- Add HWSS_SETUP_PERIODIC_INTERRUPT block sequence entry, delegating to dc->hwss.setup_periodic_interrupt instead of calling dcn10 directly
- Add HUBP_ENABLE_3DLUT_FL block for 3DLUT FL with should_update_pipe_for_stream/plane guards
- Add DPP_SET_CURSOR_MATRIX block with new cursor_csc_change flag
- Widen DPP_PROGRAM_GAMUT_REMAP to also trigger on stream gamut_remap
- Add info frame, dmdata, dither, and cursor blocks to hwss_build_fast_sequence
- Reclassify cursor_position/cursor_attributes as UPDATE_TYPE_FAST
- Extract dc_dmdata_types.h to resolve circular include between hw_sequencer.h and dc_stream.h
- Remove dcn10_hwseq.h include from dc_hw_sequencer.c
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 117 ++++- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 475 +++++++++++++++++- drivers/gpu/drm/amd/display/dc/dc.h | 15 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 35 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 30 ++ .../drm/amd/display/dc/hwss/hw_sequencer.h | 138 +++++ 6 files changed, 765 insertions(+), 45 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +103 -14
@@ -2947,6 +2947,11 @@ static struct surface_update_descriptor det_surface_update(elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } +if (u->cursor_csc_color_matrix) { + update_flags->bits.cursor_csc_color_matrix_change =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } +if (u->coeff_reduction_factor) { update_flags->bits.coeff_reduction_change =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM );
@@ -3074,7 +3079,7 @@ static struct surface_update_descriptor check_update_surfaces_for_stream(elevate_update_type (&overall_type,UPDATE_TYPE_FULL ,LOCK_DESCRIPTOR_GLOBAL |LOCK_DESCRIPTOR_LINK ); } -if (stream_update->gamut_remap) +if (check_config->enable_legacy_fast_update && stream_update->gamut_remap) su_flags->bits.gamut_remap =1 ;if (stream_update->wb_update)
@@ -3105,6 +3110,29 @@ static struct surface_update_descriptor check_update_surfaces_for_stream(elevate_update_type (&overall_type,UPDATE_TYPE_FULL ,LOCK_DESCRIPTOR_GLOBAL );// Non-global cases + +if (stream_update->gamut_remap) { + su_flags->bits.gamut_remap =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } + +if ((stream_update->hdr_static_metadata && !stream_update->stream->use_dynamic_meta) || + stream_update->vrr_infopacket || + stream_update->vsc_infopacket || + stream_update->vsp_infopacket || + stream_update->hfvsif_infopacket || + stream_update->adaptive_sync_infopacket || + stream_update->vtem_infopacket || + stream_update->avi_infopacket) { + su_flags->bits.info_frame =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } + +if (stream_update->hdr_static_metadata && stream_update->stream->use_dynamic_meta) { + su_flags->bits.dmdata =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } +if (stream_update->output_csc_transform) { su_flags->bits.out_csc =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM );
@@ -3114,6 +3142,26 @@ static struct surface_update_descriptor check_update_surfaces_for_stream( su_flags->bits.out_tf =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } + +if (stream_update->periodic_interrupt) { + su_flags->bits.periodic_interrupt =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } + +if (stream_update->dither_option) { + su_flags->bits.dither =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } + +if (stream_update->cursor_attributes) { + su_flags->bits.cursor_attr =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } + +if (stream_update->cursor_position) { + su_flags->bits.cursor_pos =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); + } }for (int i =0 ; i < surface_count; i++) {
@@ -5110,9 +5158,35 @@ void populate_fast_updates(struct dc_fast_update *fast_update,if (stream_update) { fast_update[0 ].out_transfer_func = stream_update->out_transfer_func; fast_update[0 ].output_csc_transform = stream_update->output_csc_transform; + fast_update[0 ].cursor_attributes = stream_update->cursor_attributes; + fast_update[0 ].cursor_position = stream_update->cursor_position; + fast_update[0 ].periodic_interrupt = stream_update->periodic_interrupt; + fast_update[0 ].dither_option = stream_update->dither_option; + fast_update[0 ].gamut_remap = stream_update->gamut_remap; + fast_update[0 ].vrr_infopacket = stream_update->vrr_infopacket; + fast_update[0 ].vsc_infopacket = stream_update->vsc_infopacket; + fast_update[0 ].vsp_infopacket = stream_update->vsp_infopacket; + fast_update[0 ].hfvsif_infopacket = stream_update->hfvsif_infopacket; + fast_update[0 ].vtem_infopacket = stream_update->vtem_infopacket; + fast_update[0 ].adaptive_sync_infopacket = stream_update->adaptive_sync_infopacket; + fast_update[0 ].avi_infopacket = stream_update->avi_infopacket; + fast_update[0 ].hdr_static_metadata = stream_update->hdr_static_metadata; }else { fast_update[0 ].out_transfer_func =NULL ; fast_update[0 ].output_csc_transform =NULL ; + fast_update[0 ].cursor_attributes =NULL ; + fast_update[0 ].cursor_position =NULL ; + fast_update[0 ].periodic_interrupt =NULL ; + fast_update[0 ].dither_option =NULL ; + fast_update[0 ].gamut_remap =NULL ; + fast_update[0 ].vrr_infopacket =NULL ; + fast_update[0 ].vsc_infopacket =NULL ; + fast_update[0 ].vsp_infopacket =NULL ; + fast_update[0 ].hfvsif_infopacket =NULL ; + fast_update[0 ].vtem_infopacket =NULL ; + fast_update[0 ].adaptive_sync_infopacket =NULL ; + fast_update[0 ].avi_infopacket =NULL ; + fast_update[0 ].hdr_static_metadata =NULL ; }for (i =0 ; i < surface_count; i++) {
@@ -5133,7 +5207,20 @@ static bool fast_updates_exist(const struct dc_fast_update *fast_update, int surint i;if (fast_update[0 ].out_transfer_func || - fast_update[0 ].output_csc_transform) + fast_update[0 ].output_csc_transform || + fast_update[0 ].gamut_remap || + fast_update[0 ].cursor_attributes || + fast_update[0 ].cursor_position || + fast_update[0 ].periodic_interrupt || + fast_update[0 ].dither_option || + fast_update[0 ].vrr_infopacket || + fast_update[0 ].vsc_infopacket || + fast_update[0 ].vsp_infopacket || + fast_update[0 ].hfvsif_infopacket || + fast_update[0 ].vtem_infopacket || + fast_update[0 ].adaptive_sync_infopacket || + fast_update[0 ].avi_infopacket || + fast_update[0 ].hdr_static_metadata)return true;for (i =0 ; i < surface_count; i++) {
@@ -5157,7 +5244,20 @@ bool fast_nonaddr_updates_exist(struct dc_fast_update *fast_update, int surface_int i;if (fast_update[0 ].out_transfer_func || - fast_update[0 ].output_csc_transform) + fast_update[0 ].output_csc_transform || + fast_update[0 ].cursor_attributes || + fast_update[0 ].cursor_position || + fast_update[0 ].periodic_interrupt || + fast_update[0 ].dither_option || + fast_update[0 ].gamut_remap || + fast_update[0 ].vrr_infopacket || + fast_update[0 ].vsc_infopacket || + fast_update[0 ].vsp_infopacket || + fast_update[0 ].hfvsif_infopacket || + fast_update[0 ].vtem_infopacket || + fast_update[0 ].adaptive_sync_infopacket || + fast_update[0 ].avi_infopacket || + fast_update[0 ].hdr_static_metadata)return true;for (i =0 ; i < surface_count; i++) {
@@ -5241,23 +5341,12 @@ static bool full_update_required( (((stream_update->src.height != 0 && stream_update->src.width != 0) || (stream_update->dst.height != 0 && stream_update->dst.width != 0) || stream_update->integer_scaling_update) || - stream_update->hdr_static_metadata || stream_update->abm_level || - stream_update->periodic_interrupt || - stream_update->vrr_infopacket || - stream_update->vsc_infopacket || - stream_update->vsp_infopacket || - stream_update->hfvsif_infopacket || - stream_update->vtem_infopacket || - stream_update->adaptive_sync_infopacket || - stream_update->avi_infopacket || stream_update->dpms_off || stream_update->allow_freesync || stream_update->vrr_active_variable || stream_update->vrr_active_fixed || - stream_update->gamut_remap || stream_update->output_color_space || - stream_update->dither_option || stream_update->wb_update || stream_update->dsc_config || stream_update->mst_bw_update ||
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +473 -2
558 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc.h +15 -0
@@ -1485,6 +1485,7 @@ union surface_update_flags { uint32_t pixel_format_change:1; uint32_t plane_size_change:1; uint32_t gamut_remap_change:1; + uint32_t cursor_csc_color_matrix_change:1;/* Full updates */ uint32_t new_plane:1;
@@ -1894,6 +1895,20 @@ struct dc_fast_update {#if defined(CONFIG_DRM_AMD_DC_DCN4_2 )struct cm_hist_control *cm_hist_control;#endif +/* stream-level fast updates */ +const struct colorspace_transform *gamut_remap; +const struct dc_cursor_attributes *cursor_attributes; +const struct dc_cursor_position *cursor_position; +const struct periodic_interrupt_config *periodic_interrupt; +const enum dc_dither_option *dither_option; +struct dc_info_packet *vrr_infopacket; +struct dc_info_packet *vsc_infopacket; +struct dc_info_packet *vsp_infopacket; +struct dc_info_packet *hfvsif_infopacket; +struct dc_info_packet *vtem_infopacket; +struct dc_info_packet *adaptive_sync_infopacket; +struct dc_info_packet *avi_infopacket; +struct dc_info_packet *hdr_static_metadata; };struct dc_surface_update {
drivers/gpu/drm/amd/display/dc/dc_stream.h +6 -29
@@ -64,35 +64,6 @@ struct dc_stream_status {bool fpo_in_use; }; -enum hubp_dmdata_mode { -DMDATA_SW_MODE , -DMDATA_HW_MODE -}; - -struct dc_dmdata_attributes { -/* Specifies whether dynamic meta data will be updated by software -* or has to be fetched by hardware (DMA mode) -*/ -enum hubp_dmdata_mode dmdata_mode; -/* Specifies if current dynamic meta data is to be used only for the current frame */ -bool dmdata_repeat; -/* Specifies the size of Dynamic Metadata surface in byte. Size of 0 means no Dynamic metadata is fetched */ -uint32_t dmdata_size; -/* Specifies if a new dynamic meta data should be fetched for an upcoming frame */ -bool dmdata_updated; -/* If hardware mode is used, the base address where DMDATA surface is located */ -PHYSICAL_ADDRESS_LOC address; -/* Specifies whether QOS level will be provided by TTU or it will come from DMDATA_QOS_LEVEL */ -bool dmdata_qos_mode; -/* If qos_mode = 1, this is the QOS value to be used: */ -uint32_t dmdata_qos_level; -/* Specifies the value in unit of REFCLK cycles to be added to the -* current time to produce the Amortized deadline for Dynamic Metadata chunk request -*/ -uint32_t dmdata_dl_delta; -/* An unbounded array of uint32s, represents software dmdata to be loaded */ -uint32_t *dmdata_sw_data; -};struct dc_writeback_info {bool wb_enabled;
@@ -146,6 +117,12 @@ union stream_update_flags { uint32_t fams_changed : 1; uint32_t scaler_sharpener : 1; uint32_t sharpening_required : 1; + uint32_t cursor_attr : 1; + uint32_t cursor_pos : 1; + uint32_t periodic_interrupt : 1; + uint32_t info_frame : 1; + uint32_t dmdata : 1; + uint32_t dither : 1; } bits;uint32_t raw;
drivers/gpu/drm/amd/display/dc/dc_types.h +30 -0
@@ -790,6 +790,36 @@ struct dc_clock_config {uint32_t current_clock_khz;/*current clock in use*/ }; +enum hubp_dmdata_mode { +DMDATA_SW_MODE , +DMDATA_HW_MODE +}; + +struct dc_dmdata_attributes { +/* Specifies whether dynamic meta data will be updated by software +* or has to be fetched by hardware (DMA mode) +*/ +enum hubp_dmdata_mode dmdata_mode; +/* Specifies if current dynamic meta data is to be used only for the current frame */ +bool dmdata_repeat; +/* Specifies the size of Dynamic Metadata surface in byte. Size of 0 means no Dynamic metadata is fetched */ +uint32_t dmdata_size; +/* Specifies if a new dynamic meta data should be fetched for an upcoming frame */ +bool dmdata_updated; +/* If hardware mode is used, the base address where DMDATA surface is located */ +PHYSICAL_ADDRESS_LOC address; +/* Specifies whether QOS level will be provided by TTU or it will come from DMDATA_QOS_LEVEL */ +bool dmdata_qos_mode; +/* If qos_mode = 1, this is the QOS value to be used: */ +uint32_t dmdata_qos_level; +/* Specifies the value in unit of REFCLK cycles to be added to the +* current time to produce the Amortized deadline for Dynamic Metadata chunk request +*/ +uint32_t dmdata_dl_delta; +/* An unbounded array of uint32s, represents software dmdata to be loaded */ +uint32_t *dmdata_sw_data; +}; +struct hw_asic_id {uint32_t chip_id;uint32_t chip_family;
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h +138 -0
215 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 7/19 drm/amd/display: Fix double free
In reply to Chenyu ChenFrom: Ilya Bakoulin <[email protected]>
[Why/How]
Reset pointer/address to avoid double free.
--- .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +8 -2
@@ -736,9 +736,12 @@ void dcn42_notify_wm_ranges(struct clk_mgr *clk_mgr_base) clk_mgr_dcn42->smu_wm_set.mc_address.low_part);dcn42_smu_transfer_wm_table_dram_2_smu (clk_mgr); -if (clk_mgr_dcn42->smu_wm_set.wm_set && clk_mgr_dcn42->smu_wm_set.mc_address.quad_part !=0 ) +if (clk_mgr_dcn42->smu_wm_set.wm_set && clk_mgr_dcn42->smu_wm_set.mc_address.quad_part !=0 ) {dm_helpers_free_gpu_mem (clk_mgr->base.ctx,DC_MEM_ALLOC_TYPE_GART , clk_mgr_dcn42->smu_wm_set.wm_set); + clk_mgr_dcn42->smu_wm_set.wm_set =NULL ; + clk_mgr_dcn42->smu_wm_set.mc_address.quad_part =0 ; + } }
@@ -1101,7 +1104,10 @@ void dcn42_clk_mgr_destroy(struct clk_mgr_internal *clk_mgr_int) {struct clk_mgr_dcn42 *clk_mgr =TO_CLK_MGR_DCN42 (clk_mgr_int); -if (clk_mgr->smu_wm_set.wm_set && clk_mgr->smu_wm_set.mc_address.quad_part !=0 ) +if (clk_mgr->smu_wm_set.wm_set && clk_mgr->smu_wm_set.mc_address.quad_part !=0 ) {dm_helpers_free_gpu_mem (clk_mgr_int->base.ctx,DC_MEM_ALLOC_TYPE_GART , clk_mgr->smu_wm_set.wm_set); + clk_mgr->smu_wm_set.wm_set =NULL ; + clk_mgr->smu_wm_set.mc_address.quad_part =0 ; + } }
Signature · 1 line
2.43.0
PATCH 6/19 drm/amd/display: Fix implicit narrowing conversion warnings
In reply to Chenyu ChenFrom: Gaghik Khachatrian <[email protected]>
[Why]
Multiple display source files contain implicit narrowing conversions when assigning wider integer types (int, uint32_t) to narrower fields (uint8_t, uint16_t) at hardware register, protocol, and storage boundaries. These conversions are intentional but undocumented, and accompanying runtime assertions add noise without providing compile-time safety.
[How]
Add explicit casts at all intentional narrowing boundaries across display source files. Use narrower loop variable types where loop bounds guarantee safe range. Remove runtime assertions paired with narrowing casts, inline single-use intermediate variables, and revert block scopes and braces introduced solely to contain those assertions.
--- .../drm/amd/display/dc/basics/custom_float.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +- .../drm/amd/display/dc/bios/bios_parser2.c | 20 +-- .../drm/amd/display/dc/bios/command_table.c | 12 +- .../drm/amd/display/dc/bios/command_table2.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 9 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 39 +++--- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 11 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 12 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 12 +- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 13 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 13 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 +++--- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 40 +++--- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 10 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 68 ++++----- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 90 ++++++------ .../gpu/drm/amd/display/dc/core/dc_resource.c | 52 +++---- .../gpu/drm/amd/display/dc/core/dc_stream.c | 20 ++- .../gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 130 +++++++++--------- drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 6 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 12 +- .../amd/display/dc/dccg/dcn31/dcn31_dccg.c | 4 +- .../amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 +-- drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- .../drm/amd/display/dc/dce/dce_clock_source.c | 24 ++-- .../gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 2 +- .../drm/amd/display/dc/dce/dce_panel_cntl.c | 4 +- .../drm/amd/display/dc/dce/dce_transform.c | 8 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 14 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 12 +- .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 23 ++-- .../display/dc/dce80/dce80_timing_generator.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 4 +- .../drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 16 +-- .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 2 +- .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 4 +- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 5 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 7 +- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 37 ++--- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 12 +- .../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 30 ++-- drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 2 +- .../gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 9 ++ drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- .../display/dc/hubbub/dcn10/dcn10_hubbub.c | 16 +-- .../display/dc/hubbub/dcn20/dcn20_hubbub.c | 28 ++-- .../display/dc/hubbub/dcn20/dcn20_hubbub.h | 3 + .../display/dc/hubbub/dcn21/dcn21_hubbub.c | 12 +- .../display/dc/hubbub/dcn30/dcn30_hubbub.c | 12 +- .../display/dc/hubbub/dcn31/dcn31_hubbub.c | 12 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 4 +- .../amd/display/dc/hubp/dcn21/dcn21_hubp.c | 4 +- .../amd/display/dc/hubp/dcn30/dcn30_hubp.c | 4 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 29 ++-- .../amd/display/dc/hwss/dce120/dce120_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 13 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 8 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 16 +-- .../amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 18 ++- drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- .../display/dc/link/accessories/link_dp_cts.c | 37 +---- .../display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- .../drm/amd/display/dc/link/link_detection.c | 4 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 6 +- .../drm/amd/display/dc/link/link_factory.c | 6 +- .../amd/display/dc/link/protocols/link_ddc.c | 5 +- .../dc/link/protocols/link_dp_capability.c | 2 +- .../dc/link/protocols/link_dp_dpia_bw.c | 4 +- .../dc/link/protocols/link_dp_panel_replay.c | 23 ++-- .../link/protocols/link_dp_training_8b_10b.c | 10 +- .../link/protocols/link_edp_panel_control.c | 38 ++--- .../dc/mmhubbub/dcn20/dcn20_mmhubbub.c | 4 +- .../dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- .../amd/display/dc/optc/dcn20/dcn20_optc.c | 4 +- .../dc/resource/dce110/dce110_resource.c | 4 +- .../dc/resource/dcn10/dcn10_resource.c | 4 +- .../dc/resource/dcn20/dcn20_resource.c | 24 ++-- .../dc/resource/dcn21/dcn21_resource.c | 2 +- .../dc/resource/dcn30/dcn30_resource.c | 14 +- .../dc/resource/dcn301/dcn301_resource.c | 8 +- .../dc/resource/dcn302/dcn302_resource.c | 4 +- .../dc/resource/dcn303/dcn303_resource.c | 4 +- .../dc/resource/dcn31/dcn31_resource.c | 4 +- .../dc/resource/dcn314/dcn314_resource.c | 4 +- .../dc/resource/dcn315/dcn315_resource.c | 4 +- .../dc/resource/dcn316/dcn316_resource.c | 4 +- .../dc/resource/dcn32/dcn32_resource.c | 20 +-- .../dc/resource/dcn321/dcn321_resource.c | 4 +- .../dc/resource/dcn35/dcn35_resource.c | 4 +- .../dc/resource/dcn351/dcn351_resource.c | 4 +- .../dc/resource/dcn36/dcn36_resource.c | 4 +- .../dc/resource/dcn401/dcn401_resource.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 4 +- .../dcn401/dcn401_soc_and_ip_translator.c | 28 ++-- .../dcn42/dcn42_soc_and_ip_translator.c | 14 +- 107 files changed, 733 insertions(+), 704 deletions(-)
drivers/gpu/drm/amd/display/dc/basics/custom_float.c +1 -1
@@ -90,7 +90,7 @@ static bool build_custom_float(struct fixed31_32 value, dc_fixpt_lt(dc_fixpt_one, mantiss)) mantiss = dc_fixpt_zero; else - mantiss =dc_fixpt_shl (mantiss, format->mantissa_bits); + mantiss =dc_fixpt_shl (mantiss, (unsigned char )format->mantissa_bits); *mantissa =dc_fixpt_floor (mantiss);
drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c +1 -1
@@ -3078,7 +3078,7 @@ bool bw_calcs(struct dc_context *ctx, }calculate_bandwidth (dceip, vbios, data); - yclk_lvl = data->y_clk_level; + yclk_lvl = (uint8_t )data->y_clk_level; calcs_output->nbp_state_change_enable = data->nbp_state_change_enable;
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +3 -3
@@ -803,8 +803,8 @@ static enum bp_result bios_parser_dac_load_detection(uint32_t bios_0_scratch;uint32_t device_id_mask =0 ; - bp_params.device_id =get_support_mask_for_device_id ( -DEVICE_TYPE_CRT , engine_id ==ENGINE_ID_DACB ?2 :1 ); + bp_params.device_id = (uint16_t )get_support_mask_for_device_id ( +DEVICE_TYPE_CRT , engine_id ==ENGINE_ID_DACB ?2 :1 );if (bp_params.device_id ==ATOM_DEVICE_CRT1_SUPPORT ) device_id_mask =ATOM_S0_CRT1_MASK ;
@@ -1382,7 +1382,7 @@ static enum bp_result get_embedded_panel_info_v1_2( info->ss_id = lvds->ucSS_Id; { -uint8_t rr =le16_to_cpu (lvds->usSupportedRefreshRate); +uint16_t rr =le16_to_cpu (lvds->usSupportedRefreshRate);/* Get minimum supported refresh rate*/ if (SUPPORTED_LCD_REFRESHRATE_30Hz & rr) info->supported_rr.REFRESH_RATE_30HZ =1 ;
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +10 -10
@@ -157,7 +157,7 @@ static uint8_t bios_parser_get_connectors_number(struct dc_bios *dcb)break ; } -return count; +return (uint8_t )count; } static struct graphics_object_id bios_parser_get_connector_id(
@@ -401,7 +401,7 @@ static enum bp_result bios_parser_get_i2c_info(struct dc_bios *dcb,return BP_RESULT_BADINPUT ;if (id.type ==OBJECT_TYPE_GENERIC ) { - dummy_record.i2c_id = id.id; + dummy_record.i2c_id = (uint8_t )id.id;if (get_gpio_i2c_info (bp, &dummy_record, info) ==BP_RESULT_OK )return BP_RESULT_OK ;
@@ -1228,7 +1228,7 @@ static enum bp_result get_disp_caps_v4_1(if (!disp_cntl_tbl)return BP_RESULT_BADBIOSTABLE ; - *dce_caps = disp_cntl_tbl->display_caps; + *dce_caps = (uint8_t )disp_cntl_tbl->display_caps;return result; }
@@ -1252,7 +1252,7 @@ static enum bp_result get_disp_caps_v4_2(if (!disp_cntl_tbl)return BP_RESULT_BADBIOSTABLE ; - *dce_caps = disp_cntl_tbl->display_caps; + *dce_caps = (uint8_t )disp_cntl_tbl->display_caps;return result; }
@@ -1276,7 +1276,7 @@ static enum bp_result get_disp_caps_v4_3(if (!disp_cntl_tbl)return BP_RESULT_BADBIOSTABLE ; - *dce_caps = disp_cntl_tbl->display_caps; + *dce_caps = (uint8_t )disp_cntl_tbl->display_caps;return result; }
@@ -1300,7 +1300,7 @@ static enum bp_result get_disp_caps_v4_4(if (!disp_cntl_tbl)return BP_RESULT_BADBIOSTABLE ; - *dce_caps = disp_cntl_tbl->display_caps; + *dce_caps = (uint8_t )disp_cntl_tbl->display_caps;return result; }
@@ -1324,7 +1324,7 @@ static enum bp_result get_disp_caps_v4_5(if (!disp_cntl_tbl)return BP_RESULT_BADBIOSTABLE ; - *dce_caps = disp_cntl_tbl->display_caps; + *dce_caps = (uint8_t )disp_cntl_tbl->display_caps;return result; }
@@ -2585,7 +2585,7 @@ static enum bp_result get_integrated_info_v11( info->ext_disp_conn_info.path[i].channel_mapping.raw = info_v11->extdispconninfo.path[i].channelmapping; info->ext_disp_conn_info.path[i].caps = -le16_to_cpu (info_v11->extdispconninfo.path[i].caps); + (unsigned short )le16_to_cpu (info_v11->extdispconninfo.path[i].caps); } info->ext_disp_conn_info.checksum = info_v11->extdispconninfo.checksum;
@@ -2790,7 +2790,7 @@ static enum bp_result get_integrated_info_v2_1( info->ext_disp_conn_info.path[i].channel_mapping.raw = info_v2_1->extdispconninfo.path[i].channelmapping; info->ext_disp_conn_info.path[i].caps = -le16_to_cpu (info_v2_1->extdispconninfo.path[i].caps); + (unsigned short )le16_to_cpu (info_v2_1->extdispconninfo.path[i].caps); } info->ext_disp_conn_info.checksum =
@@ -2954,7 +2954,7 @@ static enum bp_result get_integrated_info_v2_2( info->ext_disp_conn_info.path[i].channel_mapping.raw = info_v2_2->extdispconninfo.path[i].channelmapping; info->ext_disp_conn_info.path[i].caps = -le16_to_cpu (info_v2_2->extdispconninfo.path[i].caps); + (unsigned short )le16_to_cpu (info_v2_2->extdispconninfo.path[i].caps); } info->ext_disp_conn_info.checksum =
drivers/gpu/drm/amd/display/dc/bios/command_table.c +6 -6
@@ -1521,8 +1521,8 @@ static enum bp_result adjust_display_pll_v2(if (pixel_clock_10KHz_in !=0 ) { bp_params->adjusted_pixel_clock = -div_u64 (pixel_clk * pixel_clk_10_khz_out, - pixel_clock_10KHz_in); + (uint32_t )div_u64 (pixel_clk * pixel_clk_10_khz_out, + pixel_clock_10KHz_in); }else { bp_params->adjusted_pixel_clock =0 ;BREAK_TO_DEBUGGER ();
@@ -1571,8 +1571,8 @@ static enum bp_result adjust_display_pll_v3(if (pixel_clk_10_kHz_in !=0 ) { bp_params->adjusted_pixel_clock = -div_u64 (pixel_clk * pixel_clk_10_khz_out, - pixel_clk_10_kHz_in); + (uint32_t )div_u64 (pixel_clk * pixel_clk_10_khz_out, + pixel_clk_10_kHz_in); }else { bp_params->adjusted_pixel_clock =0 ;BREAK_TO_DEBUGGER ();
@@ -2662,8 +2662,8 @@ static enum bp_result set_dce_clock_v2_1( !cmd->dc_clock_type_to_atom(bp_params->clock_type, &atom_clock_type))return BP_RESULT_BADINPUT ; - params.asParam.ucDCEClkSrc = atom_pll_id; - params.asParam.ucDCEClkType = atom_clock_type; + params.asParam.ucDCEClkSrc = (uint8_t )atom_pll_id; + params.asParam.ucDCEClkType = (uint8_t )atom_clock_type;if (bp_params->clock_type ==DCECLOCK_TYPE_DPREFCLK ) {if (bp_params->flags.USE_GENLOCK_AS_SOURCE_FOR_DPREFCLK)
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +2 -2
@@ -929,8 +929,8 @@ static enum bp_result set_dce_clock_v2_1( &atom_clock_type))return BP_RESULT_BADINPUT ; - params.param.dceclksrc = atom_pll_id; - params.param.dceclktype = atom_clock_type; + params.param.dceclksrc = (uint8_t )atom_pll_id; + params.param.dceclktype = (uint8_t )atom_clock_type;if (bp_params->clock_type ==DCECLOCK_TYPE_DPREFCLK ) {if (bp_params->flags.USE_GENLOCK_AS_SOURCE_FOR_DPREFCLK)
drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c +3 -3
@@ -127,7 +127,7 @@ void dce110_fill_display_configs( pp_display_cfg->avail_mclk_switch_time_us =dce110_get_min_vblank_time_us (context); pp_display_cfg->disp_clk_khz = dc->clk_mgr->clks.dispclk_khz; pp_display_cfg->avail_mclk_switch_time_in_disp_active_us =0 ; - pp_display_cfg->crtc_index = dc->res_pool->res_cap->num_timing_generator; + pp_display_cfg->crtc_index = (uint8_t )dc->res_pool->res_cap->num_timing_generator;for (j =0 ; j < context->stream_count; j++) {int k;
@@ -151,7 +151,7 @@ void dce110_fill_display_configs( num_cfgs++; cfg->signal = pipe_ctx->stream->signal; - cfg->pipe_idx = pipe_ctx->stream_res.tg->inst; + cfg->pipe_idx = (uint8_t )pipe_ctx->stream_res.tg->inst; cfg->src_height = stream->src.height; cfg->src_width = stream->src.width; cfg->ddi_channel_mapping =
@@ -189,7 +189,7 @@ void dce110_fill_display_configs( pp_display_cfg->line_time_in_us =0 ; } - pp_display_cfg->display_count = num_cfgs; + pp_display_cfg->display_count = (uint8_t )num_cfgs; } void dce11_pplib_apply_display_requirements(
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +6 -3
@@ -462,8 +462,10 @@ static void build_watermark_ranges(struct clk_bw_params *bw_params, struct pp_smif (!bw_params->wm_table.entries[i].valid)continue ; - ranges->reader_wm_sets[num_valid_sets].wm_inst = bw_params->wm_table.entries[i].wm_inst; - ranges->reader_wm_sets[num_valid_sets].wm_type = bw_params->wm_table.entries[i].wm_type; + ranges->reader_wm_sets[num_valid_sets].wm_inst = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + ranges->reader_wm_sets[num_valid_sets].wm_type = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ ranges->reader_wm_sets[num_valid_sets].min_fill_clk_mhz =PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MIN ; ranges->reader_wm_sets[num_valid_sets].max_fill_clk_mhz =PP_SMU_WM_SET_RANGE_CLK_UNCONSTRAINED_MAX ;
@@ -476,7 +478,8 @@ static void build_watermark_ranges(struct clk_bw_params *bw_params, struct pp_sm/* add 1 to make it non-overlapping with next lvl */ ranges->reader_wm_sets[num_valid_sets].min_drain_clk_mhz = bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } - ranges->reader_wm_sets[num_valid_sets].max_drain_clk_mhz = bw_params->clk_table.entries[i].dcfclk_mhz; + ranges->reader_wm_sets[num_valid_sets].max_drain_clk_mhz = + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +21 -18
@@ -78,9 +78,9 @@ static const struct clk_mgr_mask clk_mgr_mask = {/* Query SMU for all clock states for a particular clock */ -static void dcn3_init_single_clock (struct clk_mgr_internal *clk_mgr,uint32_t clk,unsigned int *entry_0,unsigned int *num_levels) +static void dcn3_init_single_clock (struct clk_mgr_internal *clk_mgr,uint32_t clk,unsigned int *entry_0,uint8_t *num_levels) { -unsigned int i; +uint8_t i;char *entry_i = (char *)entry_0;uint32_t ret =dcn30_smu_get_dpm_freq_by_index (clk_mgr, clk,0xFF );
@@ -109,7 +109,7 @@ static void dcn3_build_wm_range_table(struct clk_mgr_internal *clk_mgr)void dcn3_init_clocks (struct clk_mgr *clk_mgr_base) {struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); -unsigned int num_levels; +uint8_t num_levels;memset (&(clk_mgr_base->clks),0 ,sizeof (struct dc_clocks )); clk_mgr_base->clks.p_state_change_support = true;
@@ -234,7 +234,7 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,if (should_set_clock (safe_to_lower, new_clocks->dcfclk_khz, clk_mgr_base->clks.dcfclk_khz)) { clk_mgr_base->clks.dcfclk_khz = new_clocks->dcfclk_khz; -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_DCEFCLK ,khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_khz)); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_DCEFCLK , (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_khz)); }if (should_set_clock (safe_to_lower, new_clocks->dcfclk_deep_sleep_khz, clk_mgr_base->clks.dcfclk_deep_sleep_khz)) {
@@ -265,10 +265,11 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,if (dc->clk_mgr->dc_mode_softmax_enabled && new_clocks->dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 )dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - dc->clk_mgr->bw_params->dc_mode_softmax_memclk); + (uint16_t )dc->clk_mgr->bw_params->dc_mode_softmax_memclk);else dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); + (uint16_t )clk_mgr_base->bw_params->clk_table.entries[ + clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); } }
@@ -281,20 +282,20 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,/* set UCLK to requested value if P-State switching is supported, or to re-enable P-State switching */ if (clk_mgr_base->clks.p_state_change_support && (update_uclk || !clk_mgr_base->clks.prev_p_state_change_support)) -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK ,khz_to_mhz_ceil (clk_mgr_base->clks.dramclk_khz)); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dramclk_khz));if (should_set_clock (safe_to_lower, new_clocks->dppclk_khz, clk_mgr_base->clks.dppclk_khz)) {if (clk_mgr_base->clks.dppclk_khz > new_clocks->dppclk_khz) dpp_clock_lowered = true; clk_mgr_base->clks.dppclk_khz = new_clocks->dppclk_khz; -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_PIXCLK ,khz_to_mhz_ceil (clk_mgr_base->clks.dppclk_khz)); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_PIXCLK , (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dppclk_khz)); update_dppclk = true; }if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz)) { clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz; -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_DISPCLK ,khz_to_mhz_ceil (clk_mgr_base->clks.dispclk_khz)); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_DISPCLK , (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dispclk_khz)); update_dispclk = true; }
@@ -323,7 +324,7 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,static void dcn3_notify_wm_ranges (struct clk_mgr *clk_mgr_base) { -unsigned int i; +uint8_t i;struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base);WatermarksExternal_t *table = (WatermarksExternal_t *) clk_mgr->wm_range_table;
@@ -363,13 +364,14 @@ static void dcn3_set_hard_min_memclk(struct clk_mgr *clk_mgr_base, bool current_if (current_mode) {if (clk_mgr_base->clks.p_state_change_support)dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , -khz_to_mhz_ceil (clk_mgr_base->clks.dramclk_khz)); + (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dramclk_khz));else dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); + (uint16_t )clk_mgr_base->bw_params->clk_table.entries[ + clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); }else {dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz); + (uint16_t )clk_mgr_base->bw_params->clk_table.entries[0 ].memclk_mhz); } }
@@ -382,7 +384,8 @@ static void dcn3_set_hard_max_memclk(struct clk_mgr *clk_mgr_base)return ;dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , - clk_mgr_base->bw_params->clk_table.entries[clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); + (uint16_t )clk_mgr_base->bw_params->clk_table.entries[ + clk_mgr_base->bw_params->clk_table.num_entries -1 ].memclk_mhz); }static void dcn3_set_max_memclk (struct clk_mgr *clk_mgr_base,unsigned int memclk_mhz)
@@ -392,7 +395,7 @@ static void dcn3_set_max_memclk(struct clk_mgr *clk_mgr_base, unsigned int memclif (!clk_mgr->smu_present)return ; -dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , memclk_mhz); +dcn30_smu_set_hard_max_by_freq (clk_mgr,PPCLK_UCLK , (uint16_t )memclk_mhz); }static void dcn3_set_min_memclk (struct clk_mgr *clk_mgr_base,unsigned int memclk_mhz) {
@@ -400,14 +403,14 @@ static void dcn3_set_min_memclk(struct clk_mgr *clk_mgr_base, unsigned int memclif (!clk_mgr->smu_present)return ; -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , memclk_mhz); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , (uint16_t )memclk_mhz); }/* Get current memclk states, update bounding box */ static void dcn3_get_memclk_states_from_smu (struct clk_mgr *clk_mgr_base) {struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base); -unsigned int num_levels; +uint8_t num_levels;if (!clk_mgr->smu_present)return ;
@@ -480,7 +483,7 @@ static void dcn30_notify_link_rate_change(struct clk_mgr *clk_mgr_base, struct dif (max_phyclk_req != clk_mgr_base->clks.phyclk_khz) { clk_mgr_base->clks.phyclk_khz = max_phyclk_req; -dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_PHYCLK ,khz_to_mhz_ceil (clk_mgr_base->clks.phyclk_khz)); +dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_PHYCLK , (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.phyclk_khz)); } }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +7 -4
@@ -385,7 +385,7 @@ static void vg_init_clocks(struct clk_mgr *clk_mgr)static void vg_build_watermark_ranges (struct clk_bw_params *bw_params,struct watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -394,8 +394,11 @@ static void vg_build_watermark_ranges(struct clk_bw_params *bw_params, struct waif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -409,7 +412,7 @@ static void vg_build_watermark_ranges(struct clk_bw_params *bw_params, struct wa bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +7 -5
@@ -114,7 +114,7 @@ static int dcn31_get_active_display_cnt_wa(static void dcn31_disable_otg_wa (struct clk_mgr *clk_mgr_base,struct dc_state *context,bool disable) {struct dc *dc = clk_mgr_base->ctx->dc; -int i; +uint8_t i;for (i =0 ; i < dc->res_pool->pipe_count; ++i) {struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -424,7 +424,7 @@ static struct dcn31_watermarks dummy_wms = { 0 };static void dcn31_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn31_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -433,8 +433,10 @@ static void dcn31_build_watermark_ranges(struct clk_bw_params *bw_params, structif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -448,7 +450,7 @@ static void dcn31_build_watermark_ranges(struct clk_bw_params *bw_params, struct bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +7 -5
@@ -149,7 +149,7 @@ static void dcn314_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state bool safe_to_lower, bool disable) {struct dc *dc = clk_mgr_base->ctx->dc; -int i; +uint8_t i;for (i =0 ; i < dc->res_pool->pipe_count; ++i) {struct pipe_ctx *pipe = safe_to_lower
@@ -495,7 +495,7 @@ static struct dcn314_ss_info_table ss_info_table = {static void dcn314_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn314_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -504,8 +504,10 @@ static void dcn314_build_watermark_ranges(struct clk_bw_params *bw_params, strucif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -519,7 +521,7 @@ static void dcn314_build_watermark_ranges(struct clk_bw_params *bw_params, struc bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c +8 -5
@@ -100,7 +100,7 @@ static bool should_disable_otg(struct pipe_ctx *pipe)static void dcn315_disable_otg_wa (struct clk_mgr *clk_mgr_base,struct dc_state *context,bool disable) {struct dc *dc = clk_mgr_base->ctx->dc; -int i; +uint8_t i;for (i =0 ; i < dc->res_pool->pipe_count; ++i) {struct pipe_ctx *pipe = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -384,7 +384,7 @@ static struct dcn315_watermarks dummy_wms = { 0 };static void dcn315_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn315_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -393,8 +393,11 @@ static void dcn315_build_watermark_ranges(struct clk_bw_params *bw_params, strucif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -408,7 +411,7 @@ static void dcn315_build_watermark_ranges(struct clk_bw_params *bw_params, struc bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c +8 -5
@@ -103,7 +103,7 @@ static void dcn316_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state bool safe_to_lower, bool disable) {struct dc *dc = clk_mgr_base->ctx->dc; -int i; +uint8_t i;for (i =0 ; i < dc->res_pool->pipe_count; ++i) {struct pipe_ctx *pipe = safe_to_lower
@@ -350,7 +350,7 @@ static struct dcn316_watermarks dummy_wms = { 0 };static void dcn316_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn316_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -359,8 +359,11 @@ static void dcn316_build_watermark_ranges(struct clk_bw_params *bw_params, strucif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -374,7 +377,7 @@ static void dcn316_build_watermark_ranges(struct clk_bw_params *bw_params, struc bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +22 -21
141 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +8 -6
@@ -190,7 +190,7 @@ void dcn35_disable_otg_wa(struct clk_mgr *clk_mgr_base, struct dc_state *context bool safe_to_lower, bool disable) {struct dc *dc = clk_mgr_base->ctx->dc; -int i; +uint8_t i;if (dc->ctx->dce_environment ==DCE_ENV_DIAG )return ;
@@ -332,7 +332,7 @@ static uint8_t get_lowest_dpia_index(const struct dc_link *link)continue ;if (idx > dc_struct->links[i]->link_index) - idx = dc_struct->links[i]->link_index; + idx = (uint8_t )dc_struct->links[i]->link_index; }return idx;
@@ -863,7 +863,7 @@ static void dcn35_read_ss_info_from_lut(struct clk_mgr_internal *clk_mgr)static void dcn35_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn35_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -872,8 +872,10 @@ static void dcn35_build_watermark_ranges(struct clk_bw_params *bw_params, structif (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -887,7 +889,7 @@ static void dcn35_build_watermark_ranges(struct clk_bw_params *bw_params, struct bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c +20 -20
@@ -174,7 +174,7 @@ static void dcn401_init_single_clock(struct clk_mgr_internal *clk_mgr, PPCLK_e c/* if the initial message failed, num_levels will be 0 */ for (i =0 ; i < *num_levels && i <ARRAY_SIZE (clk_mgr->base.bw_params->clk_table.entries); i++) { - *((unsigned int *)entry_i) = (dcn401_smu_get_dpm_freq_by_index (clk_mgr, clk, i) &0xFFFF ); + *((unsigned int *)entry_i) = (dcn401_smu_get_dpm_freq_by_index (clk_mgr, clk, (uint8_t )i) &0xFFFF ); entry_i +=sizeof (clk_mgr->base.bw_params->clk_table.entries[0 ]); } }
@@ -182,15 +182,15 @@ static void dcn401_init_single_clock(struct clk_mgr_internal *clk_mgr, PPCLK_e cstatic void dcn401_build_wm_range_table (struct clk_mgr *clk_mgr) {/* For min clocks use as reported by PM FW and report those as min */ -uint16_t min_uclk_mhz = clk_mgr->bw_params->clk_table.entries[0 ].memclk_mhz; -uint16_t min_dcfclk_mhz = clk_mgr->bw_params->clk_table.entries[0 ].dcfclk_mhz; +unsigned int min_uclk_mhz = clk_mgr->bw_params->clk_table.entries[0 ].memclk_mhz; +unsigned int min_dcfclk_mhz = clk_mgr->bw_params->clk_table.entries[0 ].dcfclk_mhz;/* Set A - Normal - default values */ clk_mgr->bw_params->wm_table.nv_entries[WM_A ].valid = true; clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.wm_type =WATERMARKS_CLOCK_RANGE ; - clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.min_dcfclk = min_dcfclk_mhz; + clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.min_dcfclk = (uint16_t )min_dcfclk_mhz; clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.max_dcfclk =0xFFFF ; - clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.min_uclk = min_uclk_mhz; + clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.min_uclk = (uint16_t )min_uclk_mhz; clk_mgr->bw_params->wm_table.nv_entries[WM_A ].pmfw_breakdown.max_uclk =0xFFFF ;/* Set B - Unused on dcn4 */
@@ -201,9 +201,9 @@ static void dcn401_build_wm_range_table(struct clk_mgr *clk_mgr)if (clk_mgr->ctx->dc->bb_overrides.dummy_clock_change_latency_ns !=0x7FFFFFFF ) { clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].valid = true; clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.wm_type =WATERMARKS_DUMMY_PSTATE ; - clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.min_dcfclk = min_dcfclk_mhz; + clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.min_dcfclk = (uint16_t )min_dcfclk_mhz; clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.max_dcfclk =0xFFFF ; - clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.min_uclk = min_uclk_mhz; + clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.min_uclk = (uint16_t )min_uclk_mhz; clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].pmfw_breakdown.max_uclk =0xFFFF ; }else { clk_mgr->bw_params->wm_table.nv_entries[WM_1A ].valid = false;
@@ -604,10 +604,10 @@ static int dcn401_set_hard_min_by_freq_optimized(struct clk_mgr_internal *clk_mg* clock returned is less than requested, then we will ceil the * requested value to mhz and call it again. */ -int actual_clk_khz =dcn401_smu_set_hard_min_by_freq (clk_mgr, clk,khz_to_mhz_floor (requested_clk_khz)); +int actual_clk_khz =dcn401_smu_set_hard_min_by_freq (clk_mgr, clk, (uint16_t )khz_to_mhz_floor (requested_clk_khz));if (actual_clk_khz < requested_clk_khz) - actual_clk_khz =dcn401_smu_set_hard_min_by_freq (clk_mgr, clk,khz_to_mhz_ceil (requested_clk_khz)); + actual_clk_khz =dcn401_smu_set_hard_min_by_freq (clk_mgr, clk, (uint16_t )khz_to_mhz_ceil (requested_clk_khz));return actual_clk_khz; }
@@ -849,7 +849,7 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence( clk_mgr_base->clks.dcfclk_khz = new_clocks->dcfclk_khz;if (dcn401_is_ppclk_dpm_enabled (clk_mgr_internal,PPCLK_DCFCLK )) { block_sequence[num_steps].params.update_hardmin_params.ppclk =PPCLK_DCFCLK ; - block_sequence[num_steps].params.update_hardmin_params.freq_mhz =khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_khz); + block_sequence[num_steps].params.update_hardmin_params.freq_mhz = (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_khz); block_sequence[num_steps].params.update_hardmin_params.response =NULL ; block_sequence[num_steps].func =CLK_MGR401_UPDATE_HARDMIN_PPCLK ; num_steps++;
@@ -860,7 +860,7 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence(if (should_set_clock (safe_to_lower, new_clocks->dcfclk_deep_sleep_khz, clk_mgr_base->clks.dcfclk_deep_sleep_khz)) { clk_mgr_base->clks.dcfclk_deep_sleep_khz = new_clocks->dcfclk_deep_sleep_khz;if (dcn401_is_ppclk_dpm_enabled (clk_mgr_internal,PPCLK_DCFCLK )) { - block_sequence[num_steps].params.update_deep_sleep_dcfclk_params.freq_mhz =khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_deep_sleep_khz); + block_sequence[num_steps].params.update_deep_sleep_dcfclk_params.freq_mhz = (uint16_t )khz_to_mhz_ceil (clk_mgr_base->clks.dcfclk_deep_sleep_khz); block_sequence[num_steps].func =CLK_MGR401_UPDATE_DEEP_SLEEP_DCFCLK ; num_steps++; }
@@ -984,24 +984,24 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence(/* When idle DPM is enabled, need to send active and idle hardmins separately */ /* CLK_MGR401_UPDATE_ACTIVE_HARDMINS */ if ((update_active_uclk || update_active_fclk) && is_idle_dpm_enabled) { - block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = active_uclk_mhz; - block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = active_fclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = (uint16_t )active_uclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = (uint16_t )active_fclk_mhz; block_sequence[num_steps].func =CLK_MGR401_UPDATE_ACTIVE_HARDMINS ; num_steps++; }/* CLK_MGR401_UPDATE_IDLE_HARDMINS */ if ((update_idle_uclk || update_idle_fclk) && is_idle_dpm_enabled) { - block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = idle_uclk_mhz; - block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = idle_fclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = (uint16_t )idle_uclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = (uint16_t )idle_fclk_mhz; block_sequence[num_steps].func =CLK_MGR401_UPDATE_IDLE_HARDMINS ; num_steps++; }/* CLK_MGR401_UPDATE_SUBVP_HARDMINS */ if ((update_subvp_prefetch_dramclk || update_subvp_prefetch_fclk) && is_df_throttle_opt_enabled) { - block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = subvp_prefetch_dramclk_mhz; - block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = subvp_prefetch_fclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.uclk_mhz = (uint16_t )subvp_prefetch_dramclk_mhz; + block_sequence[num_steps].params.update_idle_hardmin_params.fclk_mhz = (uint16_t )subvp_prefetch_fclk_mhz; block_sequence[num_steps].func =CLK_MGR401_UPDATE_SUBVP_HARDMINS ; num_steps++; }
@@ -1010,7 +1010,7 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence(if (update_active_uclk || update_idle_uclk) {if (!is_idle_dpm_enabled) { block_sequence[num_steps].params.update_hardmin_params.ppclk =PPCLK_UCLK ; - block_sequence[num_steps].params.update_hardmin_params.freq_mhz = active_uclk_mhz; + block_sequence[num_steps].params.update_hardmin_params.freq_mhz = (uint16_t )active_uclk_mhz; block_sequence[num_steps].params.update_hardmin_params.response =NULL ; block_sequence[num_steps].func =CLK_MGR401_UPDATE_HARDMIN_PPCLK ; num_steps++;
@@ -1123,7 +1123,7 @@ static unsigned int dcn401_build_update_display_clocks_sequence( dcn401_is_ppclk_dpm_enabled(clk_mgr_internal, PPCLK_DTBCLK)) {/* DCCG requires KHz precision for DTBCLK */ block_sequence[num_steps].params.update_hardmin_params.ppclk =PPCLK_DTBCLK ; - block_sequence[num_steps].params.update_hardmin_params.freq_mhz =khz_to_mhz_ceil (new_clocks->ref_dtbclk_khz); + block_sequence[num_steps].params.update_hardmin_params.freq_mhz = (uint16_t )khz_to_mhz_ceil (new_clocks->ref_dtbclk_khz); block_sequence[num_steps].params.update_hardmin_params.response = &clk_mgr_base->clks.ref_dtbclk_khz; block_sequence[num_steps].func =CLK_MGR401_UPDATE_HARDMIN_PPCLK ; num_steps++;
@@ -1318,7 +1318,7 @@ static void dcn401_notify_wm_ranges(struct clk_mgr *clk_mgr_base)/* collect valid ranges, place in pmfw table */ for (i =0 ; i <WM_SET_COUNT ; i++)if (clk_mgr->base.bw_params->wm_table.nv_entries[i].valid) { - table->Watermarks.WatermarkRow[i].WmSetting = i; + table->Watermarks.WatermarkRow[i].WmSetting = (uint8_t )i; table->Watermarks.WatermarkRow[i].Flags = clk_mgr->base.bw_params->wm_table.nv_entries[i].pmfw_breakdown.wm_type; }dcn401_smu_set_dram_addr_high (clk_mgr, clk_mgr->wm_range_table_addr >>32 );
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +6 -4
@@ -634,7 +634,7 @@ static void dcn42_read_ss_info_from_lut(struct clk_mgr_internal *clk_mgr)void dcn42_build_watermark_ranges (struct clk_bw_params *bw_params,struct dcn42_watermarks *table) { -int i, num_valid_sets; +uint8_t i, num_valid_sets; num_valid_sets =0 ;
@@ -643,8 +643,10 @@ void dcn42_build_watermark_ranges(struct clk_bw_params *bw_params, struct dcn42_if (!bw_params->wm_table.entries[i].valid)continue ; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = bw_params->wm_table.entries[i].wm_inst; - table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = bw_params->wm_table.entries[i].wm_type; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmSetting = + (uint8_t )bw_params->wm_table.entries[i].wm_inst; + table->WatermarkRow[WM_DCFCLK ][num_valid_sets].WmType = + (uint8_t )bw_params->wm_table.entries[i].wm_type;/* We will not select WM based on fclk, so leave it as unconstrained */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinClock =0 ; table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxClock =0xFFFF ;
@@ -658,7 +660,7 @@ void dcn42_build_watermark_ranges(struct clk_bw_params *bw_params, struct dcn42_ bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = - bw_params->clk_table.entries[i].dcfclk_mhz; + (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz; }else {/* unconstrained for memory retraining */
drivers/gpu/drm/amd/display/dc/core/dc.c +34 -34
209 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +45 -45
230 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +26 -26
182 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +14 -6
@@ -263,7 +263,7 @@ void program_cursor_attributes(struct dc *dc, struct dc_stream_state *stream) { - int i; + uint8_t i;struct resource_context *res_ctx;struct pipe_ctx *pipe_to_program =NULL ;bool enable_cursor_offload =dc_dmub_srv_is_cursor_offload_enabled (dc);
@@ -410,7 +410,7 @@ void program_cursor_position(struct dc *dc, struct dc_stream_state *stream) { - int i; + uint8_t i;struct resource_context *res_ctx;struct pipe_ctx *pipe_to_program =NULL ;bool enable_cursor_offload =dc_dmub_srv_is_cursor_offload_enabled (dc);
@@ -1032,14 +1032,18 @@ static int dc_stream_get_brightness_millinits_linear_interpolation (struct dc_st int refresh_hz) {long long slope =0 ; +long long y_intercept =0 ; +long long brightness_millinits =0 ; +if (stream->lumin_data.refresh_rate_hz[index2] != stream->lumin_data.refresh_rate_hz[index1]) { slope = (stream->lumin_data.luminance_millinits[index2] - stream->lumin_data.luminance_millinits[index1]) / (stream->lumin_data.refresh_rate_hz[index2] - stream->lumin_data.refresh_rate_hz[index1]); } -int y_intercept = stream->lumin_data.luminance_millinits[index2] - slope * stream->lumin_data.refresh_rate_hz[index2]; + y_intercept = stream->lumin_data.luminance_millinits[index2] - slope * stream->lumin_data.refresh_rate_hz[index2]; + brightness_millinits = y_intercept + (long long )refresh_hz * slope; -return (y_intercept + refresh_hz * slope); +return (int )brightness_millinits; }/*
@@ -1051,14 +1055,18 @@ static int dc_stream_get_refresh_hz_linear_interpolation (struct dc_stream_state int brightness_millinits) {long long slope =1 ; +long long y_intercept =0 ; +long long refresh_hz =0 ; +if (stream->lumin_data.refresh_rate_hz[index2] != stream->lumin_data.refresh_rate_hz[index1]) { slope = (stream->lumin_data.luminance_millinits[index2] - stream->lumin_data.luminance_millinits[index1]) / (stream->lumin_data.refresh_rate_hz[index2] - stream->lumin_data.refresh_rate_hz[index1]); } -int y_intercept = stream->lumin_data.luminance_millinits[index2] - slope * stream->lumin_data.refresh_rate_hz[index2]; + y_intercept = stream->lumin_data.luminance_millinits[index2] - slope * stream->lumin_data.refresh_rate_hz[index2]; + refresh_hz =div64_s64 ((brightness_millinits - y_intercept), slope); -return ((int )div64_s64 ((brightness_millinits - y_intercept), slope)); +return (int )refresh_hz; }/*
drivers/gpu/drm/amd/display/dc/core/dc_surface.c +1 -1
@@ -75,7 +75,7 @@ uint8_t dc_plane_get_pipe_mask(struct dc_state *dc_state, const struct dc_planestruct pipe_ctx *pipe_ctx = &dc_state->res_ctx.pipe_ctx[i];if (pipe_ctx->plane_state == plane_state && pipe_ctx->plane_res.hubp) - pipe_mask |=1 << pipe_ctx->plane_res.hubp->inst; + pipe_mask |= (uint8_t )(1 << pipe_ctx->plane_res.hubp->inst); }return pipe_mask;
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +67 -63
303 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_fused_io.c +3 -3
@@ -23,11 +23,11 @@ static bool op_i2c_convert( req->type = type; loc->is_aux = false; - loc->ddc_line = ddc_line; + loc->ddc_line = (uint8_t )ddc_line; loc->over_aux = over_aux; loc->address = op->address; loc->offset = op->offset; - loc->length = op->size; + loc->length = (uint8_t )op->size;memcpy (req->buffer, op->data, op->size);return true;
@@ -84,7 +84,7 @@ static bool atomic_write_poll_read( timeout_us += timeout_per_aux_transaction_us * (io->request.u.aux.length /16 ); } -if (!dm_helpers_execute_fused_io (link->ctx, link, commands, count, timeout_us)) +if (!dm_helpers_execute_fused_io (link->ctx, link, commands, count, (uint32_t )timeout_us))return false;return commands[0 ].fused_io.request.status ==FUSED_REQUEST_STATUS_SUCCESS ;
drivers/gpu/drm/amd/display/dc/dc_helper.c +6 -6
@@ -122,7 +122,7 @@ static void set_reg_field_values(struct dc_reg_value_masks *field_value_mask, field_value =va_arg (ap, uint32_t);set_reg_field_value_masks (field_value_mask, - field_value, mask, shift); + field_value, mask, (uint8_t )shift); i++; } }
@@ -459,7 +459,7 @@ void generic_reg_wait(const struct dc_context *ctx, reg_val =dm_read_reg (ctx, addr); - field_value =get_reg_field_value_ex (reg_val, mask, shift); + field_value =get_reg_field_value_ex (reg_val, mask, (uint8_t )shift);if (field_value == condition_value) {if (i * delay_between_poll_us >1000 )
@@ -525,7 +525,7 @@ uint32_t generic_indirect_reg_get(const struct dc_context *ctx, mask =va_arg (ap, uint32_t); field_value = va_arg(ap, uint32_t *); - *field_value =get_reg_field_value_ex (value, mask, shift); + *field_value =get_reg_field_value_ex (value, mask, (uint8_t )shift); i++; }
@@ -554,7 +554,7 @@ uint32_t generic_indirect_reg_update_ex(const struct dc_context *ctx, mask =va_arg (ap, uint32_t); field_value =va_arg (ap, uint32_t); - reg_val =set_reg_field_value_ex (reg_val, field_value, mask, shift); + reg_val =set_reg_field_value_ex (reg_val, field_value, mask, (uint8_t )shift); i++; }
@@ -584,7 +584,7 @@ uint32_t generic_indirect_reg_update_ex_sync(const struct dc_context *ctx, mask =va_arg (ap, uint32_t); field_value =va_arg (ap, uint32_t); - reg_val =set_reg_field_value_ex (reg_val, field_value, mask, shift); + reg_val =set_reg_field_value_ex (reg_val, field_value, mask, (uint8_t )shift); i++; }
@@ -615,7 +615,7 @@ uint32_t generic_indirect_reg_get_sync(const struct dc_context *ctx, mask =va_arg (ap, uint32_t); field_value = va_arg(ap, uint32_t *); - *field_value =get_reg_field_value_ex (value, mask, shift); + *field_value =get_reg_field_value_ex (value, mask, (uint8_t )shift); i++; }
drivers/gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c +2 -2
@@ -576,7 +576,7 @@ void dccg31_set_dtbclk_dto(// phase / modulo = dtbclk / dtbclk ref modulo = params->ref_dtbclk_khz *1000 ; - phase =div_u64 ((((unsigned long long )modulo * req_dtbclk_khz) + params->ref_dtbclk_khz -1 ), + phase = (uint32_t )div_u64 ((((unsigned long long )modulo * req_dtbclk_khz) + params->ref_dtbclk_khz -1 ), params->ref_dtbclk_khz); REG_UPDATE(OTG_PIXEL_RATE_CNTL[params->otg_inst],
@@ -620,7 +620,7 @@ void dccg31_set_audio_dtbclk_dto(// phase / modulo = dtbclk / dtbclk ref modulo = params->ref_dtbclk_khz *1000 ; - phase =div_u64 ((((unsigned long long )modulo * params->req_audio_dtbclk_khz) + params->ref_dtbclk_khz -1 ), + phase = (uint32_t )div_u64 ((((unsigned long long )modulo * params->req_audio_dtbclk_khz) + params->ref_dtbclk_khz -1 ), params->ref_dtbclk_khz);
drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c +11 -9
@@ -610,11 +610,13 @@ void dccg401_set_dp_dto(* int = target_pix_rate / reference_clock * phase = target_pix_rate - int * reference_clock, * modulo = reference_clock */ - dto_integer =div_u64 (params->pixclk_hz, dto_modulo_hz); + +/* dto_modulo_hz = refclk (~100 MHz), well within uint32_t range */ + dto_integer =div_u64 (params->pixclk_hz, (uint32_t )dto_modulo_hz); dto_phase_hz = params->pixclk_hz - dto_integer * dto_modulo_hz; -if (dto_phase_hz <=0 && dto_integer <=0 ) { -/* negative pixel rate should never happen */ +if (dto_phase_hz ==0 && dto_integer ==0 ) { +/* zero pixel rate should never happen */ BREAK_TO_DEBUGGER ();return ; }
@@ -656,25 +658,25 @@ void dccg401_set_dp_dto(dccg401_set_dtbclk_p_src (dccg, params->clk_src, params->otg_inst); -REG_WRITE (DP_DTO_PHASE [params->otg_inst], dto_phase_hz); -REG_WRITE (DP_DTO_MODULO [params->otg_inst], dto_modulo_hz); +REG_WRITE (DP_DTO_PHASE [params->otg_inst], (uint32_t )dto_phase_hz); +REG_WRITE (DP_DTO_MODULO [params->otg_inst], (uint32_t )dto_modulo_hz);switch (params->otg_inst) {case 0 :REG_UPDATE (OTG_PIXEL_RATE_DIV , -DPDTO0_INT , dto_integer); +DPDTO0_INT , (uint32_t )dto_integer);break ;case 1 :REG_UPDATE (OTG_PIXEL_RATE_DIV , -DPDTO1_INT , dto_integer); +DPDTO1_INT , (uint32_t )dto_integer);break ;case 2 :REG_UPDATE (OTG_PIXEL_RATE_DIV , -DPDTO2_INT , dto_integer); +DPDTO2_INT , (uint32_t )dto_integer);break ;case 3 :REG_UPDATE (OTG_PIXEL_RATE_DIV , -DPDTO3_INT , dto_integer); +DPDTO3_INT , (uint32_t )dto_integer);break ;default :BREAK_TO_DEBUGGER ();
drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +2 -2
@@ -321,7 +321,7 @@ static int read_channel_reply(struct dce_aux *engine, uint32_t size,uint32_t aux_sw_data_val;REG_GET (AUX_SW_DATA ,AUX_SW_DATA , &aux_sw_data_val); - buffer[i] = aux_sw_data_val; + buffer[i] = (uint8_t )aux_sw_data_val; ++i; }
@@ -375,7 +375,7 @@ static enum aux_return_code_type get_channel_status( (value & AUX_SW_STATUS__AUX_SW_RX_RECV_INVALID_L_MASK))return AUX_RET_ERROR_INVALID_REPLY ; - *returned_bytes =get_reg_field_value (value, + *returned_bytes = (uint8_t )get_reg_field_value (value,AUX_SW_STATUS ,AUX_SW_REPLY_BYTE_COUNT );
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +10 -14
@@ -162,11 +162,9 @@ static bool calculate_fb_and_fractional_fb_divider( feedback_divider *= (uint64_t ) (calc_pll_cs->fract_fb_divider_precision_factor); - *feedback_divider_param = -div_u64_rem ( - feedback_divider, - calc_pll_cs->fract_fb_divider_factor, - fract_feedback_divider_param); + *feedback_divider_param = (uint32_t )div_u64_rem ( + feedback_divider, calc_pll_cs->fract_fb_divider_factor, + fract_feedback_divider_param);if (*feedback_divider_param !=0 )return true;
@@ -240,7 +238,7 @@ static bool calc_fb_divider_checking_tolerance( pll_settings->calculated_pix_clk_100hz = actual_calculated_clock_100hz; pll_settings->vco_freq = -div_u64 ((u64 )actual_calculated_clock_100hz * post_divider,10 ); + (uint32_t )div_u64 ((u64 )actual_calculated_clock_100hz * post_divider,10 );return true; }return false;
@@ -440,8 +438,7 @@ static bool pll_adjust_pix_clk( bp_adjust_pixel_clock_params. encoder_object_id = pix_clk_params->encoder_object_id; bp_adjust_pixel_clock_params.signal_type = pix_clk_params->signal_type; - bp_adjust_pixel_clock_params. - ss_enable = pix_clk_params->flags.ENABLE_SS; + bp_adjust_pixel_clock_params.ss_enable = pix_clk_params->flags.ENABLE_SS !=0 ; bp_result = clk_src->bios->funcs->adjust_pixel_clock ( clk_src->bios, &bp_adjust_pixel_clock_params);if (bp_result ==BP_RESULT_OK ) {
@@ -958,7 +955,7 @@ static bool dce112_program_pix_clk(dce112_program_pixel_clk_resync (clk_src, pix_clk_params->signal_type, pix_clk_params->color_depth, - pix_clk_params->flags.SUPPORT_YCBCR420); + pix_clk_params->flags.SUPPORT_YCBCR420 !=0 );return true; }
@@ -1059,7 +1056,7 @@ static bool dcn31_program_pix_clk(dce112_program_pixel_clk_resync (clk_src, pix_clk_params->signal_type, pix_clk_params->color_depth, - pix_clk_params->flags.SUPPORT_YCBCR420); + pix_clk_params->flags.SUPPORT_YCBCR420 !=0 ); }return true;
@@ -1162,7 +1159,7 @@ static bool dcn401_program_pix_clk(dce112_program_pixel_clk_resync (clk_src, pix_clk_params->signal_type, pix_clk_params->color_depth, - pix_clk_params->flags.SUPPORT_YCBCR420); + pix_clk_params->flags.SUPPORT_YCBCR420 !=0 ); }return true;
@@ -1211,9 +1208,8 @@ static bool get_pixel_clk_frequency_100hz(*/ modulo_hz =REG_READ (MODULO [inst]);if (modulo_hz) - *pixel_clk_khz =div_u64 ((uint64_t )clock_hz* - dp_dto_ref_khz*10 , - modulo_hz); + *pixel_clk_khz = (unsigned int )div_u64 ((uint64_t )clock_hz * + dp_dto_ref_khz *10 , modulo_hz);else *pixel_clk_khz =0 ; }else {
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c +1 -1
@@ -120,7 +120,7 @@ static void process_channel_reply(uint32_t i2c_data;REG_GET (DC_I2C_DATA ,DC_I2C_DATA , &i2c_data); - *buffer++ = i2c_data; + *buffer++ = (uint8_t )i2c_data; --length; }
drivers/gpu/drm/amd/display/dc/dce/dce_panel_cntl.c +2 -2
@@ -209,7 +209,7 @@ static void dce_driver_set_backlight(struct panel_cntl *panel_cntl,if (pwm_period_bitcnt ==0 ) bit_count =16 ;else - bit_count = pwm_period_bitcnt; + bit_count = (uint8_t )pwm_period_bitcnt;/* e.g. maskedPwmPeriod = 0x24 when bitCount is 6 */ masked_pwm_period = masked_pwm_period & ((1 << bit_count) -1 );
@@ -224,7 +224,7 @@ static void dce_driver_set_backlight(struct panel_cntl *panel_cntl,* components shift by bitCount then mask 16 bits and add rounding bit * from MSB of fraction e.g. 0x86F7 = ((0x21BDC0 >> 6) & 0xFFF) + 0 */ - backlight_16bit = active_duty_cycle >> bit_count; + backlight_16bit = (uint32_t )(active_duty_cycle >> bit_count); backlight_16bit &=0xFFFF ; backlight_16bit += (active_duty_cycle >> (bit_count -1 )) &0x1 ;
drivers/gpu/drm/amd/display/dc/dce/dce_transform.c +4 -4
@@ -802,7 +802,7 @@ static void program_bit_depth_reduction(ASSERT (depth <=COLOR_DEPTH_121212 );/* Invalid clamp bit depth */ - spatial_dither_enable = bit_depth_params->flags.SPATIAL_DITHER_ENABLED; + spatial_dither_enable = bit_depth_params->flags.SPATIAL_DITHER_ENABLED !=0 ;/* Default to 12 bit truncation without rounding */ trunc_round_depth =DCP_OUT_TRUNC_ROUND_DEPTH_12BIT ; trunc_mode =DCP_OUT_TRUNC_ROUND_MODE_TRUNCATE ;
@@ -835,9 +835,9 @@ static void program_bit_depth_reduction( spatial_dither_enable,DCP_SPATIAL_DITHER_MODE_A_AA_A ,DCP_SPATIAL_DITHER_DEPTH_30BPP , - bit_depth_params->flags.FRAME_RANDOM, - bit_depth_params->flags.RGB_RANDOM, - bit_depth_params->flags.HIGHPASS_RANDOM); + bit_depth_params->flags.FRAME_RANDOM !=0 , + bit_depth_params->flags.RGB_RANDOM !=0 , + bit_depth_params->flags.HIGHPASS_RANDOM != 0); }#if defined(CONFIG_DRM_AMD_DC_SI )
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c +7 -7
@@ -176,7 +176,7 @@ void dmub_abm_init_config(struct abm *abm, cmd.abm_init_config.header.type =DMUB_CMD__ABM ; cmd.abm_init_config.header.sub_type =DMUB_CMD__ABM_INIT_CONFIG ; cmd.abm_init_config.abm_init_config_data.src.quad_part = dc->dmub_srv->dmub->scratch_mem_fb.gpu_addr; - cmd.abm_init_config.abm_init_config_data.bytes = bytes; + cmd.abm_init_config.abm_init_config_data.bytes = (uint16_t )bytes; cmd.abm_init_config.abm_init_config_data.version =DMUB_CMD_ABM_CONTROL_VERSION_1 ; cmd.abm_init_config.abm_init_config_data.panel_mask = panel_mask;
@@ -237,7 +237,7 @@ bool dmub_abm_save_restore( cmd.abm_save_restore.header.sub_type =DMUB_CMD__ABM_SAVE_RESTORE ; cmd.abm_save_restore.abm_init_config_data.src.quad_part = dc->dmub_srv->dmub->scratch_mem_fb.gpu_addr; - cmd.abm_save_restore.abm_init_config_data.bytes = bytes; + cmd.abm_save_restore.abm_init_config_data.bytes = (uint16_t )bytes; cmd.abm_save_restore.abm_init_config_data.version =DMUB_CMD_ABM_CONTROL_VERSION_1 ; cmd.abm_save_restore.abm_init_config_data.panel_mask = panel_mask;
@@ -265,10 +265,10 @@ bool dmub_abm_set_pipe(struct abm *abm,memset (&cmd,0 ,sizeof (cmd)); cmd.abm_set_pipe.header.type =DMUB_CMD__ABM ; cmd.abm_set_pipe.header.sub_type =DMUB_CMD__ABM_SET_PIPE ; - cmd.abm_set_pipe.abm_set_pipe_data.otg_inst = otg_inst; - cmd.abm_set_pipe.abm_set_pipe_data.pwrseq_inst = pwrseq_inst; - cmd.abm_set_pipe.abm_set_pipe_data.set_pipe_option = option; - cmd.abm_set_pipe.abm_set_pipe_data.panel_inst = panel_inst; + cmd.abm_set_pipe.abm_set_pipe_data.otg_inst = (uint8_t )otg_inst; + cmd.abm_set_pipe.abm_set_pipe_data.pwrseq_inst = (uint8_t )pwrseq_inst; + cmd.abm_set_pipe.abm_set_pipe_data.set_pipe_option = (uint8_t )option; + cmd.abm_set_pipe.abm_set_pipe_data.panel_inst = (uint8_t )panel_inst; cmd.abm_set_pipe.abm_set_pipe_data.ramping_boundary = ramping_boundary; cmd.abm_set_pipe.header.payload_bytes =sizeof (struct dmub_cmd_abm_set_pipe_data );
@@ -308,7 +308,7 @@ bool dmub_abm_set_event(struct abm *abm, unsigned int scaling_enable, unsigned imemset (&cmd,0 ,sizeof (cmd)); cmd.abm_set_event.header.type =DMUB_CMD__ABM ; cmd.abm_set_event.header.sub_type =DMUB_CMD__ABM_SET_EVENT ; - cmd.abm_set_event.abm_set_event_data.vb_scaling_enable = scaling_enable; + cmd.abm_set_event.abm_set_event_data.vb_scaling_enable = (uint8_t )scaling_enable; cmd.abm_set_event.abm_set_event_data.vb_scaling_strength_mapping = scaling_strength_map; cmd.abm_set_event.abm_set_event_data.panel_mask = (1 <<panel_inst); cmd.abm_set_event.header.payload_bytes =sizeof (struct dmub_cmd_abm_set_event_data );
drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c +6 -6
@@ -341,26 +341,26 @@ static bool dmub_psr_copy_settings(struct dmub_psr *dmub, copy_settings_data->mpcc_inst = pipe_ctx->plane_res.mpcc_inst;if (pipe_ctx->plane_res.dpp) - copy_settings_data->dpp_inst = pipe_ctx->plane_res.dpp->inst; + copy_settings_data->dpp_inst = (uint8_t )pipe_ctx->plane_res.dpp->inst;else copy_settings_data->dpp_inst =0 ;if (pipe_ctx->stream_res.opp) - copy_settings_data->opp_inst = pipe_ctx->stream_res.opp->inst; + copy_settings_data->opp_inst = (uint8_t )pipe_ctx->stream_res.opp->inst;else copy_settings_data->opp_inst =0 ;if (pipe_ctx->stream_res.tg) - copy_settings_data->otg_inst = pipe_ctx->stream_res.tg->inst; + copy_settings_data->otg_inst = (uint8_t )pipe_ctx->stream_res.tg->inst;else copy_settings_data->otg_inst =0 ;// Misc copy_settings_data->use_phy_fsm = link->ctx->dc->debug.psr_power_use_phy_fsm; - copy_settings_data->psr_level = psr_context->psr_level.u32all; + copy_settings_data->psr_level = (uint16_t )psr_context->psr_level.u32all; copy_settings_data->smu_optimizations_en = psr_context->allow_smu_optimizations; copy_settings_data->multi_disp_optimizations_en = psr_context->allow_multi_disp_optimizations; - copy_settings_data->frame_delay = psr_context->frame_delay; + copy_settings_data->frame_delay = (uint8_t )psr_context->frame_delay; copy_settings_data->frame_cap_ind = psr_context->psrFrameCaptureIndicationReq; - copy_settings_data->init_sdp_deadline = psr_context->sdpTransmitLineNumDeadline; + copy_settings_data->init_sdp_deadline = (uint16_t )psr_context->sdpTransmitLineNumDeadline; copy_settings_data->debug.u32All =0 ; copy_settings_data->debug.bitfields.visual_confirm = dc->dc->debug.visual_confirm ==VISUAL_CONFIRM_PSR ; copy_settings_data->debug.bitfields.use_hw_lock_mgr =1 ;
drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c +12 -11
@@ -151,22 +151,23 @@ static bool dmub_replay_copy_settings(struct dmub_replay *dmub, copy_settings_data->digfe_inst = replay_context->digfe_inst;if (pipe_ctx->plane_res.dpp) - copy_settings_data->dpp_inst = pipe_ctx->plane_res.dpp->inst; + copy_settings_data->dpp_inst = (uint8_t )pipe_ctx->plane_res.dpp->inst;else copy_settings_data->dpp_inst =0 ; +if (pipe_ctx->stream_res.tg) - copy_settings_data->otg_inst = pipe_ctx->stream_res.tg->inst; + copy_settings_data->otg_inst = (uint8_t )pipe_ctx->stream_res.tg->inst;else copy_settings_data->otg_inst =0 ; copy_settings_data->dpphy_inst = link->link_enc->transmitter;// Misc - copy_settings_data->line_time_in_ns = replay_context->line_time_in_ns; - copy_settings_data->panel_inst = panel_inst; - copy_settings_data->debug.u32All = link->replay_settings.config.debug_flags; + copy_settings_data->line_time_in_ns = (uint16_t )replay_context->line_time_in_ns; + copy_settings_data->panel_inst = (uint16_t )panel_inst; + copy_settings_data->debug.u32All = (uint16_t )link->replay_settings.config.debug_flags; copy_settings_data->pixel_deviation_per_line = link->dpcd_caps.pr_info.pixel_deviation_per_line; - copy_settings_data->max_deviation_line = link->dpcd_caps.pr_info.max_deviation_line; + copy_settings_data->max_deviation_line = (uint16_t )link->dpcd_caps.pr_info.max_deviation_line; copy_settings_data->smu_optimizations_en = link->replay_settings.replay_smu_opt_enable; copy_settings_data->replay_timing_sync_supported = link->replay_settings.config.replay_timing_sync_supported; copy_settings_data->replay_support_fast_resync_in_ultra_sleep_mode = link->replay_settings.config.replay_support_fast_resync_in_ultra_sleep_mode;
@@ -193,13 +194,13 @@ static bool dmub_replay_copy_settings(struct dmub_replay *dmub, copy_settings_data->flags.bitfields.alpm_mode = (enum dmub_alpm_mode )link->replay_settings.config.alpm_mode;if (link->replay_settings.config.alpm_mode ==DC_ALPM_AUXLESS ) { - copy_settings_data->auxless_alpm_data.lfps_setup_ns = dc->dc->debug.auxless_alpm_lfps_setup_ns; - copy_settings_data->auxless_alpm_data.lfps_period_ns = dc->dc->debug.auxless_alpm_lfps_period_ns; - copy_settings_data->auxless_alpm_data.lfps_silence_ns = dc->dc->debug.auxless_alpm_lfps_silence_ns; + copy_settings_data->auxless_alpm_data.lfps_setup_ns = (uint16_t )dc->dc->debug.auxless_alpm_lfps_setup_ns; + copy_settings_data->auxless_alpm_data.lfps_period_ns = (uint16_t )dc->dc->debug.auxless_alpm_lfps_period_ns; + copy_settings_data->auxless_alpm_data.lfps_silence_ns = (uint16_t )dc->dc->debug.auxless_alpm_lfps_silence_ns; copy_settings_data->auxless_alpm_data.lfps_t1_t2_override_us = - dc->dc->debug.auxless_alpm_lfps_t1t2_us; + (uint16_t )dc->dc->debug.auxless_alpm_lfps_t1t2_us; copy_settings_data->auxless_alpm_data.lfps_t1_t2_offset_us = - dc->dc->debug.auxless_alpm_lfps_t1t2_offset_us; + (uint16_t )dc->dc->debug.auxless_alpm_lfps_t1t2_offset_us; copy_settings_data->auxless_alpm_data.lttpr_count = link->dc->link_srv->dp_get_lttpr_count (link); }
drivers/gpu/drm/amd/display/dc/dce80/dce80_timing_generator.c +1 -1
@@ -98,7 +98,7 @@ static void program_pix_dur(struct timing_generator *tg, uint32_t pix_clk_100hz)set_reg_field_value ( value, - pix_dur, + (uint32_t )pix_dur,DPG_PIPE_ARBITRATION_CONTROL1 ,PIXEL_DURATION );
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c +2 -2
@@ -75,8 +75,8 @@ void cm_helper_read_color_matrices(struct dc_context *ctx, csc_c11, ®val0, csc_c12, ®val1); - regval[2 * i] = regval0; - regval[(2 * i) +1 ] = regval1; + regval[2 * i] = (uint16_t )regval0; + regval[(2 * i) +1 ] = (uint16_t )regval1; i++; }
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mmhubbub.c +8 -8
@@ -107,35 +107,35 @@ static void mmhubbub3_config_mcif_buf(struct mcif_wb *mcif_wb,struct dcn30_mmhubbub *mcif_wb30 =TO_DCN30_MMHUBBUB (mcif_wb);/* buffer address for packing mode or Luma in planar mode */ -REG_UPDATE (MCIF_WB_BUF_1_ADDR_Y ,MCIF_WB_BUF_1_ADDR_Y ,MCIF_ADDR (params->luma_address[0 ])); +REG_UPDATE (MCIF_WB_BUF_1_ADDR_Y ,MCIF_WB_BUF_1_ADDR_Y , (uint32_t )MCIF_ADDR (params->luma_address[0 ]));REG_UPDATE (MCIF_WB_BUF_1_ADDR_Y_HIGH ,MCIF_WB_BUF_1_ADDR_Y_HIGH ,MCIF_ADDR_HIGH (params->luma_address[0 ]));/* buffer address for Chroma in planar mode (unused in packing mode) */ -REG_UPDATE (MCIF_WB_BUF_1_ADDR_C ,MCIF_WB_BUF_1_ADDR_C ,MCIF_ADDR (params->chroma_address[0 ])); +REG_UPDATE (MCIF_WB_BUF_1_ADDR_C ,MCIF_WB_BUF_1_ADDR_C , (uint32_t )MCIF_ADDR (params->chroma_address[0 ]));REG_UPDATE (MCIF_WB_BUF_1_ADDR_C_HIGH ,MCIF_WB_BUF_1_ADDR_C_HIGH ,MCIF_ADDR_HIGH (params->chroma_address[0 ]));/* buffer address for packing mode or Luma in planar mode */ -REG_UPDATE (MCIF_WB_BUF_2_ADDR_Y ,MCIF_WB_BUF_2_ADDR_Y ,MCIF_ADDR (params->luma_address[1 ])); +REG_UPDATE (MCIF_WB_BUF_2_ADDR_Y ,MCIF_WB_BUF_2_ADDR_Y , (uint32_t )MCIF_ADDR (params->luma_address[1 ]));REG_UPDATE (MCIF_WB_BUF_2_ADDR_Y_HIGH ,MCIF_WB_BUF_2_ADDR_Y_HIGH ,MCIF_ADDR_HIGH (params->luma_address[1 ]));/* buffer address for Chroma in planar mode (unused in packing mode) */ -REG_UPDATE (MCIF_WB_BUF_2_ADDR_C ,MCIF_WB_BUF_2_ADDR_C ,MCIF_ADDR (params->chroma_address[1 ])); +REG_UPDATE (MCIF_WB_BUF_2_ADDR_C ,MCIF_WB_BUF_2_ADDR_C , (uint32_t )MCIF_ADDR (params->chroma_address[1 ]));REG_UPDATE (MCIF_WB_BUF_2_ADDR_C_HIGH ,MCIF_WB_BUF_2_ADDR_C_HIGH ,MCIF_ADDR_HIGH (params->chroma_address[1 ]));/* buffer address for packing mode or Luma in planar mode */ -REG_UPDATE (MCIF_WB_BUF_3_ADDR_Y ,MCIF_WB_BUF_3_ADDR_Y ,MCIF_ADDR (params->luma_address[2 ])); +REG_UPDATE (MCIF_WB_BUF_3_ADDR_Y ,MCIF_WB_BUF_3_ADDR_Y , (uint32_t )MCIF_ADDR (params->luma_address[2 ]));REG_UPDATE (MCIF_WB_BUF_3_ADDR_Y_HIGH ,MCIF_WB_BUF_3_ADDR_Y_HIGH ,MCIF_ADDR_HIGH (params->luma_address[2 ]));/* buffer address for Chroma in planar mode (unused in packing mode) */ -REG_UPDATE (MCIF_WB_BUF_3_ADDR_C ,MCIF_WB_BUF_3_ADDR_C ,MCIF_ADDR (params->chroma_address[2 ])); +REG_UPDATE (MCIF_WB_BUF_3_ADDR_C ,MCIF_WB_BUF_3_ADDR_C , (uint32_t )MCIF_ADDR (params->chroma_address[2 ]));REG_UPDATE (MCIF_WB_BUF_3_ADDR_C_HIGH ,MCIF_WB_BUF_3_ADDR_C_HIGH ,MCIF_ADDR_HIGH (params->chroma_address[2 ]));/* buffer address for packing mode or Luma in planar mode */ -REG_UPDATE (MCIF_WB_BUF_4_ADDR_Y ,MCIF_WB_BUF_4_ADDR_Y ,MCIF_ADDR (params->luma_address[3 ])); +REG_UPDATE (MCIF_WB_BUF_4_ADDR_Y ,MCIF_WB_BUF_4_ADDR_Y , (uint32_t )MCIF_ADDR (params->luma_address[3 ]));REG_UPDATE (MCIF_WB_BUF_4_ADDR_Y_HIGH ,MCIF_WB_BUF_4_ADDR_Y_HIGH ,MCIF_ADDR_HIGH (params->luma_address[3 ]));/* buffer address for Chroma in planar mode (unused in packing mode) */ -REG_UPDATE (MCIF_WB_BUF_4_ADDR_C ,MCIF_WB_BUF_4_ADDR_C ,MCIF_ADDR (params->chroma_address[3 ])); +REG_UPDATE (MCIF_WB_BUF_4_ADDR_C ,MCIF_WB_BUF_4_ADDR_C , (uint32_t )MCIF_ADDR (params->chroma_address[3 ]));REG_UPDATE (MCIF_WB_BUF_4_ADDR_C_HIGH ,MCIF_WB_BUF_4_ADDR_C_HIGH ,MCIF_ADDR_HIGH (params->chroma_address[3 ]));/* setup luma & chroma size
drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c +1 -1
@@ -43,7 +43,7 @@#undef FN#define FN (reg_name, field_name) \ - enc1->se_shift->field_name, enc1->se_mask->field_name + (uint8_t)enc1->se_shift->field_name, enc1->se_mask->field_name#define VBI_LINE_0 0#define HDMI_CLOCK_CHANNEL_RATE_MORE_340M 340000
drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c +2 -2
@@ -23,7 +23,7 @@#undef FN#define FN (reg_name, field_name) \ - enc1->se_shift->field_name, enc1->se_mask->field_name + (uint8_t)enc1->se_shift->field_name, enc1->se_mask->field_name#define VBI_LINE_0 0#define HDMI_CLOCK_CHANNEL_RATE_MORE_340M 340000
@@ -401,7 +401,7 @@ void enc42_se_enable_audio_clock( {struct dcn10_stream_encoder *enc1 =DCN10STRENC_FROM_STRENC (enc); -REG_UPDATE (DIG_FE_AUDIO_CNTL ,APG_CLOCK_ENABLE , !!enable); +REG_UPDATE (DIG_FE_AUDIO_CNTL ,APG_CLOCK_ENABLE , enable); }
drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c +3 -2
@@ -533,13 +533,14 @@ static void split_stream_across_pipes( *secondary_pipe = *primary_pipe; - secondary_pipe->pipe_idx = pipe_idx; + secondary_pipe->pipe_idx = (uint8_t )pipe_idx; secondary_pipe->plane_res.mi = pool->mis[secondary_pipe->pipe_idx]; secondary_pipe->plane_res.hubp = pool->hubps[secondary_pipe->pipe_idx]; secondary_pipe->plane_res.ipp = pool->ipps[secondary_pipe->pipe_idx]; secondary_pipe->plane_res.xfm = pool->transforms[secondary_pipe->pipe_idx]; secondary_pipe->plane_res.dpp = pool->dpps[secondary_pipe->pipe_idx]; - secondary_pipe->plane_res.mpcc_inst = pool->dpps[secondary_pipe->pipe_idx]->inst; + secondary_pipe->plane_res.mpcc_inst = + (uint8_t )pool->dpps[secondary_pipe->pipe_idx]->inst;if (primary_pipe->bottom_pipe) {ASSERT (primary_pipe->bottom_pipe != secondary_pipe); secondary_pipe->bottom_pipe = primary_pipe->bottom_pipe;
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +4 -3
@@ -1402,11 +1402,12 @@ int dcn20_populate_dml_pipes_from_context(struct dc *dc, timing->h_addressable + timing->h_border_left + timing->h_border_right; pipes[pipe_cnt].pipe.dest.vactive = timing->v_addressable + timing->v_border_top + timing->v_border_bottom; - pipes[pipe_cnt].pipe.dest.interlaced = timing->flags.INTERLACE; + pipes[pipe_cnt].pipe.dest.interlaced = (unsigned char )timing->flags.INTERLACE; pipes[pipe_cnt].pipe.dest.pixel_rate_mhz = timing->pix_clk_100hz/10000.0 ;if (timing->timing_3d_format ==TIMING_3D_FORMAT_HW_FRAME_PACKING ) pipes[pipe_cnt].pipe.dest.pixel_rate_mhz *=2 ; - pipes[pipe_cnt].pipe.dest.otg_inst = res_ctx->pipe_ctx[i].stream_res.tg->inst; + pipes[pipe_cnt].pipe.dest.otg_inst = + (unsigned char )res_ctx->pipe_ctx[i].stream_res.tg->inst; pipes[pipe_cnt].dout.dp_lanes =4 ; pipes[pipe_cnt].dout.dp_rate = dm_dp_rate_na; pipes[pipe_cnt].dout.is_virtual =0 ;
@@ -1879,7 +1880,7 @@ void dcn20_update_bounding_box(struct dc *dc, bb->clock_limits[i].dram_speed_mts = uclk_states[i] *16 /1000 ;// FCLK:UCLK ratio is 1.08 - min_fclk_required_by_uclk =div_u64 (((unsigned long long )uclk_states[i]) *1080 , + min_fclk_required_by_uclk = (int )div_u64 (((unsigned long long )uclk_states[i]) *1080 ,1000000 ); bb->clock_limits[i].fabricclk_mhz = (min_fclk_required_by_uclk < min_dcfclk) ?
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +1 -1
@@ -662,7 +662,7 @@ void dcn3_fpu_build_wm_range_table(struct clk_mgr *base)double pstate_latency_us = base->ctx->dc->dml.soc.dram_clock_change_latency_us;double sr_exit_time_us = base->ctx->dc->dml.soc.sr_exit_time_us;double sr_enter_plus_exit_time_us = base->ctx->dc->dml.soc.sr_enter_plus_exit_time_us; -uint16_t min_uclk_mhz = base->bw_params->clk_table.entries[0 ].memclk_mhz; +uint16_t min_uclk_mhz = (uint16_t )base->bw_params->clk_table.entries[0 ].memclk_mhz;dc_assert_fp_enabled ();
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +20 -17
@@ -191,21 +191,24 @@ void dcn32_build_wm_range_table_fpu(struct clk_mgr_internal *clk_mgr)double sr_exit_time_us = clk_mgr->base.ctx->dc->dml.soc.sr_exit_time_us;double sr_enter_plus_exit_time_us = clk_mgr->base.ctx->dc->dml.soc.sr_enter_plus_exit_time_us;/* For min clocks use as reported by PM FW and report those as min */ -uint16_t min_uclk_mhz = clk_mgr->base.bw_params->clk_table.entries[0 ].memclk_mhz; -uint16_t min_dcfclk_mhz = clk_mgr->base.bw_params->clk_table.entries[0 ].dcfclk_mhz; +uint16_t min_uclk_mhz = (uint16_t )clk_mgr->base.bw_params->clk_table.entries[0 ].memclk_mhz; +uint16_t min_dcfclk_mhz = (uint16_t )clk_mgr->base.bw_params->clk_table.entries[0 ].dcfclk_mhz;uint16_t setb_min_uclk_mhz = min_uclk_mhz; -uint16_t dcfclk_mhz_for_the_second_state = clk_mgr->base.ctx->dc->dml.soc.clock_limits[2 ].dcfclk_mhz; +uint16_t dcfclk_mhz_for_the_second_state = + (uint16_t )clk_mgr->base.ctx->dc->dml.soc.clock_limits[2 ].dcfclk_mhz;dc_assert_fp_enabled ();/* For Set B ranges use min clocks state 2 when available, and report those to PM FW */ -if (dcfclk_mhz_for_the_second_state) - clk_mgr->base.bw_params->wm_table.nv_entries[WM_B ].pmfw_breakdown.min_dcfclk = dcfclk_mhz_for_the_second_state; -else - clk_mgr->base.bw_params->wm_table.nv_entries[WM_B ].pmfw_breakdown.min_dcfclk = clk_mgr->base.bw_params->clk_table.entries[0 ].dcfclk_mhz; +if (dcfclk_mhz_for_the_second_state) { + clk_mgr->base.bw_params->wm_table.nv_entries[WM_B ].pmfw_breakdown.min_dcfclk = + (uint16_t )dcfclk_mhz_for_the_second_state; + }else + clk_mgr->base.bw_params->wm_table.nv_entries[WM_B ].pmfw_breakdown.min_dcfclk = + (uint16_t )clk_mgr->base.bw_params->clk_table.entries[0 ].dcfclk_mhz;if (clk_mgr->base.bw_params->clk_table.entries[2 ].memclk_mhz) - setb_min_uclk_mhz = clk_mgr->base.bw_params->clk_table.entries[2 ].memclk_mhz; + setb_min_uclk_mhz = (uint16_t )clk_mgr->base.bw_params->clk_table.entries[2 ].memclk_mhz;/* Set A - Normal - default values */ clk_mgr->base.bw_params->wm_table.nv_entries[WM_A ].valid = true;
@@ -901,7 +904,7 @@ static bool subvp_vblank_schedulable(struct dc *dc, struct dc_state *context)struct pipe_ctx *subvp_pipe =NULL ;bool found = false;bool schedulable = false; -uint32_t i =0 ; +uint8_t i =0 ;uint8_t vblank_index =0 ;uint16_t prefetch_us =0 ;uint16_t mall_region_us =0 ;
@@ -986,7 +989,7 @@ static bool subvp_subvp_admissable(struct dc *dc, struct dc_state *context) {bool result = false; -uint32_t i; +uint8_t i;uint8_t subvp_count =0 ;uint32_t min_refresh = subvp_high_refresh_list.min_refresh, max_refresh =0 ;uint64_t refresh_rate =0 ;
@@ -1779,7 +1782,7 @@ static struct pipe_ctx *dcn32_find_split_pipe(if (old_index >=0 && context->res_ctx.pipe_ctx[old_index].stream ==NULL ) { pipe = &context->res_ctx.pipe_ctx[old_index]; - pipe->pipe_idx = old_index; + pipe->pipe_idx = (uint8_t )old_index; }if (!pipe)
@@ -1788,7 +1791,7 @@ static struct pipe_ctx *dcn32_find_split_pipe( && dc->current_state->res_ctx.pipe_ctx[i].prev_odm_pipe == NULL) {if (context->res_ctx.pipe_ctx[i].stream ==NULL ) { pipe = &context->res_ctx.pipe_ctx[i]; - pipe->pipe_idx = i; + pipe->pipe_idx = (uint8_t )i;break ; } }
@@ -1803,7 +1806,7 @@ static struct pipe_ctx *dcn32_find_split_pipe(for (i = dc->res_pool->pipe_count -1 ; i >=0 ; i--) {if (context->res_ctx.pipe_ctx[i].stream ==NULL ) { pipe = &context->res_ctx.pipe_ctx[i]; - pipe->pipe_idx = i; + pipe->pipe_idx = (uint8_t )i;break ; } }
@@ -1846,13 +1849,13 @@ static bool dcn32_split_stream_for_mpc_or_odm( *sec_pipe = *pri_pipe; - sec_pipe->pipe_idx = pipe_idx; + sec_pipe->pipe_idx = (uint8_t )pipe_idx; sec_pipe->plane_res.mi = pool->mis[pipe_idx]; sec_pipe->plane_res.hubp = pool->hubps[pipe_idx]; sec_pipe->plane_res.ipp = pool->ipps[pipe_idx]; sec_pipe->plane_res.xfm = pool->transforms[pipe_idx]; sec_pipe->plane_res.dpp = pool->dpps[pipe_idx]; - sec_pipe->plane_res.mpcc_inst = pool->dpps[pipe_idx]->inst; + sec_pipe->plane_res.mpcc_inst = (uint8_t )pool->dpps[pipe_idx]->inst; sec_pipe->stream_res.dsc =NULL ;if (odm) {if (pri_pipe->next_odm_pipe) {
@@ -3365,8 +3368,8 @@ bool dcn32_allow_subvp_with_active_margin(struct pipe_ctx *pipe) refresh_rate = (pipe->stream->timing.pix_clk_100hz * (uint64_t )100 + (uint64_t )pipe->stream->timing.v_total * pipe->stream->timing.h_total - (uint64_t )1 ); - refresh_rate =div_u64 (refresh_rate, pipe->stream->timing.v_total); - refresh_rate =div_u64 (refresh_rate, pipe->stream->timing.h_total); + refresh_rate = (uint32_t )div_u64 (refresh_rate, pipe->stream->timing.v_total); + refresh_rate = (uint32_t )div_u64 (refresh_rate, pipe->stream->timing.h_total);if (refresh_rate >= min_refresh && refresh_rate <= max_refresh &&dcn32_check_native_scaling_for_res (pipe, width, height)) {
drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c +6 -6
@@ -405,12 +405,12 @@ bool dsc_prepare_config(const struct dsc_config *dsc_cfg, struct dsc_reg_values dsc_reg_vals->pixel_format =dsc_dc_pixel_encoding_to_dsc_pixel_format (dsc_cfg->pixel_encoding, dsc_cfg->dc_dsc_cfg.ycbcr422_simple); dsc_reg_vals->num_slices_h = dsc_cfg->dc_dsc_cfg.num_slices_h; dsc_reg_vals->num_slices_v = dsc_cfg->dc_dsc_cfg.num_slices_v; - dsc_reg_vals->pps.dsc_version_minor = dsc_cfg->dc_dsc_cfg.version_minor; - dsc_reg_vals->pps.pic_width = dsc_cfg->pic_width; - dsc_reg_vals->pps.pic_height = dsc_cfg->pic_height; + dsc_reg_vals->pps.dsc_version_minor = (u8 )dsc_cfg->dc_dsc_cfg.version_minor; + dsc_reg_vals->pps.pic_width = (u16 )dsc_cfg->pic_width; + dsc_reg_vals->pps.pic_height = (u16 )dsc_cfg->pic_height; dsc_reg_vals->pps.bits_per_component =dsc_dc_color_depth_to_dsc_bits_per_comp (dsc_cfg->color_depth); dsc_reg_vals->pps.block_pred_enable = dsc_cfg->dc_dsc_cfg.block_pred_enable; - dsc_reg_vals->pps.line_buf_depth = dsc_cfg->dc_dsc_cfg.linebuf_depth; + dsc_reg_vals->pps.line_buf_depth = (u8 )dsc_cfg->dc_dsc_cfg.linebuf_depth; dsc_reg_vals->alternate_ich_encoding_en = dsc_reg_vals->pps.dsc_version_minor ==1 ?0 :1 ; dsc_reg_vals->ich_reset_at_eol = (dsc_cfg->is_odm || dsc_reg_vals->num_slices_h >1 ) ?0xF :0 ;
@@ -428,9 +428,9 @@ bool dsc_prepare_config(const struct dsc_config *dsc_cfg, struct dsc_reg_values dsc_reg_vals->bpp_x32 = dsc_cfg->dc_dsc_cfg.bits_per_pixel <<1 ;if (dsc_reg_vals->pixel_format ==DSC_PIXFMT_NATIVE_YCBCR420 || dsc_reg_vals->pixel_format ==DSC_PIXFMT_NATIVE_YCBCR422 ) - dsc_reg_vals->pps.bits_per_pixel = dsc_reg_vals->bpp_x32; + dsc_reg_vals->pps.bits_per_pixel = (u16 )dsc_reg_vals->bpp_x32;else - dsc_reg_vals->pps.bits_per_pixel = dsc_reg_vals->bpp_x32 >>1 ; + dsc_reg_vals->pps.bits_per_pixel = (u16)(dsc_reg_vals->bpp_x32 >>1 ); dsc_reg_vals->pps.convert_rgb = dsc_reg_vals->pixel_format ==DSC_PIXFMT_RGB ?1 :0 ; dsc_reg_vals->pps.native_422 = (dsc_reg_vals->pixel_format ==DSC_PIXFMT_NATIVE_YCBCR422 );
drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c +15 -15
@@ -72,27 +72,27 @@ static void copy_rc_to_cfg(struct drm_dsc_config *dsc_cfg, const struct rc_param {int i; - dsc_cfg->rc_quant_incr_limit0 = rc->rc_quant_incr_limit0; - dsc_cfg->rc_quant_incr_limit1 = rc->rc_quant_incr_limit1; - dsc_cfg->initial_offset = rc->initial_fullness_offset; - dsc_cfg->initial_xmit_delay = rc->initial_xmit_delay; - dsc_cfg->first_line_bpg_offset = rc->first_line_bpg_offset; - dsc_cfg->second_line_bpg_offset = rc->second_line_bpg_offset; - dsc_cfg->flatness_min_qp = rc->flatness_min_qp; - dsc_cfg->flatness_max_qp = rc->flatness_max_qp; + dsc_cfg->rc_quant_incr_limit0 = (u8 )rc->rc_quant_incr_limit0; + dsc_cfg->rc_quant_incr_limit1 = (u8 )rc->rc_quant_incr_limit1; + dsc_cfg->initial_offset = (u16 )rc->initial_fullness_offset; + dsc_cfg->initial_xmit_delay = (u16 )rc->initial_xmit_delay; + dsc_cfg->first_line_bpg_offset = (u8 )rc->first_line_bpg_offset; + dsc_cfg->second_line_bpg_offset = (u8 )rc->second_line_bpg_offset; + dsc_cfg->flatness_min_qp = (u8 )rc->flatness_min_qp; + dsc_cfg->flatness_max_qp = (u8 )rc->flatness_max_qp;for (i =0 ; i <QP_SET_SIZE ; ++i) { - dsc_cfg->rc_range_params[i].range_min_qp = rc->qp_min[i]; - dsc_cfg->rc_range_params[i].range_max_qp = rc->qp_max[i]; + dsc_cfg->rc_range_params[i].range_min_qp = (u8 )rc->qp_min[i]; + dsc_cfg->rc_range_params[i].range_max_qp = (u8 )rc->qp_max[i];/* Truncate 8-bit signed value to 6-bit signed value */ dsc_cfg->rc_range_params[i].range_bpg_offset =0x3f & rc->ofs[i]; } - dsc_cfg->rc_model_size = rc->rc_model_size; - dsc_cfg->rc_edge_factor = rc->rc_edge_factor; - dsc_cfg->rc_tgt_offset_high = rc->rc_tgt_offset_hi; - dsc_cfg->rc_tgt_offset_low = rc->rc_tgt_offset_lo; + dsc_cfg->rc_model_size = (u16 )rc->rc_model_size; + dsc_cfg->rc_edge_factor = (u8 )rc->rc_edge_factor; + dsc_cfg->rc_tgt_offset_high = (u8 )rc->rc_tgt_offset_hi; + dsc_cfg->rc_tgt_offset_low = (u8 )rc->rc_tgt_offset_lo;for (i =0 ; i <QP_SET_SIZE -1 ; ++i) - dsc_cfg->rc_buf_thresh[i] = rc->rc_buf_thresh[i]; + dsc_cfg->rc_buf_thresh[i] = (u16 )rc->rc_buf_thresh[i]; } int dscc_compute_dsc_parameters(const struct drm_dsc_config *pps,
drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c +1 -1
@@ -36,7 +36,7 @@#undef FN#define FN (reg_name, field_name) \ - ddc->shifts->field_name, ddc->masks->field_name + gpio_reg_shift(ddc->shifts->field_name), ddc->masks->field_name#define CTX \ ddc->base.base.ctx
drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c +1 -1
@@ -37,7 +37,7 @@#undef FN#define FN (reg_name, field_name) \ - generic->shifts->field_name, generic->masks->field_name + gpio_reg_shift(generic->shifts->field_name), generic->masks->field_name#define CTX \ generic->base.base.ctx
drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c +1 -1
@@ -32,7 +32,7 @@#undef FN#define FN (reg_name, field_name) \ - gpio->regs->field_name ## _shift, gpio->regs->field_name ## _mask + gpio_reg_shift(gpio->regs->field_name ## _shift), gpio->regs->field_name ## _mask#define CTX \ gpio->base.ctx
drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h +9 -0
@@ -141,4 +141,13 @@ enum gpio_result dal_hw_gpio_change_mode(void dal_hw_gpio_close (struct hw_gpio_pin *ptr); +/* +* Shared helper used by all GPIO register helpers that pass a field shift +* (stored as uint32_t) into register functions that expect uint8_t. +*/ +static inline uint8_t gpio_reg_shift (uint32_t shift) +{ +return (uint8_t )shift; +} +#endif
drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c +1 -1
@@ -35,7 +35,7 @@#undef FN#define FN (reg_name, field_name) \ - hpd->shifts->field_name, hpd->masks->field_name + gpio_reg_shift(hpd->shifts->field_name), hpd->masks->field_name#define CTX \ hpd->base.base.ctx
drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c +8 -8
@@ -638,27 +638,27 @@ void hubbub1_update_dchub( SDPIF_FB_BASE, 0x0FFFF);REG_UPDATE (DCHUBBUB_SDPIF_AGP_BASE , -SDPIF_AGP_BASE , dh_data->zfb_phys_addr_base >>22 ); +SDPIF_AGP_BASE , (uint32_t )(dh_data->zfb_phys_addr_base >>22 ));REG_UPDATE (DCHUBBUB_SDPIF_AGP_BOT , -SDPIF_AGP_BOT , dh_data->zfb_mc_base_addr >>22 ); +SDPIF_AGP_BOT , (uint32_t )(dh_data->zfb_mc_base_addr >>22 ));REG_UPDATE (DCHUBBUB_SDPIF_AGP_TOP , -SDPIF_AGP_TOP , (dh_data->zfb_mc_base_addr + - dh_data->zfb_size_in_byte -1 ) >>22 ); +SDPIF_AGP_TOP , (uint32_t )((dh_data->zfb_mc_base_addr + + dh_data->zfb_size_in_byte -1 ) >>22 ));break ;case FRAME_BUFFER_MODE_MIXED_ZFB_AND_LOCAL :/*Should not touch FB LOCATION (done by VBIOS on AsicInit table)*/ REG_UPDATE (DCHUBBUB_SDPIF_AGP_BASE , -SDPIF_AGP_BASE , dh_data->zfb_phys_addr_base >>22 ); +SDPIF_AGP_BASE , (uint32_t )(dh_data->zfb_phys_addr_base >>22 ));REG_UPDATE (DCHUBBUB_SDPIF_AGP_BOT , -SDPIF_AGP_BOT , dh_data->zfb_mc_base_addr >>22 ); +SDPIF_AGP_BOT , (uint32_t )(dh_data->zfb_mc_base_addr >>22 ));REG_UPDATE (DCHUBBUB_SDPIF_AGP_TOP , -SDPIF_AGP_TOP , (dh_data->zfb_mc_base_addr + - dh_data->zfb_size_in_byte -1 ) >>22 ); +SDPIF_AGP_TOP , (uint32_t )((dh_data->zfb_mc_base_addr + + dh_data->zfb_size_in_byte -1 ) >>22 ));break ;case FRAME_BUFFER_MODE_LOCAL_ONLY :/*Should not touch FB LOCATION (done by VBIOS on AsicInit table)*/
drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c +14 -14
@@ -398,17 +398,17 @@ int hubbub2_init_dchub_sys_ctx(struct hubbub *hubbub,struct dcn_vmid_page_table_config phys_config;REG_SET (DCN_VM_FB_LOCATION_BASE ,0 , -FB_BASE , pa_config->system_aperture.fb_base >>24 ); +FB_BASE ,ADDR_HI24 (pa_config->system_aperture.fb_base));REG_SET (DCN_VM_FB_LOCATION_TOP ,0 , -FB_TOP , pa_config->system_aperture.fb_top >>24 ); +FB_TOP ,ADDR_HI24 (pa_config->system_aperture.fb_top));REG_SET (DCN_VM_FB_OFFSET ,0 , -FB_OFFSET , pa_config->system_aperture.fb_offset >>24 ); +FB_OFFSET ,ADDR_HI24 (pa_config->system_aperture.fb_offset));REG_SET (DCN_VM_AGP_BOT ,0 , -AGP_BOT , pa_config->system_aperture.agp_bot >>24 ); +AGP_BOT ,ADDR_HI24 (pa_config->system_aperture.agp_bot));REG_SET (DCN_VM_AGP_TOP ,0 , -AGP_TOP , pa_config->system_aperture.agp_top >>24 ); +AGP_TOP ,ADDR_HI24 (pa_config->system_aperture.agp_top));REG_SET (DCN_VM_AGP_BASE ,0 , -AGP_BASE , pa_config->system_aperture.agp_base >>24 ); +AGP_BASE ,ADDR_HI24 (pa_config->system_aperture.agp_base));REG_SET (DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB ,0 ,DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB , (pa_config->page_table_default_page_addr >>44 ) &0xF );
@@ -447,36 +447,36 @@ void hubbub2_update_dchub(struct hubbub *hubbub,/*This field defines the 24 MSBs, bits [47:24] of the 48 bit AGP Base*/ REG_UPDATE (DCN_VM_AGP_BASE , -AGP_BASE , dh_data->zfb_phys_addr_base >>24 ); +AGP_BASE ,ADDR_HI24 (dh_data->zfb_phys_addr_base));/*This field defines the bottom range of the AGP aperture and represents the 24*/ /*MSBs, bits [47:24] of the 48 address bits*/ REG_UPDATE (DCN_VM_AGP_BOT , -AGP_BOT , dh_data->zfb_mc_base_addr >>24 ); +AGP_BOT ,ADDR_HI24 (dh_data->zfb_mc_base_addr));/*This field defines the top range of the AGP aperture and represents the 24*/ /*MSBs, bits [47:24] of the 48 address bits*/ REG_UPDATE (DCN_VM_AGP_TOP , -AGP_TOP , (dh_data->zfb_mc_base_addr + - dh_data->zfb_size_in_byte -1 ) >>24 ); +AGP_TOP ,ADDR_HI24 (dh_data->zfb_mc_base_addr + + dh_data->zfb_size_in_byte -1 ));break ;case FRAME_BUFFER_MODE_MIXED_ZFB_AND_LOCAL :/*Should not touch FB LOCATION (done by VBIOS on AsicInit table)*/ /*This field defines the 24 MSBs, bits [47:24] of the 48 bit AGP Base*/ REG_UPDATE (DCN_VM_AGP_BASE , -AGP_BASE , dh_data->zfb_phys_addr_base >>24 ); +AGP_BASE ,ADDR_HI24 (dh_data->zfb_phys_addr_base));/*This field defines the bottom range of the AGP aperture and represents the 24*/ /*MSBs, bits [47:24] of the 48 address bits*/ REG_UPDATE (DCN_VM_AGP_BOT , -AGP_BOT , dh_data->zfb_mc_base_addr >>24 ); +AGP_BOT ,ADDR_HI24 (dh_data->zfb_mc_base_addr));/*This field defines the top range of the AGP aperture and represents the 24*/ /*MSBs, bits [47:24] of the 48 address bits*/ REG_UPDATE (DCN_VM_AGP_TOP , -AGP_TOP , (dh_data->zfb_mc_base_addr + - dh_data->zfb_size_in_byte -1 ) >>24 ); +AGP_TOP ,ADDR_HI24 (dh_data->zfb_mc_base_addr + + dh_data->zfb_size_in_byte -1 ));break ;case FRAME_BUFFER_MODE_LOCAL_ONLY :/*Should not touch FB LOCATION (should be done by VBIOS)*/
drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h +3 -0
@@ -141,4 +141,7 @@ void hubbub2_wm_read_state(struct hubbub *hubbub,void hubbub2_read_state (struct hubbub *hubbub,struct dcn_hubbub_state *hubbub_state); +/* Extract bits [47:24] of a physical address for hardware register fields */ +#define ADDR_HI24 (a) ((uint32_t)((uint64_t)(a) >> 24)) +#endif
drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c +6 -6
@@ -111,17 +111,17 @@ int hubbub21_init_dchub(struct hubbub *hubbub,struct dcn_vmid_page_table_config phys_config;REG_SET (DCN_VM_FB_LOCATION_BASE ,0 , -FB_BASE , pa_config->system_aperture.fb_base >>24 ); +FB_BASE ,ADDR_HI24 (pa_config->system_aperture.fb_base));REG_SET (DCN_VM_FB_LOCATION_TOP ,0 , -FB_TOP , pa_config->system_aperture.fb_top >>24 ); +FB_TOP ,ADDR_HI24 (pa_config->system_aperture.fb_top));REG_SET (DCN_VM_FB_OFFSET ,0 , -FB_OFFSET , pa_config->system_aperture.fb_offset >>24 ); +FB_OFFSET ,ADDR_HI24 (pa_config->system_aperture.fb_offset));REG_SET (DCN_VM_AGP_BOT ,0 , -AGP_BOT , pa_config->system_aperture.agp_bot >>24 ); +AGP_BOT ,ADDR_HI24 (pa_config->system_aperture.agp_bot));REG_SET (DCN_VM_AGP_TOP ,0 , -AGP_TOP , pa_config->system_aperture.agp_top >>24 ); +AGP_TOP ,ADDR_HI24 (pa_config->system_aperture.agp_top));REG_SET (DCN_VM_AGP_BASE ,0 , -AGP_BASE , pa_config->system_aperture.agp_base >>24 ); +AGP_BASE ,ADDR_HI24 (pa_config->system_aperture.agp_base));if (pa_config->gart_config.page_table_start_addr != pa_config->gart_config.page_table_end_addr) { phys_config.page_table_start_addr = pa_config->gart_config.page_table_start_addr >>12 ;
drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c +6 -6
@@ -68,17 +68,17 @@ int hubbub3_init_dchub_sys_ctx(struct hubbub *hubbub,struct dcn_vmid_page_table_config phys_config;REG_SET (DCN_VM_FB_LOCATION_BASE ,0 , -FB_BASE , pa_config->system_aperture.fb_base >>24 ); +FB_BASE ,ADDR_HI24 (pa_config->system_aperture.fb_base));REG_SET (DCN_VM_FB_LOCATION_TOP ,0 , -FB_TOP , pa_config->system_aperture.fb_top >>24 ); +FB_TOP ,ADDR_HI24 (pa_config->system_aperture.fb_top));REG_SET (DCN_VM_FB_OFFSET ,0 , -FB_OFFSET , pa_config->system_aperture.fb_offset >>24 ); +FB_OFFSET ,ADDR_HI24 (pa_config->system_aperture.fb_offset));REG_SET (DCN_VM_AGP_BOT ,0 , -AGP_BOT , pa_config->system_aperture.agp_bot >>24 ); +AGP_BOT ,ADDR_HI24 (pa_config->system_aperture.agp_bot));REG_SET (DCN_VM_AGP_TOP ,0 , -AGP_TOP , pa_config->system_aperture.agp_top >>24 ); +AGP_TOP ,ADDR_HI24 (pa_config->system_aperture.agp_top));REG_SET (DCN_VM_AGP_BASE ,0 , -AGP_BASE , pa_config->system_aperture.agp_base >>24 ); +AGP_BASE ,ADDR_HI24 (pa_config->system_aperture.agp_base));if (pa_config->gart_config.page_table_start_addr != pa_config->gart_config.page_table_end_addr) { phys_config.page_table_start_addr = pa_config->gart_config.page_table_start_addr >>12 ;
drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c +6 -6
@@ -910,17 +910,17 @@ int hubbub31_init_dchub_sys_ctx(struct hubbub *hubbub,struct dcn_vmid_page_table_config phys_config;REG_SET (DCN_VM_FB_LOCATION_BASE ,0 , -FB_BASE , pa_config->system_aperture.fb_base >>24 ); +FB_BASE ,ADDR_HI24 (pa_config->system_aperture.fb_base));REG_SET (DCN_VM_FB_LOCATION_TOP ,0 , -FB_TOP , pa_config->system_aperture.fb_top >>24 ); +FB_TOP ,ADDR_HI24 (pa_config->system_aperture.fb_top));REG_SET (DCN_VM_FB_OFFSET ,0 , -FB_OFFSET , pa_config->system_aperture.fb_offset >>24 ); +FB_OFFSET ,ADDR_HI24 (pa_config->system_aperture.fb_offset));REG_SET (DCN_VM_AGP_BOT ,0 , -AGP_BOT , pa_config->system_aperture.agp_bot >>24 ); +AGP_BOT ,ADDR_HI24 (pa_config->system_aperture.agp_bot));REG_SET (DCN_VM_AGP_TOP ,0 , -AGP_TOP , pa_config->system_aperture.agp_top >>24 ); +AGP_TOP ,ADDR_HI24 (pa_config->system_aperture.agp_top));REG_SET (DCN_VM_AGP_BASE ,0 , -AGP_BASE , pa_config->system_aperture.agp_base >>24 ); +AGP_BASE ,ADDR_HI24 (pa_config->system_aperture.agp_base));if (pa_config->gart_config.page_table_start_addr != pa_config->gart_config.page_table_end_addr) { phys_config.page_table_start_addr = pa_config->gart_config.page_table_start_addr >>12 ;
drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c +2 -2
@@ -68,10 +68,10 @@ void hubp2_set_vm_system_aperture_settings(struct hubp *hubp, DCN_VM_SYSTEM_APERTURE_DEFAULT_ADDR_LSB, mc_vm_apt_default.low_part);REG_SET (DCN_VM_SYSTEM_APERTURE_LOW_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.quad_part); +MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.low_part);REG_SET (DCN_VM_SYSTEM_APERTURE_HIGH_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.quad_part); +MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.low_part); REG_SET_2(DCN_VM_MX_L1_TLB_CNTL, 0, ENABLE_L1_TLB, 1,
drivers/gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c +2 -2
@@ -238,10 +238,10 @@ static void hubp21_set_vm_system_aperture_settings(struct hubp *hubp, mc_vm_apt_high.quad_part = apt->sys_high.quad_part >>18 ;REG_SET (DCN_VM_SYSTEM_APERTURE_LOW_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.quad_part); +MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.low_part);REG_SET (DCN_VM_SYSTEM_APERTURE_HIGH_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.quad_part); +MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.low_part); REG_SET_2(DCN_VM_MX_L1_TLB_CNTL, 0, ENABLE_L1_TLB, 1,
drivers/gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c +2 -2
@@ -55,10 +55,10 @@ void hubp3_set_vm_system_aperture_settings(struct hubp *hubp, mc_vm_apt_high.quad_part = apt->sys_high.quad_part >>18 ;REG_SET (DCN_VM_SYSTEM_APERTURE_LOW_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.quad_part); +MC_VM_SYSTEM_APERTURE_LOW_ADDR , mc_vm_apt_low.low_part);REG_SET (DCN_VM_SYSTEM_APERTURE_HIGH_ADDR ,0 , -MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.quad_part); +MC_VM_SYSTEM_APERTURE_HIGH_ADDR , mc_vm_apt_high.low_part); REG_SET_2(DCN_VM_MX_L1_TLB_CNTL, 0, ENABLE_L1_TLB, 1,
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +16 -13
@@ -858,7 +858,7 @@ void dce110_edp_power_control(DC_LOG_HW_RESUME_S3 ("%s: remaining_min_edp_poweroff_time_ms=%llu: begin wait.\n" , __func__, remaining_min_edp_poweroff_time_ms); -msleep (remaining_min_edp_poweroff_time_ms); +msleep ((unsigned int )remaining_min_edp_poweroff_time_ms);DC_LOG_HW_RESUME_S3 ("%s: remaining_min_edp_poweroff_time_ms=%llu: end wait.\n" , __func__, remaining_min_edp_poweroff_time_ms);
@@ -883,7 +883,7 @@ void dce110_edp_power_control( cntl.coherent = false; cntl.lanes_number =LANE_COUNT_FOUR ; cntl.hpd_sel = link->link_enc->hpd_source; - pwrseq_instance = link->panel_cntl->pwrseq_inst; + pwrseq_instance = (uint8_t )link->panel_cntl->pwrseq_inst;if (ctx->dc->ctx->dmub_srv && ctx->dc->debug.dmub_command_table) {
@@ -952,7 +952,7 @@ void dce110_edp_wait_for_T12( t12_duration += link->panel_config.pps.extra_t12_ms;// Add extra T12 if (time_since_edp_poweroff_ms < t12_duration) -msleep (t12_duration - time_since_edp_poweroff_ms); +msleep ((unsigned int )(t12_duration - time_since_edp_poweroff_ms)); } }/*todo: cloned in stream enc, fix*/
@@ -1021,8 +1021,9 @@ void dce110_edp_backlight_control(*/ /* dc_service_sleep_in_milliseconds(50); */ /*edp 1.2*/ -if (link->panel_cntl) - pwrseq_instance = link->panel_cntl->pwrseq_inst; +if (link->panel_cntl) { + pwrseq_instance = (uint8_t )link->panel_cntl->pwrseq_inst; + }if (cntl.action ==TRANSMITTER_CONTROL_BACKLIGHT_ON ) {if (!link->dc->config.edp_no_power_sequencing)
@@ -1439,7 +1440,7 @@ void build_audio_output( audio_output->crtc_info.pixel_repetition =1 ; audio_output->crtc_info.interlaced = - stream->timing.flags.INTERLACE; + (stream->timing.flags.INTERLACE !=0 ); audio_output->crtc_info.refresh_rate = (stream->timing.pix_clk_100hz*100)/
@@ -1839,7 +1840,7 @@ static void power_down_all_hw_blocks(struct dc *dc)static void disable_vga_and_power_gate_all_controllers (struct dc *dc) { -int i; +uint8_t i;struct timing_generator *tg;struct dc_context *ctx = dc->ctx;
@@ -1869,7 +1870,7 @@ static void get_edp_streams(struct dc_state *context,struct dc_stream_state **edp_streams, int *edp_stream_num) { - int i; + uint8_t i; *edp_stream_num =0 ;for (i =0 ; i < context->stream_count; i++) {
@@ -2115,9 +2116,11 @@ static uint32_t compute_pstate_blackout_duration( const struct dc_stream_state *stream) {uint32_t total_dest_line_time_ns; +int64_t pstate_blackout_duration_ns64;uint32_t pstate_blackout_duration_ns; - pstate_blackout_duration_ns =1000 * blackout_duration.value >>24 ; + pstate_blackout_duration_ns64 = (1000 * blackout_duration.value) >>24 ; + pstate_blackout_duration_ns = (uint32_t )pstate_blackout_duration_ns64; total_dest_line_time_ns =1000000UL * (stream->timing.h_total * 10) /
@@ -2574,7 +2577,7 @@ enum dc_status dce110_apply_ctx_to_hw( } hws->funcs.enable_display_power_gating ( - dc, i, dc->ctx->dc_bios, + dc, (uint8_t )i, dc->ctx->dc_bios,PIPE_GATING_CONTROL_DISABLE ); }
@@ -2919,10 +2922,10 @@ static void dce110_init_hw(struct dc *dc) xfm->funcs->transform_reset (xfm); hws->funcs.enable_display_power_gating ( - dc, i, bp, + dc, (uint8_t )i, bp,PIPE_GATING_CONTROL_INIT ); hws->funcs.enable_display_power_gating ( - dc, i, bp, + dc, (uint8_t )i, bp,PIPE_GATING_CONTROL_DISABLE ); hws->funcs.enable_display_pipe_clock_gating( dc->ctx,
@@ -3180,7 +3183,7 @@ static void dce110_power_down_fe(struct dc *dc, struct dc_state *state, struct preturn ; hws->funcs.enable_display_power_gating ( - dc, fe_idx, dc->ctx->dc_bios,PIPE_GATING_CONTROL_ENABLE ); + dc, (uint8_t )fe_idx, dc->ctx->dc_bios,PIPE_GATING_CONTROL_ENABLE ); dc->res_pool->transforms[fe_idx]->funcs->transform_reset ( dc->res_pool->transforms[fe_idx]);
drivers/gpu/drm/amd/display/dc/hwss/dce120/dce120_hwseq.c +6 -6
@@ -208,24 +208,24 @@ static void dce120_update_dchub( FB_BASE, 0x0FFFF);REG_UPDATE (DCHUB_AGP_BASE , -AGP_BASE , dh_data->zfb_phys_addr_base >>22 ); +AGP_BASE , (uint32_t )(dh_data->zfb_phys_addr_base >>22 ));REG_UPDATE (DCHUB_AGP_BOT , -AGP_BOT , dh_data->zfb_mc_base_addr >>22 ); +AGP_BOT , (uint32_t )(dh_data->zfb_mc_base_addr >>22 ));REG_UPDATE (DCHUB_AGP_TOP , -AGP_TOP , (dh_data->zfb_mc_base_addr + dh_data->zfb_size_in_byte -1 ) >>22 ); +AGP_TOP , (uint32_t )((dh_data->zfb_mc_base_addr + dh_data->zfb_size_in_byte -1 ) >>22 ));break ;case FRAME_BUFFER_MODE_MIXED_ZFB_AND_LOCAL :/*Should not touch FB LOCATION (done by VBIOS on AsicInit table)*/ REG_UPDATE (DCHUB_AGP_BASE , -AGP_BASE , dh_data->zfb_phys_addr_base >>22 ); +AGP_BASE , (uint32_t )(dh_data->zfb_phys_addr_base >>22 ));REG_UPDATE (DCHUB_AGP_BOT , -AGP_BOT , dh_data->zfb_mc_base_addr >>22 ); +AGP_BOT , (uint32_t )(dh_data->zfb_mc_base_addr >>22 ));REG_UPDATE (DCHUB_AGP_TOP , -AGP_TOP , (dh_data->zfb_mc_base_addr + dh_data->zfb_size_in_byte -1 ) >>22 ); +AGP_TOP , (uint32_t )((dh_data->zfb_mc_base_addr + dh_data->zfb_size_in_byte -1 ) >>22 ));break ;case FRAME_BUFFER_MODE_LOCAL_ONLY :/*Should not touch FB LOCATION (done by VBIOS on AsicInit table)*/
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +6 -6
@@ -1574,7 +1574,7 @@ void dcn10_disable_plane(struct dc *dc, struct dc_state *state, struct pipe_ctxvoid dcn10_init_pipes (struct dc *dc,struct dc_state *context) { -int i; +uint8_t i;struct dce_hwseq *hws = dc->hwseq;struct hubbub *hubbub = dc->res_pool->hubbub;bool can_apply_seamless_boot = false;
@@ -1677,7 +1677,7 @@ void dcn10_init_pipes(struct dc *dc, struct dc_state *context) pipe_ctx->plane_res.hubp = hubp; pipe_ctx->plane_res.dpp = dpp; - pipe_ctx->plane_res.mpcc_inst = dpp->inst; + pipe_ctx->plane_res.mpcc_inst = (uint8_t )dpp->inst; hubp->mpcc_id = dpp->inst; hubp->opp_id =OPP_ID_INVALID ; hubp->power_gated = false;
@@ -2258,7 +2258,7 @@ void dcn10_cursor_lock(struct dc *dc, struct pipe_ctx *pipe, bool lock)struct dmub_hw_lock_inst_flags inst_flags = {0 }; hw_locks.bits.lock_cursor =1 ; - inst_flags.opp_inst = pipe->stream_res.opp->inst; + inst_flags.opp_inst = (uint8_t )pipe->stream_res.opp->inst; dmub_hw_lock_mgr_cmd(dc->ctx->dmub_srv, lock,
@@ -2383,7 +2383,7 @@ static uint8_t get_clock_divider(struct pipe_ctx *pipe, } clock_divider *= numpipes; -return clock_divider; +return (uint8_t )clock_divider; } static int dcn10_align_pixel_clocks(struct dc *dc, int group_size,
@@ -2458,7 +2458,7 @@ static int dcn10_align_pixel_clocks(struct dc *dc, int group_size, dc->res_pool->dp_clock_source->funcs->override_dp_pix_clk ( dc->res_pool->dp_clock_source, grouped_pipes[i]->stream_res.tg->inst, - phase[i], modulo[i]); + (unsigned int )phase[i], (unsigned int )modulo[i]); dc->res_pool->dp_clock_source->funcs->get_pixel_clk_frequency_100hz ( dc->res_pool->dp_clock_source, grouped_pipes[i]->stream_res.tg->inst, &pclk);
@@ -3516,7 +3516,7 @@ void dcn10_config_stereo_parameters( } } flags->RIGHT_EYE_POLARITY =\ - stream->timing.flags.RIGHT_EYE_3D_POLARITY; + (stream->timing.flags.RIGHT_EYE_3D_POLARITY !=0 );if (timing_3d_format ==TIMING_3D_FORMAT_HW_FRAME_PACKING ) flags->FRAME_PACKED =1 ; }
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +7 -6
@@ -235,7 +235,7 @@ void dcn20_setup_gsl_group_as_lock( group_idx =find_free_gsl_group (dc);ASSERT (group_idx !=0 ); - pipe_ctx->stream_res.gsl_group = group_idx; + pipe_ctx->stream_res.gsl_group = (uint8_t )group_idx;/* set gsl group reg field and mark resource used */ switch (group_idx) {
@@ -826,7 +826,7 @@ enum dc_status dcn20_enable_stream_timing(unsigned int event_triggers =0 ;int opp_cnt =1 ;int opp_inst[MAX_PIPES ] = {0 }; -bool interlace = stream->timing.flags.INTERLACE; +bool interlace = (stream->timing.flags.INTERLACE !=0 );int i;struct mpc_dwb_flow_control flow_control;struct mpc *mpc = dc->res_pool->mpc;
@@ -1452,7 +1452,7 @@ void dcn20_pipe_control_lock(struct dmub_hw_lock_inst_flags inst_flags = {0 }; hw_locks.bits.lock_pipe =1 ; - inst_flags.otg_inst = pipe->stream_res.tg->inst; + inst_flags.otg_inst = (uint8_t )pipe->stream_res.tg->inst;if (pipe->plane_state !=NULL ) hw_locks.bits.triple_buffer_lock = pipe->plane_state->triplebuffer_flips;
@@ -2733,7 +2733,8 @@ void dcn20_update_plane_addr(const struct dc *dc, struct pipe_ctx *pipe_ctx) addr_patched =patch_address_for_sbs_tb_stereo (pipe_ctx, &addr);// Call Helper to track VMID use -vm_helper_mark_vmid_used (dc->vm_helper, plane_state->address.vmid, pipe_ctx->plane_res.hubp->inst); +vm_helper_mark_vmid_used (dc->vm_helper, plane_state->address.vmid, + (uint8_t )pipe_ctx->plane_res.hubp->inst); pipe_ctx->plane_res.hubp->funcs->hubp_program_surface_flip_and_addr( pipe_ctx->plane_res.hubp,
@@ -3126,7 +3127,7 @@ void dcn20_program_dmdata_engine(struct pipe_ctx *pipe_ctx)void dcn20_fpga_init_hw (struct dc *dc) { -int i, j; +uint8_t i, j;struct dce_hwseq *hws = dc->hwseq;struct resource_pool *res_pool = dc->res_pool;struct dc_state *context = dc->current_state;
@@ -3199,7 +3200,7 @@ void dcn20_fpga_init_hw(struct dc *dc) pipe_ctx->plane_res.hubp = hubp; pipe_ctx->plane_res.dpp = dpp; - pipe_ctx->plane_res.mpcc_inst = dpp->inst; + pipe_ctx->plane_res.mpcc_inst = (uint8_t )dpp->inst; hubp->mpcc_id = dpp->inst; hubp->opp_id =OPP_ID_INVALID ; hubp->power_gated = false;
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c +4 -4
@@ -146,10 +146,10 @@ bool dcn21_dmub_abm_set_pipe(struct abm *abm, uint32_t otg_inst,memset (&cmd,0 ,sizeof (cmd)); cmd.abm_set_pipe.header.type =DMUB_CMD__ABM ; cmd.abm_set_pipe.header.sub_type =DMUB_CMD__ABM_SET_PIPE ; - cmd.abm_set_pipe.abm_set_pipe_data.otg_inst = otg_inst; - cmd.abm_set_pipe.abm_set_pipe_data.pwrseq_inst = pwrseq_inst; - cmd.abm_set_pipe.abm_set_pipe_data.set_pipe_option = option; - cmd.abm_set_pipe.abm_set_pipe_data.panel_inst = panel_inst; + cmd.abm_set_pipe.abm_set_pipe_data.otg_inst = (uint8_t )otg_inst; + cmd.abm_set_pipe.abm_set_pipe_data.pwrseq_inst = (uint8_t )pwrseq_inst; + cmd.abm_set_pipe.abm_set_pipe_data.set_pipe_option = (uint8_t )option; + cmd.abm_set_pipe.abm_set_pipe_data.panel_inst = (uint8_t )panel_inst; cmd.abm_set_pipe.abm_set_pipe_data.ramping_boundary = ramping_boundary; cmd.abm_set_pipe.header.payload_bytes =sizeof (struct dmub_cmd_abm_set_pipe_data );
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c +8 -8
@@ -978,7 +978,7 @@ bool dcn30_apply_idle_power_optimizations(struct dc *dc, bool enable) cursor_cache_enable ? &cursor_attr : NULL)) {unsigned int v_total = stream->adjust.v_total_max ? stream->adjust.v_total_max : stream->timing.v_total; - unsigned int refresh_hz = div_u64((unsigned long long) stream->timing.pix_clk_100hz * + unsigned int refresh_hz = (unsigned int)div_u64((unsigned long long)stream->timing.pix_clk_100hz *
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +11 -7
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c +4 -33
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/hwss/link_hwss_hpo_dp.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_detection.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_factory.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_ddc.c +2 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c +11 -12
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training_8b_10b.c +5 -5
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +19 -19
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/mmhubbub/dcn20/dcn20_mmhubbub.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dce110/dce110_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn10/dcn10_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c +12 -12
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn30/dcn30_resource.c +7 -7
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn301/dcn301_resource.c +4 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn302/dcn302_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn303/dcn303_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn314/dcn314_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +10 -10
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn321/dcn321_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn35/dcn35_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn36/dcn36_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c +14 -14
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn42/dcn42_soc_and_ip_translator.c +7 -7
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.43.0
Part of the diff is not shown here. View the raw message.
PATCH 8/19 drm/amd/display: Introduce power module on Linux
In reply to Chenyu ChenFrom: Ray Wu <[email protected]>
[Why]
Other OS supported by DC uses the power module to manage panel power features such as backlight and self-refresh. It contains enhancements on top what amdgpu_dm is doing today that can benefit power.
[How]
Introduce the power module. It's currently not being used anywhere, a future change will incorporate it into amdgpu_dm.
--- .../display/amdgpu_dm/amdgpu_dm_services.c | 11 + .../gpu/drm/amd/display/dc/core/dc_stream.c | 6 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 + .../drm/amd/display/modules/inc/mod_power.h | 415 +++ .../drm/amd/display/modules/power/Makefile | 2 +- .../gpu/drm/amd/display/modules/power/power.c | 3030 +++++++++++++++++ 6 files changed, 3466 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_power.h create mode 100644 drivers/gpu/drm/amd/display/modules/power/power.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +11 -0
@@ -62,3 +62,14 @@ void dm_trace_smu_exit(bool success, uint32_t response, struct dc_context *ctx) }/**** power component interfaces ****/ + +bool dm_query_extended_brightness_caps (struct dc_context *ctx, +enum dm_acpi_display_type display, +struct dm_acpi_atif_backlight_caps *pCaps) +{ +/* +* TODO: Implement query for extended backlight caps. +* Some plumbing required, see amdgpu_atif_query_backlight_caps() +*/ +return false; +}
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +6 -0
@@ -259,6 +259,12 @@ const struct dc_stream_status *dc_stream_get_status_const(return dc_state_get_stream_status (dc->current_state, stream); } +struct dc_link *dc_stream_get_link ( +const struct dc_stream_state *stream) +{ +return stream->link; +} +void program_cursor_attributes (struct dc *dc,struct dc_stream_state *stream)
drivers/gpu/drm/amd/display/dc/dc_stream.h +3 -0
@@ -494,6 +494,9 @@ struct surface_update_descriptor dc_check_update_surfaces_for_stream(int surface_count, struct dc_stream_update *stream_update); +struct dc_link *dc_stream_get_link ( +const struct dc_stream_state *dc_stream); +/** * Create a new default stream for the requested sink */
drivers/gpu/drm/amd/display/modules/inc/mod_power.h new file +415 -0
415 lines not on this page · raw message
drivers/gpu/drm/amd/display/modules/power/Makefile +1 -1
@@ -23,7 +23,7 @@ # Makefile for the 'power' sub-module of DAL. # -MOD_POWER = power_helpers.o +MOD_POWER = power_helpers.o power.o AMD_DAL_MOD_POWER = $(addprefix $(AMDDALPATH)/modules/power/,$(MOD_POWER)) #$(info ************ DAL POWER MODULE MAKEFILE ************)
drivers/gpu/drm/amd/display/modules/power/power.c new file +3030 -0
2,542 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.43.0
Part of the diff is not shown here. View the raw message.
PATCH 9/19 drm/amd/display: Add power module on Linux
In reply to Chenyu ChenFrom: Ray Wu <[email protected]>
[Why & How]
Refactors dm to utilize the power module for managing replay, PSR, and backlight control functionalities.
Key changes:
- Introduced replay / PSR events to enable / disable replay / PSR.
- Implemented replay rate control and power option
- Refactored backlight control by using the power module.
- Enhanced handling of VRR within replay and PSR logic.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 344 ++++++++++++++---- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 36 +- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 74 +--- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 5 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 60 ++- .../drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 26 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 242 ++++-------- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 13 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 143 ++++---- .../amd/display/amdgpu_dm/amdgpu_dm_replay.h | 28 +- .../display/amdgpu_dm/amdgpu_dm_services.c | 30 +- 12 files changed, 566 insertions(+), 445 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +275 -69
@@ -104,6 +104,7 @@#include "ivsrcid/dcn/irqsrcs_dcn_1_0.h" #include "modules/inc/mod_freesync.h" +#include "modules/inc/mod_power.h" #include "modules/power/power_helpers.h" static_assert (AMDGPU_DMUB_NOTIFICATION_MAX ==DMUB_NOTIFICATION_MAX ,"AMDGPU_DMUB_NOTIFICATION_MAX mismatch" );
@@ -1878,6 +1879,70 @@ static enum dmub_ips_disable_type dm_get_default_ips_mode(return ret; } +static int amdgpu_dm_init_power_module (struct amdgpu_display_manager *dm) +{ +struct mod_power_init_params init_data[MAX_NUM_EDP ]; + +if (dm->num_of_edps ==0 ) { +drm_dbg_driver ( + dm->ddev, +"amdgpu: No eDP detected, skip initializing power module\n" ); +return 0 ; + } + +/* Initialize all the power module parameters */ +for (int i =0 ; i < dm->num_of_edps; i++) { + init_data[i].allow_psr_smu_optimizations = + !!(amdgpu_dc_feature_mask &DC_PSR_ALLOW_SMU_OPT ); + init_data[i].allow_psr_multi_disp_optimizations = + !!(amdgpu_dc_feature_mask &DC_PSR_ALLOW_MULTI_DISP_OPT ); +/* See dm_late_init */ + init_data[i].backlight_ramping_override = false; + init_data[i].backlight_ramping_start =0xCCCC ; + init_data[i].backlight_ramping_reduction =0xCCCCCCCC ; + init_data[i].def_varibright_level =0 ; + init_data[i].abm_config_setting =0 ; + init_data[i].num_backlight_levels =101 ; + init_data[i].use_nits_based_brightness = false; + init_data[i].panel_max_millinits =0 ; + init_data[i].panel_min_millinits =0 ; + init_data[i].disable_fractional_pwm = + !(amdgpu_dc_feature_mask &DC_DISABLE_FRACTIONAL_PWM_MASK ); + init_data[i].use_custom_backlight_caps = false; + init_data[i].custom_backlight_caps_config_no =0 ; + init_data[i].use_linear_backlight_curve = false; + init_data[i].def_varibright_enable =0 ; + init_data[i].varibright_level =0 ; +/* +* Power module uses 16-bit backlight levels (0xFFFF max) rather +* than 8-bit(0XFF max) +*/ + init_data[i].min_backlight_pwm = + dm->backlight_caps[i].min_input_signal *0x101 ; + init_data[i].max_backlight_pwm = + dm->backlight_caps[i].max_input_signal *0x101 ; + init_data[i].min_abm_backlight = + dm->backlight_caps[i].min_input_signal *0x101 ; + +/* Min backlight level after ABM reduction, Don't allow below 1% +* 0xFFFF x 0.01 = 0x28F +*/ + init_data[i].min_abm_backlight = (init_data[i].min_abm_backlight <0x28F ) ? +0x28F : init_data[i].min_abm_backlight; + } + + dm->power_module =mod_power_create (dm->dc, init_data, dm->num_of_edps); +if (!dm->power_module) { +drm_err (dm->ddev,"amdgpu: Error allocating memory for power module\n" ); +return -ENOMEM ; + } + +mod_power_hw_init (dm->power_module); +drm_dbg_driver (dm->ddev,"amdgpu: Power module init done\n" ); + +return 0 ; +} +static int amdgpu_dm_init (struct amdgpu_device *adev) {struct dc_init_data init_data;
@@ -1895,6 +1960,8 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)mutex_init (&adev->dm.dc_lock);mutex_init (&adev->dm.audio_lock); +spin_lock_init (&adev->dm.dmub_lock); +if (amdgpu_dm_irq_init (adev)) {drm_err (adev_to_drm (adev),"failed to initialize DM IRQ support.\n" ); goto error;
@@ -2191,6 +2258,9 @@ static int amdgpu_dm_init(struct amdgpu_device *adev) goto error; } +if (amdgpu_dm_init_power_module (&adev->dm)) + goto error; +/* create fake encoders for MST */ dm_dp_create_fake_mst_encoders (adev);
@@ -2332,6 +2402,10 @@ static void amdgpu_dm_fini(struct amdgpu_device *adev) adev->dm.freesync_module =NULL ; } +if (adev->dm.power_module) { +mod_power_destroy (adev->dm.power_module); + adev->dm.power_module =NULL ; + }mutex_destroy (&adev->dm.audio_lock);mutex_destroy (&adev->dm.dc_lock);mutex_destroy (&adev->dm.dpia_aux_lock);
@@ -5051,8 +5125,8 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev)#define AMDGPU_DM_MIN_SPREAD ((AMDGPU_DM_DEFAULT_MAX_BACKLIGHT - AMDGPU_DM_DEFAULT_MIN_BACKLIGHT) / 2)#define AUX_BL_DEFAULT_TRANSITION_TIME_MS 50 -static void amdgpu_dm_update_backlight_caps (struct amdgpu_display_manager *dm, -int bl_idx) +void amdgpu_dm_update_backlight_caps (struct amdgpu_display_manager *dm, +int bl_idx) {struct amdgpu_dm_backlight_caps *caps = &dm->backlight_caps[bl_idx];
@@ -5214,15 +5288,34 @@ static u32 convert_brightness_to_user(const struct amdgpu_dm_backlight_caps *cap max - min); } +static struct dc_stream_state *dm_find_stream_with_link ( +struct amdgpu_display_manager *dm, +struct dc_link *link) +{ +struct dc_state *cur_dc_state = dm->dc->current_state; +struct dc_stream_state *stream =NULL ; +int i; + +for (i =0 ; i < cur_dc_state->stream_count; i++) { + stream = cur_dc_state->streams[i]; +if (stream->link == link) +return stream; + } + +return NULL ; +} +static void amdgpu_dm_backlight_set_level (struct amdgpu_display_manager *dm,int bl_idx,u32 user_brightness) {struct amdgpu_dm_backlight_caps *caps;struct dc_link *link; -u32 brightness; -bool rc, reallow_idle = false; +u32 brightness =0 ; +bool rc = false, reallow_idle = false;struct drm_connector *connector; +struct dc_stream_state *stream; +unsigned int min, max;list_for_each_entry (connector, &dm->ddev->mode_config.connector_list, head) {struct amdgpu_dm_connector *aconnector =to_amdgpu_dm_connector (connector);
@@ -5252,13 +5345,6 @@ static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm,if (caps->brightness_mask) brightness |= caps->brightness_mask; -/* Change brightness based on AUX property */ -mutex_lock (&dm->dc_lock); -if (dm->dc->caps.ips_support && dm->dc->ctx->dmub_srv->idle_allowed) { -dc_allow_idle_optimizations (dm->dc, false); - reallow_idle = true; - } -if (trace_amdgpu_dm_brightness_enabled ()) { trace_amdgpu_dm_brightness(__builtin_return_address(0), user_brightness,
@@ -5267,22 +5353,45 @@ static void amdgpu_dm_backlight_set_level(struct amdgpu_display_manager *dm, power_supply_is_system_supplied() > 0); } -if (caps->aux_support) { - rc =dc_link_set_backlight_level_nits (link, true, brightness, -AUX_BL_DEFAULT_TRANSITION_TIME_MS ); -if (!rc) -DRM_DEBUG ("DM: Failed to update backlight via AUX on eDP[%d]\n" , bl_idx); - }else { -struct set_backlight_level_params backlight_level_params = {0 }; + stream =dm_find_stream_with_link (dm, link); +if (!stream) +return ; - backlight_level_params.backlight_pwm_u16_16 = brightness; - backlight_level_params.transition_time_in_ms =0 ; +mutex_lock (&dm->dc_lock); +if (dm->dc->caps.ips_support && dm->dc->ctx->dmub_srv->idle_allowed) { +dc_allow_idle_optimizations (dm->dc, false); + reallow_idle = true; + } - rc =dc_link_set_backlight_level (link, &backlight_level_params); -if (!rc) -DRM_DEBUG ("DM: Failed to update backlight on eDP[%d]\n" , bl_idx); +if (caps->aux_support) { + rc =mod_power_set_backlight_nits (dm->power_module, stream, brightness, +AUX_BL_DEFAULT_TRANSITION_TIME_MS , false, true); + }else { +/* power module uses millipercent */ +get_brightness_range (caps, &min, &max); + brightness =DIV_ROUND_CLOSEST (brightness *100 , (max - min)) *1000 ; + rc =mod_power_set_backlight_percent (dm->power_module, stream, + brightness,0 , false); } +/* +* Some kms clients create a ramped backlight transition effect +* by rapidly changing the backlight. Yet we must wait on dmcub +* fw to exit psr/replay before programming backlight. To +* prevent lag, keep disable psr/replay and let the next atomic +* flip clear the event. +* +* ToDo: use ISM to handle rapidly backlight change +* +* Rapidly backlight change is similar to rapidly cursor events, +* which is now handled by ISM. ISM can delay the event until system +* is really idle, so we may use ISM to handle backlight change as well. +*/ +amdgpu_dm_psr_set_event (dm, stream, true, + psr_event_hw_programming, true); +amdgpu_dm_replay_set_event (dm, stream, true, + replay_event_hw_programming, true); +if (dm->dc->caps.ips_support && reallow_idle)dc_allow_idle_optimizations (dm->dc, true);
@@ -5500,6 +5609,8 @@ static void setup_backlight_device(struct amdgpu_display_manager *dm,static void amdgpu_set_panel_orientation (struct drm_connector *connector); + +/* * In this architecture, the association * connector -> encoder -> crtc
@@ -5741,7 +5852,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) psr_feature_enabled = false;if (psr_feature_enabled) { -amdgpu_dm_set_psr_caps (link); +amdgpu_dm_set_psr_caps (link, aconnector); drm_info(adev_to_drm(adev), "%s: PSR support %d, DC PSR ver %d, sink PSR ver %d DPCD caps 0x%x su_y_granularity %d\n", aconnector->base.name, link->psr_settings.psr_feature_enabled,
@@ -9793,7 +9904,8 @@ static void update_stream_irq_parameters(spin_unlock_irqrestore (&adev_to_drm (adev)->event_lock, flags); } -static void amdgpu_dm_handle_vrr_transition (struct dm_crtc_state *old_state, +static void amdgpu_dm_handle_vrr_transition (struct amdgpu_display_manager *dm, +struct dm_crtc_state *old_state,struct dm_crtc_state *new_state) {bool old_vrr_active =amdgpu_dm_crtc_vrr_active (old_state);
@@ -9812,6 +9924,13 @@ static void amdgpu_dm_handle_vrr_transition(struct dm_crtc_state *old_state,WARN_ON (drm_crtc_vblank_get (new_state->base.crtc) !=0 );drm_dbg_driver (new_state->base.crtc->dev,"%s: crtc=%u VRR off->on: Get vblank ref\n" , __func__, new_state->base.crtc->base.id); + + scoped_guard(mutex, &dm->dc_lock) { +amdgpu_dm_psr_set_event (dm, new_state->stream, true, + psr_event_vrr_transition, true); +amdgpu_dm_replay_set_event (dm, new_state->stream, true, + replay_event_vrr, true); + } }else if (old_vrr_active && !new_vrr_active) {/* Transition VRR active -> inactive: * Allow vblank irq disable again for fixed refresh rate.
@@ -9820,6 +9939,13 @@ static void amdgpu_dm_handle_vrr_transition(struct dm_crtc_state *old_state,drm_crtc_vblank_put (new_state->base.crtc);drm_dbg_driver (new_state->base.crtc->dev,"%s: crtc=%u VRR on->off: Drop vblank ref\n" , __func__, new_state->base.crtc->base.id); + + scoped_guard(mutex, &dm->dc_lock) { +amdgpu_dm_psr_set_event (dm, new_state->stream, false, + psr_event_vrr_transition, false); +amdgpu_dm_replay_set_event (dm, new_state->stream, false, + replay_event_vrr, false); + } } }
@@ -9917,7 +10043,8 @@ static void amdgpu_dm_update_cursor(struct drm_plane *plane, } } -static void amdgpu_dm_enable_self_refresh (struct amdgpu_crtc *acrtc_attach, +static void amdgpu_dm_enable_self_refresh (struct amdgpu_display_manager *dm, +struct amdgpu_crtc *acrtc_attach,const struct dm_crtc_state *acrtc_state,const u64 current_ts) {
@@ -9925,20 +10052,10 @@ static void amdgpu_dm_enable_self_refresh(struct amdgpu_crtc *acrtc_attach,struct replay_settings *pr = &acrtc_state->stream->link->replay_settings;struct amdgpu_dm_connector *aconn = (struct amdgpu_dm_connector *)acrtc_state->stream->dm_stream_context; -bool vrr_active =amdgpu_dm_crtc_vrr_active (acrtc_state); - -if (acrtc_state->update_type >UPDATE_TYPE_FAST ) { -if (pr->config.replay_supported && !pr->replay_feature_enabled) -amdgpu_dm_link_setup_replay (acrtc_state->stream->link, aconn); -else if (psr->psr_version !=DC_PSR_VERSION_UNSUPPORTED && - !psr->psr_feature_enabled) -if (!aconn->disallow_edp_enter_psr) -amdgpu_dm_link_setup_psr (acrtc_state->stream); - }/* Decrement skip count when SR is enabled and we're doing fast updates. */ if (acrtc_state->update_type ==UPDATE_TYPE_FAST && - (psr->psr_feature_enabled || pr->config.replay_supported)) { + (psr->psr_feature_enabled || pr->replay_feature_enabled)) {if (aconn->sr_skip_count >0 ) aconn->sr_skip_count--;
@@ -9953,17 +10070,15 @@ static void amdgpu_dm_enable_self_refresh(struct amdgpu_crtc *acrtc_attach,* of update events. * See `amdgpu_dm_crtc_vblank_control_worker()`. */ - if (!vrr_active && - acrtc_attach->dm_irq_params.allow_sr_entry && -#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY - !amdgpu_dm_crc_window_is_activated(acrtc_state->base.crtc) && -#endif - (current_ts - psr->psr_dirty_rects_change_timestamp_ns) > 500000000) { -if (pr->replay_feature_enabled && !pr->replay_allow_active) -amdgpu_dm_replay_enable (acrtc_state->stream, true); -if (psr->psr_version ==DC_PSR_VERSION_SU_1 && - !psr->psr_allow_active && !aconn->disallow_edp_enter_psr) -amdgpu_dm_psr_enable (acrtc_state->stream); +if (acrtc_attach->dm_irq_params.allow_sr_entry && + (current_ts - psr->psr_dirty_rects_change_timestamp_ns) >500000000 ) { +amdgpu_dm_psr_set_event (dm, acrtc_state->stream, false, + psr_event_hw_programming, false); + +amdgpu_dm_replay_set_event (dm, acrtc_state->stream, true, + replay_event_general_ui, true); +amdgpu_dm_replay_set_event (dm, acrtc_state->stream, false, + replay_event_hw_programming, false); } }else { acrtc_attach->dm_irq_params.allow_sr_entry = false;
@@ -10125,15 +10240,12 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,*/ if (acrtc_state->stream->link->psr_settings.psr_version >=DC_PSR_VERSION_SU_1 && acrtc_attach->dm_irq_params.allow_sr_entry && -#ifdef CONFIG_DRM_AMD_SECURE_DISPLAY - !amdgpu_dm_crc_window_is_activated (acrtc_state->base.crtc) && -#endif dirty_rects_changed) {mutex_lock (&dm->dc_lock); acrtc_state->stream->link->psr_settings.psr_dirty_rects_change_timestamp_ns = timestamp_ns; -if (acrtc_state->stream->link->psr_settings.psr_allow_active) -amdgpu_dm_psr_disable (acrtc_state->stream, true); +amdgpu_dm_psr_set_event (dm, acrtc_state->stream, true, + psr_event_hw_programming, true);mutex_unlock (&dm->dc_lock); } }
@@ -10298,15 +10410,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,if (acrtc_state->abm_level != dm_old_crtc_state->abm_level) bundle->stream_update.abm_level = &acrtc_state->abm_level; -mutex_lock (&dm->dc_lock); -if ((acrtc_state->update_type >UPDATE_TYPE_FAST ) || vrr_active) { -if (acrtc_state->stream->link->replay_settings.replay_allow_active) -amdgpu_dm_replay_disable (acrtc_state->stream); -if (acrtc_state->stream->link->psr_settings.psr_allow_active) -amdgpu_dm_psr_disable (acrtc_state->stream, true); - } -mutex_unlock (&dm->dc_lock); -/* * If FreeSync state on the stream has changed then we need to * re-adjust the min/max bounds now that DC doesn't handle this
@@ -10344,8 +10447,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,if (dm_old_crtc_state->active_planes != acrtc_state->active_planes)dm_update_pflip_irq_state (drm_to_adev (dev), acrtc_attach); - -amdgpu_dm_enable_self_refresh (acrtc_attach, acrtc_state, timestamp_ns); +amdgpu_dm_enable_self_refresh (dm, acrtc_attach, acrtc_state, + timestamp_ns);mutex_unlock (&dm->dc_lock); }
@@ -10464,6 +10567,102 @@ static void dm_clear_writeback(struct amdgpu_display_manager *dm,dc_stream_remove_writeback (dm->dc, crtc_state->stream,0 ); } +/** +* amdgpu_dm_mod_power_update_streams - update mod_power stream state on modeset +* @state: the drm atomic state +* @dm: the display manager to update mod_power on +* +* Notify mod_power of stream changes on modeset events, and disable PSR/Replay +* in preparation for hardware programming. See also +* amdgpu_dm_mod_power_setup_streams() for post-modeset mod_power setup. +*/ +static void amdgpu_dm_mod_power_update_streams (struct drm_atomic_state *state, +struct amdgpu_display_manager *dm) +{ +struct dm_crtc_state *dm_old_crtc_state, *dm_new_crtc_state; +struct drm_crtc_state *old_crtc_state, *new_crtc_state; +struct amdgpu_dm_connector *aconnector; +struct drm_crtc *crtc; +int i =0 ; + +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) { + dm_old_crtc_state =to_dm_crtc_state (old_crtc_state); + dm_new_crtc_state =to_dm_crtc_state (new_crtc_state); + +if (!drm_atomic_crtc_needs_modeset (new_crtc_state)) +continue ; + +/* +* Update mod_power on modeset event in preparation for hw +* programming. Always use the old stream, since it would have +* been previously added to mod_power. If old stream is null (on +* crtc enable, for example), mod_power will no-op, which is the +* desried behavior. +*/ +if (old_crtc_state->active) { + scoped_guard(mutex, &dm->dc_lock) { +amdgpu_dm_psr_set_event (dm, dm_old_crtc_state->stream, true, + psr_event_hw_programming, true); +amdgpu_dm_replay_set_event (dm, dm_old_crtc_state->stream, true, + replay_event_hw_programming, true); + } + } + +if (new_crtc_state->active) { + aconnector = (struct amdgpu_dm_connector *) + dm_new_crtc_state->stream->dm_stream_context; +if (old_crtc_state->active) { +mod_power_replace_stream (dm->power_module, + dm_old_crtc_state->stream, + dm_new_crtc_state->stream, + &aconnector->psr_caps); + }else { +mod_power_add_stream (dm->power_module, + dm_new_crtc_state->stream, + &aconnector->psr_caps); + } + }else if (old_crtc_state->active) { +mod_power_remove_stream (dm->power_module, + dm_old_crtc_state->stream); + } + } +} + +/** +* amdgpu_dm_mod_power_setup_streams - setup mod_power stream state post modeset +* @state: the drm atomic state +* @dm: the display manager to update mod_power on +* +* Notify mod_power of mode_change. This needs to be done after dc_stream +* updates have been committed, and VRR parameters have been updated. +*/ +static void amdgpu_dm_mod_power_setup_streams (struct drm_atomic_state *state, +struct amdgpu_display_manager *dm) +{ +struct dm_crtc_state *dm_new_crtc_state; +struct drm_crtc_state *new_crtc_state; +struct amdgpu_crtc *acrtc; +struct drm_crtc *crtc; +int i =0 ; + +for_each_new_crtc_in_state (state, crtc, new_crtc_state, i) { + dm_new_crtc_state =to_dm_crtc_state (new_crtc_state); + acrtc =to_amdgpu_crtc (crtc); + +if (!drm_atomic_crtc_needs_modeset (new_crtc_state)) +continue ; + +if (new_crtc_state->active) { +amdgpu_dm_link_setup_replay (dm_new_crtc_state->stream, + &acrtc->dm_irq_params.vrr_params); +mod_power_notify_mode_change (dm->power_module, + dm_new_crtc_state->stream, + false); + } + } + +} +static void amdgpu_dm_commit_streams (struct drm_atomic_state *state,struct dc_state *dc_state) {
@@ -10507,6 +10706,8 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, acrtc->wb_enabled = false; } +amdgpu_dm_mod_power_update_streams (state, dm); +for_each_oldnew_crtc_in_state (state, crtc, old_crtc_state, new_crtc_state, i) {struct amdgpu_crtc *acrtc =to_amdgpu_crtc (crtc);
@@ -10611,13 +10812,10 @@ static void amdgpu_dm_commit_streams(struct drm_atomic_state *state, } }/* for_each_crtc_in_state() */ -/* if there mode set or reset, disable eDP PSR, Replay */ +/* if there mode set or reset, flush vblank work queue */ if (mode_set_reset_required) {if (dm->vblank_control_workqueue)flush_workqueue (dm->vblank_control_workqueue); - -amdgpu_dm_replay_disable_all (dm); -amdgpu_dm_psr_disable_all (dm); }dm_enable_per_frame_crtc_master_sync (dc_state);
@@ -11090,7 +11288,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)manage_dm_interrupts (adev, acrtc, dm_new_crtc_state); }/* Handle vrr on->off / off->on transitions */ -amdgpu_dm_handle_vrr_transition (dm_old_crtc_state, dm_new_crtc_state); +amdgpu_dm_handle_vrr_transition (dm, dm_old_crtc_state, dm_new_crtc_state);#ifdef CONFIG_DEBUG_FS if (new_crtc_state->active &&
@@ -11128,6 +11326,8 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)#endif } +amdgpu_dm_mod_power_setup_streams (state, dm); +for_each_new_crtc_in_state (state, crtc, new_crtc_state, j)if (new_crtc_state->async_flip) wait_for_vblank = false;
@@ -13686,11 +13886,17 @@ int amdgpu_dm_process_dmub_set_config_sync(bool dm_execute_dmub_cmd (const struct dc_context *ctx,union dmub_rb_cmd *cmd,enum dm_dmub_wait_type wait_type) { +struct amdgpu_device *adev = ctx->driver_context; + +guard (spinlock_irqsave)(&adev->dm.dmub_lock);return dc_dmub_srv_cmd_run (ctx->dmub_srv, cmd, wait_type); }bool dm_execute_dmub_cmd_list (const struct dc_context *ctx,unsigned int count,union dmub_rb_cmd *cmd,enum dm_dmub_wait_type wait_type) { +struct amdgpu_device *adev = ctx->driver_context; + +guard (spinlock_irqsave)(&adev->dm.dmub_lock);return dc_dmub_srv_cmd_run_list (ctx->dmub_srv, count, cmd, wait_type); }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +10 -0
@@ -463,6 +463,13 @@ struct amdgpu_display_manager {*/ struct mutex dc_lock; +/** +* @dmub_lock: +* +* Guards access to DMUB command submission. +*/ +spinlock_t dmub_lock; +/** * @audio_lock: *
@@ -568,6 +575,7 @@ struct amdgpu_display_manager {struct amdgpu_dm_backlight_caps backlight_caps[AMDGPU_DM_MAX_NUM_EDP ];struct mod_freesync *freesync_module; +struct mod_power *power_module;struct hdcp_workqueue *hdcp_workqueue;/**
@@ -835,6 +843,7 @@ struct amdgpu_dm_connector {bool force_yuv420_output;bool force_yuv422_output;struct dsc_preferred_settings dsc_settings; +struct psr_caps psr_caps;union dp_downstream_port_present mst_downstream_port_present;/* Cached display modes */ struct drm_display_mode freesync_vid_base;
@@ -1149,4 +1158,5 @@ int amdgpu_dm_initialize_hdmi_connector(struct amdgpu_dm_connector *aconnector);void retrieve_dmi_info (struct amdgpu_display_manager *dm); +void amdgpu_dm_update_backlight_caps (struct amdgpu_display_manager *dm,int bl_idx);#endif /* __AMDGPU_DM_H__ */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c +19 -17
@@ -503,7 +503,6 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc, {struct amdgpu_device *adev =drm_to_adev (crtc->dev);struct dc_stream_state *stream_state = dm_crtc_state->stream; -struct amdgpu_dm_connector *aconnector =NULL ;bool enable =amdgpu_dm_is_valid_crc_source (source);int ret =0 ;enum crc_poly_mode crc_poly_mode =CRC_POLY_MODE_16 ;
@@ -512,21 +511,17 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc,if (!stream_state)return -EINVAL ; -/* Get connector from stream */ - aconnector = (struct amdgpu_dm_connector *)stream_state->dm_stream_context; -mutex_lock (&adev->dm.dc_lock); - +/* Notify power module about CRC window active to disable PSR/Replay +* Power module will check caps internally and skip if not supported +*/ if (enable) { -/* For PSR1, check that the panel has exited PSR */ -if (stream_state->link->psr_settings.psr_version <DC_PSR_VERSION_SU_1 ) -amdgpu_dm_psr_wait_disable (stream_state); +amdgpu_dm_psr_set_event (&adev->dm, stream_state, true, + psr_event_crc_window_active, true); -/* Set flag to disallow enter replay when CRC source is enabled */ -if (aconnector) - aconnector->disallow_edp_enter_replay = true; -amdgpu_dm_replay_disable (stream_state); +amdgpu_dm_replay_set_event (&adev->dm, stream_state, true, + replay_event_crc_window_active, true); }/* CRC polynomial selection only support for DCN3.6+ except DCN4.0.1 */
@@ -559,11 +554,15 @@ int amdgpu_dm_crtc_configure_crc_source(struct drm_crtc *crtc, }if (!enable) { -/* Clear flag to allow enter replay when CRC source is disabled */ -if (aconnector) - aconnector->disallow_edp_enter_replay = false; - } +/* Notify power module about CRC window inactive to re-enable PSR/Replay +* Power module will check caps internally and skip if not supported +*/ +amdgpu_dm_psr_set_event (&adev->dm, stream_state, false, + psr_event_crc_window_active, false); +amdgpu_dm_replay_set_event (&adev->dm, stream_state, false, + replay_event_crc_window_active, false); + } unlock:mutex_unlock (&adev->dm.dc_lock);
@@ -760,10 +759,13 @@ void amdgpu_dm_crtc_handle_crc_irq(struct drm_crtc *crtc)uint32_t crcs[3 ];unsigned long flags; -if (crtc ==NULL ) +if (!crtc || !crtc->state || !crtc->dev)return ; crtc_state =to_dm_crtc_state (crtc->state); +if (!crtc_state->stream) +return ; + stream_state = crtc_state->stream; acrtc =to_amdgpu_crtc (crtc); drm_dev = crtc->dev;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c +20 -54
94 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h +2 -3
@@ -27,11 +27,10 @@#ifndef __AMDGPU_DM_CRTC_H__#define __AMDGPU_DM_CRTC_H__ -void amdgpu_dm_crtc_set_panel_sr_feature ( +void amdgpu_dm_crtc_set_static_screen_optimze (struct amdgpu_display_manager *dm, -struct amdgpu_crtc *acrtc,struct dc_stream_state *stream, -bool vblank_enabled,bool allow_sr_entry); +bool sso_enable,bool allow_sr_entry);void amdgpu_dm_crtc_handle_vblank (struct amdgpu_crtc *acrtc);
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +50 -10
112 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c +9 -17
@@ -292,24 +292,16 @@ static void dm_ism_commit_idle_optimization_state(struct amdgpu_dm_ism *ism,*/ if (stream && stream->link) {/* -* If allow_panel_sso is true when disabling vblank, allow -* deeper panel sleep states such as PSR1 and Replay static -* screen optimization. -*/ -if (!vblank_enabled && allow_panel_sso) { -amdgpu_dm_crtc_set_panel_sr_feature ( - dm, acrtc, stream, false, - acrtc->dm_irq_params.allow_sr_entry); - }else if (vblank_enabled) { -/* Make sure to exit SSO on vblank enable */ -amdgpu_dm_crtc_set_panel_sr_feature ( - dm, acrtc, stream, true, - acrtc->dm_irq_params.allow_sr_entry); - } -/* -* Else, vblank_enabled == false and allow_panel_sso == false; -* do nothing here. +* If the OS requires vblank events (or vblank is otherwise enabled), +* do not allow static screen optimizations. +* +* Keep ism->allow_static_screen_optimizations unchanged so the +* hysteresis-based decision can be reused once vblank is disabled. */ + allow_panel_sso = allow_panel_sso && !vblank_enabled; +amdgpu_dm_crtc_set_static_screen_optimze ( + dm, stream, allow_panel_sso, + acrtc->dm_irq_params.allow_sr_entry); }/*
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +74 -168
281 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h +6 -7
@@ -28,16 +28,15 @@#define AMDGPU_DM_AMDGPU_DM_PSR_H_ #include "amdgpu.h" +#include "dc.h" +#include "modules/inc/mod_power.h" /* the number of pageflips before enabling psr */ #define AMDGPU_DM_PSR_ENTRY_DELAY 5 -void amdgpu_dm_set_psr_caps (struct dc_link *link); -void amdgpu_dm_psr_enable (struct dc_stream_state *stream); -bool amdgpu_dm_link_setup_psr (struct dc_stream_state *stream); -bool amdgpu_dm_psr_disable (struct dc_stream_state *stream,bool wait); -bool amdgpu_dm_psr_disable_all (struct amdgpu_display_manager *dm); +bool amdgpu_dm_set_psr_caps (struct dc_link *link,struct amdgpu_dm_connector *aconnector);bool amdgpu_dm_psr_is_active_allowed (struct amdgpu_display_manager *dm); -bool amdgpu_dm_psr_wait_disable (struct dc_stream_state *stream); - +bool amdgpu_dm_psr_set_event (struct amdgpu_display_manager *dm, +struct dc_stream_state *stream,bool set_event,enum psr_event event, +bool wait_for_disable);#endif /* AMDGPU_DM_AMDGPU_DM_PSR_H_ */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c +67 -76
191 lines not on this page · raw message
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h +11 -17
@@ -28,22 +28,16 @@#define AMDGPU_DM_AMDGPU_DM_REPLAY_H_ #include "amdgpu.h" +#include "dc.h" +#include "modules/inc/mod_power.h" -enum replay_enable_option { - pr_enable_option_static_screen =0x1 , - pr_enable_option_mpo_video =0x2 , - pr_enable_option_full_screen_video =0x4 , - pr_enable_option_general_ui =0x8 , - pr_enable_option_static_screen_coasting =0x10000 , - pr_enable_option_mpo_video_coasting =0x20000 , - pr_enable_option_full_screen_video_coasting =0x40000 , -}; - -bool amdgpu_dm_link_supports_replay (struct dc_link *link,struct amdgpu_dm_connector *aconnector); -bool amdgpu_dm_replay_enable (struct dc_stream_state *stream,bool enable); -bool amdgpu_dm_set_replay_caps (struct dc_link *link,struct amdgpu_dm_connector *aconnector); -bool amdgpu_dm_link_setup_replay (struct dc_link *link,struct amdgpu_dm_connector *aconnector); -bool amdgpu_dm_replay_disable (struct dc_stream_state *stream); -bool amdgpu_dm_replay_disable_all (struct amdgpu_display_manager *dm); - +bool amdgpu_dm_link_supports_replay (struct dc_link *link, +struct amdgpu_dm_connector *aconnector); +bool amdgpu_dm_set_replay_caps (struct dc_link *link, +struct amdgpu_dm_connector *aconnector); +bool amdgpu_dm_link_setup_replay (struct dc_stream_state *stream, +struct mod_vrr_params *vrr_params); +bool amdgpu_dm_replay_set_event (struct amdgpu_display_manager *dm, +struct dc_stream_state *stream,bool set_event, +enum replay_event event,bool wait_for_disable);#endif /* AMDGPU_DM_AMDGPU_DM_REPLAY_H_ */
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_services.c +23 -7
@@ -64,12 +64,28 @@ void dm_trace_smu_exit(bool success, uint32_t response, struct dc_context *ctx)/**** power component interfaces ****/ bool dm_query_extended_brightness_caps (struct dc_context *ctx, -enum dm_acpi_display_type display, -struct dm_acpi_atif_backlight_caps *pCaps) +enum dm_acpi_display_type display,struct dm_acpi_atif_backlight_caps *pCaps) { -/* -* TODO: Implement query for extended backlight caps. -* Some plumbing required, see amdgpu_atif_query_backlight_caps() -*/ -return false; +struct amdgpu_device *adev; +struct amdgpu_display_manager *dm; +int bl_index = (display == AcpiDisplayType_LCD1) ?0 :1 ; + +if (!ctx || !pCaps || !ctx->driver_context) +return false; + + adev = (struct amdgpu_device *)ctx->driver_context; + dm = &adev->dm; + +amdgpu_dm_update_backlight_caps (dm, bl_index); + + pCaps->num_data_points = dm->backlight_caps[bl_index].data_points; + pCaps->max_input_signal = dm->backlight_caps[bl_index].max_input_signal; + pCaps->min_input_signal = dm->backlight_caps[bl_index].min_input_signal; + pCaps->ac_level_percentage = dm->backlight_caps[bl_index].ac_level; + pCaps->dc_level_percentage = dm->backlight_caps[bl_index].dc_level; + +if (pCaps->num_data_points >0 ) +memcpy (pCaps->data_points, dm->backlight_caps[bl_index].luminance_data, +sizeof (struct dm_bl_data_point ) * pCaps->num_data_points); +return true; }
Signature · 1 line
2.43.0
PATCH 10/19 drm/amd/display: Fix fpu guard warning
In reply to Chenyu ChenFrom: Wayne Lin <[email protected]>
[Why]
Due to improper fpu guarding, we encounter this warning during boot up:
[ 10.027021] WARNING: drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/dc_fpu.c:58 at dc_assert_fp_enabled+0x12/0x20 [amdgpu], CPU#8: (udev-worker)/469 [ 10.027644] Modules linked in: binfmt_misc snd_ctl_led nls_iso8859_1 intel_rapl_msr amd_atl intel_rapl_common amdgpu(+) snd_acp_legacy_mach snd_acp_mach snd_soc_nau8821 snd_acp3x_pdm_dma snd_acp3x_rn snd_soc_dmic snd_sof_amd_acp63 snd_sof_amd_vangogh snd_sof_amd_rembrandt snd_sof_amd_renoir snd_sof_amd_acp snd_sof_pci snd_hda_codec_alc269 snd_sof_xtensa_dsp snd_hda_scodec_component snd_hda_codec_realtek_lib snd_sof snd_hda_codec_generic snd_sof_utils snd_pci_ps snd_soc_acpi_amd_match snd_amd_sdw_acpi soundwire_amd snd_hda_codec_atihdmi soundwire_generic_allocation snd_hda_codec_hdmi soundwire_bus snd_soc_sdca edac_mce_amd snd_hda_intel snd_soc_core snd_hda_codec kvm_amd snd_compress snd_hda_core ac97_bus ee1004 amdxcp snd_pcm_dmaengine snd_intel_dspcfg snd_intel_sdw_acpi kvm drm_panel_backlight_quirks snd_rpl_pci_acp6x gpu_sched snd_hwdep snd_acp_pci irqbypass snd_amd_acpi_mach drm_buddy snd_acp_legacy_common snd_seq_midi ghash_clmulni_intel drm_ttm_helper aesni_intel snd_seq_midi_event snd_pci_acp6x joydev rapl [ 10.027750] snd_pcm snd_rawmidi ttm snd_seq snd_pci_acp5x drm_exec drm_suballoc_helper snd_seq_device wmi_bmof snd_rn_pci_acp3x drm_display_helper snd_timer snd_acp_config cec snd_soc_acpi snd rc_core i2c_piix4 ccp snd_pci_acp3x i2c_smbus soundcore k10temp i2c_algo_bit spi_amd cdc_mbim input_leds cdc_wdm mac_hid sch_fq_codel msr parport_pc ppdev lp parport efi_pstore nfnetlink dmi_sysfs autofs4 cdc_ncm cdc_ether usbnet mii hid_logitech_hidpp hid_logitech_dj hid_generic nvme nvme_core ahci serio_raw nvme_keyring usbhid ucsi_acpi amd_xgbe nvme_auth libahci hkdf typec_ucsi video typec wmi i2c_hid_acpi i2c_hid hid [ 10.027853] CPU: 8 UID: 0 PID: 469 Comm: (udev-worker) Not tainted 6.19.0asdn-260408-asdn #1 PREEMPT(voluntary) [ 10.027858] Hardware name: AMD Crater-RN/Crater-RN, BIOS TCR1004A 03/12/2024 [ 10.027861] RIP: 0010:dc_assert_fp_enabled+0x12/0x20 [amdgpu] [ 10.028416] Code: 00 00 00 00 00 0f 1f 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 65 8b 05 39 79 cc c4 85 c0 7e 07 31 c0 e9 9e 75 2a c3 <0f> 0b 31 c0 e9 95 75 2a c3 0f 1f 44 00 00 90 90 90 90 90 90 90 90 [ 10.028420] RSP: 0018:ffffcca10188b348 EFLAGS: 00010246 [ 10.028425] RAX: 0000000000000000 RBX: ffff88c6077f8000 RCX: 0000000000000000 [ 10.028428] RDX: ffff88c607d0e400 RSI: ffffffffc204d860 RDI: ffff88c624c00000 [ 10.028430] RBP: ffffcca10188b3e8 R08: ffff88c624c35c88 R09: 0000000000000000 [ 10.028433] R10: 0000000000000000 R11: 0000000000000000 R12: ffffcca10188b548 [ 10.028435] R13: ffff88c60be5bd00 R14: ffffffffc204d860 R15: ffff88c624c00000 [ 10.028438] FS: 00007c80c2432980(0000) GS:ffff88cdc7464000(0000) knlGS:0000000000000000 [ 10.028441] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 10.028443] CR2: 00007866ae013da8 CR3: 000000010a511000 CR4: 0000000000350ef0 [ 10.028446] Call Trace: [ 10.028449] <TASK> [ 10.028452] ? dcn21_update_bw_bounding_box+0x38/0xb30 [amdgpu] [ 10.028991] ? srso_return_thunk+0x5/0x5f [ 10.029001] dc_create+0x37c/0x730 [amdgpu] [ 10.029505] ? srso_return_thunk+0x5/0x5f [ 10.029512] amdgpu_dm_init+0x374/0x2ff0 [amdgpu] [ 10.030053] ? srso_return_thunk+0x5/0x5f [ 10.030057] ? __irq_work_queue_local+0x61/0xe0 [ 10.030063] ? srso_return_thunk+0x5/0x5f [ 10.030067] ? irq_work_queue+0x2f/0x70 [ 10.030071] ? srso_return_thunk+0x5/0x5f [ 10.030075] ? __wake_up_klogd+0x75/0xa0 [ 10.030081] ? srso_return_thunk+0x5/0x5f [ 10.030085] ? vprintk_emit+0x35b/0x3f0 [ 10.030102] dm_hw_init+0x1c/0x110 [amdgpu] [ 10.030625] amdgpu_device_init+0x23e8/0x3210 [amdgpu] [ 10.031041] ? pci_read+0x55/0x90 [ 10.031047] ? srso_return_thunk+0x5/0x5f [ 10.031051] ? pci_read_config_word+0x27/0x50 [ 10.031057] ? srso_return_thunk+0x5/0x5f [ 10.031061] ? do_pci_enable_device+0x155/0x180 [ 10.031068] amdgpu_driver_load_kms+0x1a/0xd0 [amdgpu] [ 10.031486] amdgpu_pci_probe+0x28c/0x6f0 [amdgpu] [ 10.031902] local_pci_probe+0x47/0xb0 [ 10.031908] pci_device_probe+0xf3/0x270 [ 10.031914] really_probe+0xf1/0x410 [ 10.031920] __driver_probe_device+0x8c/0x190 [ 10.031924] driver_probe_device+0x24/0xd0 [ 10.031928] __driver_attach+0x10b/0x240 [ 10.031932] ? __pfx___driver_attach+0x10/0x10 [ 10.031936] bus_for_each_dev+0x8c/0xf0 [ 10.031942] driver_attach+0x1e/0x30 [ 10.031947] bus_add_driver+0x160/0x2a0 [ 10.031952] driver_register+0x5e/0x130 [ 10.031957] ? __pfx_amdgpu_init+0x10/0x10 [amdgpu] [ 10.032361] __pci_register_driver+0x5e/0x70 [ 10.032366] amdgpu_init+0x5d/0xff0 [amdgpu] [ 10.032768] ? srso_return_thunk+0x5/0x5f [ 10.032773] do_one_initcall+0x5d/0x340 [ 10.032783] do_init_module+0x97/0x2c0 [ 10.032788] load_module+0x2b49/0x2c30 [ 10.032800] init_module_from_file+0xf4/0x120 [ 10.032804] ? init_module_from_file+0xf4/0x120 [ 10.032813] idempotent_init_module+0x10f/0x300 [ 10.032820] __x64_sys_finit_module+0x73/0xf0 [ 10.032824] ? srso_return_thunk+0x5/0x5f [ 10.032829] x64_sys_call+0x1d68/0x26b0 [ 10.032834] do_syscall_64+0x81/0x500 [ 10.032839] ? srso_return_thunk+0x5/0x5f [ 10.032843] ? do_syscall_64+0x2e5/0x500 [ 10.032848] ? srso_return_thunk+0x5/0x5f [ 10.032852] ? native_flush_tlb_global+0x95/0xb0 [ 10.032860] ? srso_return_thunk+0x5/0x5f [ 10.032864] ? __flush_tlb_all+0x13/0x60 [ 10.032870] ? srso_return_thunk+0x5/0x5f [ 10.032874] ? do_flush_tlb_all+0xe/0x20 [ 10.032879] ? srso_return_thunk+0x5/0x5f [ 10.032882] ? __flush_smp_call_function_queue+0x9c/0x430 [ 10.032888] ? srso_return_thunk+0x5/0x5f [ 10.032897] ? irqentry_exit+0xb2/0x740 [ 10.032901] ? srso_return_thunk+0x5/0x5f [ 10.032906] ? srso_return_thunk+0x5/0x5f [ 10.032911] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 10.032915] RIP: 0033:0x7c80c1d3490d [ 10.032920] Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d d3 f4 0f 00 f7 d8 64 89 01 48 [ 10.032923] RSP: 002b:00007fff3a12fe28 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 10.032928] RAX: ffffffffffffffda RBX: 00005c44096804f0 RCX: 00007c80c1d3490d [ 10.032930] RDX: 0000000000000000 RSI: 00005c4409681690 RDI: 000000000000002b [ 10.032933] RBP: 00007fff3a12fec0 R08: 0000000000000000 R09: 00005c4409681790 [ 10.032935] R10: 0000000000000000 R11: 0000000000000246 R12: 00005c4409681690 [ 10.032937] R13: 0000000000020000 R14: 00005c44094ff7f0 R15: 00005c4409681690 [ 10.032945] </TASK> [ 10.032948] ---[ end trace 0000000000000000 ]---
[How]
Add wrapper function to guard fpu properly for dcn21/dcn31/dcn315/dcn316.
--- drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 +- drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 2 +- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 6 +++--- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 6 +++--- .../gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c | 7 +++++++ .../gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c | 7 +++++++ .../drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 7 +++++++ .../drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 7 +++++++ 8 files changed, 36 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +1 -1
@@ -2400,7 +2400,7 @@ static struct _vcs_dpi_voltage_scaling_st construct_low_pstate_lvl(struct clk_lireturn low_pstate_lvl; } -void dcn21_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +void dcn21_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params) {struct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct dcn21_resource_pool *pool =TO_DCN21_RES_POOL (dc->res_pool);
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h +1 -1
@@ -78,7 +78,7 @@ int dcn21_populate_dml_pipes_from_context(struct dc *dc, enum dc_validate_mode validate_mode);bool dcn21_validate_bandwidth_fp (struct dc *dc,struct dc_state *context,enum dc_validate_mode ,display_e2e_pipe_params_st *pipes); -void dcn21_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); +void dcn21_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params);void dcn21_clk_mgr_set_bw_params_wm_table (struct clk_bw_params *bw_params);
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +3 -3
@@ -587,7 +587,7 @@ void dcn31_calculate_wm_and_dlg_fp( context->bw_ctx.bw.dcn.compbuf_size_kb = context->bw_ctx.dml.ip.config_return_buffer_size_in_kbytes - total_det; } -void dcn31_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +void dcn31_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params) {struct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct clk_limit_table *clk_table = &bw_params->clk_table;
@@ -665,7 +665,7 @@ void dcn31_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_paramsdml_init_instance (&dc->dml, &dcn3_1_soc, &dcn3_1_ip,DML_PROJECT_DCN31 ); } -void dcn315_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +void dcn315_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params) {struct clk_limit_table *clk_table = &bw_params->clk_table;int i, max_dispclk_mhz =0 , max_dppclk_mhz =0 ;
@@ -726,7 +726,7 @@ void dcn315_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_paramdml_init_instance (&dc->dml, &dcn3_15_soc, &dcn3_15_ip,DML_PROJECT_DCN315 ); } -void dcn316_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +void dcn316_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params) {struct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct clk_limit_table *clk_table = &bw_params->clk_table;
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h +3 -3
@@ -44,9 +44,9 @@ void dcn31_calculate_wm_and_dlg_fp(int pipe_cnt, int vlevel); -void dcn31_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); -void dcn315_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); -void dcn316_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params); +void dcn31_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params); +void dcn315_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params); +void dcn316_update_bw_bounding_box_fpu (struct dc *dc,struct clk_bw_params *bw_params);int dcn_get_max_non_odm_pix_rate_100hz (struct _vcs_dpi_soc_bounding_box_st *soc); int dcn_get_approx_det_segs_required_for_pstate( struct _vcs_dpi_soc_bounding_box_st *soc,
drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c +7 -0
@@ -1395,6 +1395,13 @@ static enum dc_status dcn21_patch_unknown_plane_state(struct dc_plane_state *plareturn dcn20_patch_unknown_plane_state (plane_state); } +static void dcn21_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +{ +DC_FP_START (); +dcn21_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static const struct resource_funcs dcn21_res_pool_funcs = { .destroy = dcn21_destroy_resource_pool, .link_enc_create = dcn21_link_encoder_create,
drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +7 -0
@@ -1858,6 +1858,13 @@ static struct dc_cap_funcs cap_funcs = { .get_dcc_compression_cap = dcn20_get_dcc_compression_cap }; +static void dcn31_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +{ +DC_FP_START (); +dcn31_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static struct resource_funcs dcn31_res_pool_funcs = { .destroy = dcn31_destroy_resource_pool, .link_enc_create = dcn31_link_encoder_create,
drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c +7 -0
@@ -1853,6 +1853,13 @@ static struct dc_cap_funcs cap_funcs = { .get_dcc_compression_cap = dcn20_get_dcc_compression_cap }; +static void dcn315_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +{ +DC_FP_START (); +dcn315_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static struct resource_funcs dcn315_res_pool_funcs = { .destroy = dcn315_destroy_resource_pool, .link_enc_create = dcn31_link_encoder_create,
drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c +7 -0
@@ -1729,6 +1729,13 @@ static struct dc_cap_funcs cap_funcs = { .get_dcc_compression_cap = dcn20_get_dcc_compression_cap }; +static void dcn316_update_bw_bounding_box (struct dc *dc,struct clk_bw_params *bw_params) +{ +DC_FP_START (); +dcn316_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static struct resource_funcs dcn316_res_pool_funcs = { .destroy = dcn316_destroy_resource_pool, .link_enc_create = dcn31_link_encoder_create,
Signature · 1 line
2.43.0
PATCH 11/19 drm/amd/display: Add Replay/PSR active check in link loss status check
In reply to Chenyu ChenFrom: Allen Li <[email protected]>
[Why&How]
To avoid unnecessary link retraining when the panel is in Replay/PSR mode, we need to check if it's in active state and ESD information before we decide to retrain the link.
--- .../dc/link/protocols/link_dp_irq_handler.c | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-)
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +34 -23
@@ -223,7 +223,7 @@ static void handle_hpd_irq_vesa_replay_sink(struct dc_link *link) } } -static void handle_hpd_irq_replay_sink (struct dc_link *link,bool *need_re_enable) +static void handle_hpd_irq_replay_sink (struct dc_link *link,bool *need_re_enable,bool *replay_esd_detection_needed) {union dpcd_replay_configuration replay_configuration = {0 };union dpcd_replay_configuration replay_sink_status = {0 };
@@ -311,6 +311,14 @@ static void handle_hpd_irq_replay_sink(struct dc_link *link, bool *need_re_enabl *need_re_enable = true; } } + +if (!link->replay_settings.replay_allow_active && + replay_sink_status.bits.SINK_DEVICE_REPLAY_STATUS ==0x7 ) { +/* If sink device replay status is 0x7 and replay is disabled, +* it means sink is in a bad state and link retraining is needed to recover +*/ + *replay_esd_detection_needed = true; + } }void dp_handle_link_loss (struct dc_link *link)
@@ -469,6 +477,7 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,enum dc_status result;bool status = false;bool replay_re_enable_needed = false; +bool replay_esd_detection_needed = false;if (out_link_loss) *out_link_loss = false;
@@ -482,6 +491,7 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,DC_LOG_HW_HPD_IRQ ("%s: Got short pulse HPD on link %d\n" , __func__, link->link_index); +handle_hpd_irq_replay_sink (link, &replay_re_enable_needed, &replay_esd_detection_needed);/* All the "handle_hpd_irq_xxx()" methods * should be called only after
@@ -528,8 +538,6 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,/* PSR-related error was detected and handled */ return true; -handle_hpd_irq_replay_sink (link, &replay_re_enable_needed); -/* If PSR-related error handled, Main link may be off, * so do not handle as a normal sink status change interrupt. */
@@ -552,27 +560,30 @@ bool dp_handle_hpd_rx_irq(struct dc_link *link,* Downstream port status changed, * then DM should call DC to do the detection. * NOTE: Now includes eDP link loss detection and retraining +* Link will be retrained if panel is not EDP or +* Replay ESD recovery is needed. */ - -if (dp_parse_link_loss_status ( - link, - &hpd_irq_dpcd_data)) { -/* Connectivity log: link loss */ -CONN_DATA_LINK_LOSS (link, - hpd_irq_dpcd_data.raw, -sizeof (hpd_irq_dpcd_data), -"Status: " ); - -if (defer_handling && has_left_work) - *has_left_work = true; -else -dp_handle_link_loss (link); - - status = false; -if (out_link_loss) - *out_link_loss = true; - -dp_trace_link_loss_increment (link); +if (link->connector_signal !=SIGNAL_TYPE_EDP || replay_esd_detection_needed) { +if (dp_parse_link_loss_status ( + link, + &hpd_irq_dpcd_data)) { +/* Connectivity log: link loss */ +CONN_DATA_LINK_LOSS (link, + hpd_irq_dpcd_data.raw, +sizeof (hpd_irq_dpcd_data), +"Status: " ); + +if (defer_handling && has_left_work) + *has_left_work = true; +else +dp_handle_link_loss (link); + + status = false; +if (out_link_loss) + *out_link_loss = true; + +dp_trace_link_loss_increment (link); + } }if (link->dpcd_caps.usb4_dp_tun_info.dp_tun_cap.bits.dp_tunneling) {
Signature · 1 line
2.43.0
PATCH 12/19 drm/amd/display: Remove SYMCLK F and G values from link encoder and MANUAL_FLOW_CONTROL from optc
In reply to Chenyu ChenFrom: Andrew Lichmanov <[email protected]>
[WHY]
Definitions were removed by HW from new headers.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 1 - .../gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.h | 2 -- drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 1 - 3 files changed, 4 deletions(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c +0 -1
@@ -428,4 +428,3 @@ void dcn42_smu_set_dtbclk(struct clk_mgr_internal *clk_mgr, bool enable) enable);smu_print ("%s: smu_set_dtbclk = %d\n" , __func__, enable ?1 :0 ); } -
drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.h +0 -2
@@ -121,8 +121,6 @@LE_SF (DIO_CLK_CNTL ,SYMCLKC_G_HDCP_GATE_DIS , mask_sh),\LE_SF (DIO_CLK_CNTL ,SYMCLKD_G_HDCP_GATE_DIS , mask_sh),\LE_SF (DIO_CLK_CNTL ,SYMCLKE_G_HDCP_GATE_DIS , mask_sh),\ -LE_SF (DIO_CLK_CNTL ,SYMCLKF_G_HDCP_GATE_DIS , mask_sh),\ - LE_SF(DIO_CLK_CNTL, SYMCLKG_G_HDCP_GATE_DIS, mask_sh) void dcn42_link_encoder_construct( struct dcn20_link_encoder *enc20,
drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h +0 -1
@@ -164,7 +164,6 @@SF (GSL_SOURCE_SELECT ,GSL0_READY_SOURCE_SEL , mask_sh),\SF (GSL_SOURCE_SELECT ,GSL1_READY_SOURCE_SEL , mask_sh),\SF (GSL_SOURCE_SELECT ,GSL2_READY_SOURCE_SEL , mask_sh),\ -SF (OTG0_OTG_GLOBAL_CONTROL2 ,MANUAL_FLOW_CONTROL_SEL , mask_sh),\SF (OTG0_OTG_GLOBAL_CONTROL2 ,GLOBAL_UPDATE_LOCK_EN , mask_sh),\SF (OTG0_OTG_GSL_WINDOW_X ,OTG_GSL_WINDOW_START_X , mask_sh),\ SF(OTG0_OTG_GSL_WINDOW_X, OTG_GSL_WINDOW_END_X, mask_sh), \
Signature · 1 line
2.43.0
PATCH 13/19 drm/amd/display: Add minimum vfp requirement
In reply to Chenyu ChenFrom: Dillon Varone <[email protected]>
[WHY&HOW]
Vertical front porch (vfp) must be greater than 1, and must be patched if it isn't. This must be done pre-DML so the DLG programming remains consistent with the OTG programming.
--- .../amd/display/dc/dml2_0/dml21/dml21_translation_helper.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_translation_helper.c +5 -2
@@ -90,6 +90,8 @@ static void populate_dml21_timing_config_from_stream_state(struct dml2_timing_cf struct pipe_ctx *pipe_ctx, struct dml2_context *dml_ctx) { +const unsigned int min_v_front_porch = (stream->timing.flags.INTERLACE !=0 ) ?2 :1 ; +unsigned int hblank_start, vblank_start;uint64_t min_hardware_refresh_in_uhz;uint32_t pix_clk_100hz;
@@ -97,7 +99,8 @@ static void populate_dml21_timing_config_from_stream_state(struct dml2_timing_cf timing->h_active = stream->timing.h_addressable + stream->timing.h_border_left + stream->timing.h_border_right + pipe_ctx->dsc_padding_params.dsc_hactive_padding; timing->v_active = stream->timing.v_addressable + stream->timing.v_border_bottom + stream->timing.v_border_top; timing->h_front_porch = stream->timing.h_front_porch; - timing->v_front_porch = stream->timing.v_front_porch; + timing->v_front_porch = stream->timing.v_front_porch > min_v_front_porch ? + stream->timing.v_front_porch : min_v_front_porch; timing->pixel_clock_khz = stream->timing.pix_clk_100hz /10 ;if (pipe_ctx->dsc_padding_params.dsc_hactive_padding !=0 ) timing->pixel_clock_khz = pipe_ctx->dsc_padding_params.dsc_pix_clk_100hz /10 ;
@@ -116,7 +119,7 @@ static void populate_dml21_timing_config_from_stream_state(struct dml2_timing_cfif (hblank_start < stream->timing.h_addressable) timing->h_blank_end =0 ; - vblank_start = stream->timing.v_total - stream->timing.v_front_porch; + vblank_start = timing->v_total - timing->v_front_porch; timing->v_blank_end = vblank_start - stream->timing.v_addressable - stream->timing.v_border_top - stream->timing.v_border_bottom;
Signature · 1 line
2.43.0
PATCH 14/19 drm/amd/display: Fix narrowing boundaries and eDP parser assignment
In reply to Chenyu ChenFrom: Gaghik Khachatrian <[email protected]>
[Why] drm/amd/display had implicit integer narrowing at protocol/storage boundaries and an incomplete eDP assignment in integrated info parsing.
[How] Apply explicit boundary casts for intentional narrowing, keep intermediate math in wider types, and restore explicit eDP field mapping in v2.2 parser.
--- .../gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 + .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 ++- .../amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 2 +- .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 2 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 14 +++++++------- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 7 ++++--- drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 ++++++++-------- .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 3 ++- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 4 ++-- .../display/dc/irq/dce110/irq_service_dce110.c | 2 +- drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 10 +++++----- .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- .../display/dc/link/protocols/link_dp_dpia_bw.c | 6 +++--- .../dc/link/protocols/link_dp_panel_replay.c | 4 ++-- .../dc/resource/dcn32/dcn32_resource_helpers.c | 2 +- .../dcn401/dcn401_soc_and_ip_translator.c | 14 +++++++------- .../display/modules/info_packet/info_packet.c | 2 +- .../amd/display/modules/power/power_helpers.c | 16 ++++++++-------- 24 files changed, 64 insertions(+), 60 deletions(-)
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +1 -0
@@ -2977,6 +2977,7 @@ static enum bp_result get_integrated_info_v2_2( info->edp1_info.edp_panel_bpc = info_v2_2->edp1_info.edp_panel_bpc; info->edp1_info.edp_bootup_bl_level = + info_v2_2->edp1_info.edp_bootup_bl_level; info->edp2_info.edp_backlight_pwm_hz =le16_to_cpu (info_v2_2->edp2_info.edp_backlight_pwm_hz);
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +2 -1
@@ -476,7 +476,8 @@ static void build_watermark_ranges(struct clk_bw_params *bw_params, struct pp_sm ranges->reader_wm_sets[num_valid_sets].min_drain_clk_mhz =0 ; else {/* add 1 to make it non-overlapping with next lvl */ - ranges->reader_wm_sets[num_valid_sets].min_drain_clk_mhz = bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + ranges->reader_wm_sets[num_valid_sets].min_drain_clk_mhz = + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } ranges->reader_wm_sets[num_valid_sets].max_drain_clk_mhz = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +1 -1
@@ -409,7 +409,7 @@ static void vg_build_watermark_ranges(struct clk_bw_params *bw_params, struct waelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +1 -1
@@ -447,7 +447,7 @@ static void dcn31_build_watermark_ranges(struct clk_bw_params *bw_params, structelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +1 -1
@@ -518,7 +518,7 @@ static void dcn314_build_watermark_ranges(struct clk_bw_params *bw_params, strucelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c +1 -1
@@ -408,7 +408,7 @@ static void dcn315_build_watermark_ranges(struct clk_bw_params *bw_params, strucelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c +1 -1
@@ -374,7 +374,7 @@ static void dcn316_build_watermark_ranges(struct clk_bw_params *bw_params, strucelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +1 -1
@@ -886,7 +886,7 @@ static void dcn35_build_watermark_ranges(struct clk_bw_params *bw_params, structelse {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +1 -1
@@ -657,7 +657,7 @@ void dcn42_build_watermark_ranges(struct clk_bw_params *bw_params, struct dcn42_else {/* add 1 to make it non-overlapping with next lvl */ table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MinMclk = - bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ; + (uint16_t )(bw_params->clk_table.entries[i -1 ].dcfclk_mhz +1 ); } table->WatermarkRow[WM_DCFCLK ][num_valid_sets].MaxMclk = (uint16_t )bw_params->clk_table.entries[i].dcfclk_mhz;
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +7 -7
@@ -4724,10 +4724,10 @@ static void set_avi_info_frame(* barLeft: Pixel Number of End of Left Bar. * barRight: Pixel Number of Start of Right Bar. */ hdmi_info.bits.bar_top = (uint16_t )stream->timing.v_border_top; - hdmi_info.bits.bar_bottom = (stream->timing.v_total + hdmi_info.bits.bar_bottom = (uint16_t )(stream->timing.v_total - stream->timing.v_border_bottom +1 ); hdmi_info.bits.bar_left = (uint16_t )stream->timing.h_border_left; - hdmi_info.bits.bar_right = (stream->timing.h_total + hdmi_info.bits.bar_right = (uint16_t )(stream->timing.h_total - stream->timing.h_border_right +1 );/* Additional Colorimetry Extension
@@ -5363,7 +5363,7 @@ bool get_temp_dp_link_res(struct dc_link *link,void reset_syncd_pipes_from_disabled_pipes (struct dc *dc,struct dc_state *context) { -int i, j; +uint8_t i, j;struct pipe_ctx *pipe_ctx_old, *pipe_ctx, *pipe_ctx_syncd;/* If pipe backend is reset, need to reset pipe syncd status */
@@ -5426,7 +5426,7 @@ void reset_sync_context_for_pipe(const struct dc *dc, struct dc_state *context, uint8_t pipe_idx) { - int i; +uint8_t i;struct pipe_ctx *pipe_ctx_reset;/* reset the otg sync context for the pipe and its slave pipes if any */
@@ -5442,7 +5442,7 @@ void reset_sync_context_for_pipe(const struct dc *dc,uint8_t resource_transmitter_to_phy_idx (const struct dc *dc,enum transmitter transmitter) {/* TODO - get transmitter to phy idx mapping from DMUB */ -uint8_t phy_idx = transmitter -TRANSMITTER_UNIPHY_A ; +uint8_t phy_idx = (uint8_t )(transmitter -TRANSMITTER_UNIPHY_A );if (dc->ctx->dce_version ==DCN_VERSION_3_1 && dc->ctx->asic_id.hw_internal_rev ==YELLOW_CARP_B0 ) {
@@ -5509,8 +5509,8 @@ const struct link_hwss *get_link_hwss(const struct dc_link *link,bool is_h_timing_divisible_by_2 (struct dc_stream_state *stream) {bool divisible = false; -uint16_t h_blank_start =0 ; -uint16_t h_blank_end =0 ; +uint32_t h_blank_start =0 ; +uint32_t h_blank_end =0 ;if (stream) { h_blank_start = stream->timing.h_total - stream->timing.h_front_porch;
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +4 -3
@@ -697,7 +697,8 @@ static void populate_subvp_cmd_vblank_pipe_info(struct dc *dc, pipe_data->pipe_config.vblank_data.vblank_pipe_index = vblank_pipe->pipe_idx; pipe_data->pipe_config.vblank_data.vstartup_start = (uint16_t )vblank_pipe->pipe_dlg_param.vstartup_start; pipe_data->pipe_config.vblank_data.vblank_end = - vblank_pipe->stream->timing.v_total - vblank_pipe->stream->timing.v_front_porch - vblank_pipe->stream->timing.v_addressable; + (uint16_t )(vblank_pipe->stream->timing.v_total - + vblank_pipe->stream->timing.v_front_porch - vblank_pipe->stream->timing.v_addressable);if (vblank_pipe->stream->ignore_msa_timing_param && (vblank_pipe->stream->allow_freesync || vblank_pipe->stream->vrr_active_variable || vblank_pipe->stream->vrr_active_fixed))
@@ -831,7 +832,7 @@ static void populate_subvp_cmd_pipe_info(struct dc *dc,// Prefetch lines is equal to VACTIVE + BP + VSYNC pipe_data->pipe_config.subvp_data.prefetch_lines = - phantom_timing->v_total - phantom_timing->v_front_porch; + (uint16_t )(phantom_timing->v_total - phantom_timing->v_front_porch);// Round up pipe_data->pipe_config.subvp_data.prefetch_to_mall_start_lines =
@@ -1811,7 +1812,7 @@ static void dc_dmub_srv_rb_based_fams2_update_config(struct dc *dc,struct dc_state *context, bool enable) { - uint8_t num_cmds = 1; + uint32_t num_cmds = 1;uint32_t i;union dmub_rb_cmd cmd[2 *MAX_STREAMS +1 ];struct dmub_rb_cmd_fams2 *global_cmd = &cmd[0 ].fams2_config;
drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c +8 -8
@@ -75,7 +75,7 @@ static void release_engine_dce_sw(static bool wait_for_scl_high_sw (struct dc_context *ctx,struct ddc *ddc, -uint16_t clock_delay_div_4) +uint32_t clock_delay_div_4) { (void )ctx;uint32_t scl_retry =0 ;
@@ -97,7 +97,7 @@ static bool wait_for_scl_high_sw(static bool write_byte_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4, +uint32_t clock_delay_div_4,uint8_t byte) {int32_t shift =7 ;
@@ -154,7 +154,7 @@ static bool write_byte_sw(static bool read_byte_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4, +uint32_t clock_delay_div_4,uint8_t *byte,bool more) {
@@ -214,7 +214,7 @@ static bool read_byte_sw(static bool stop_sync_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4) +uint32_t clock_delay_div_4) {uint32_t retry =0 ;
@@ -251,7 +251,7 @@ static bool stop_sync_sw(static bool i2c_write_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4, +uint32_t clock_delay_div_4,uint8_t address,uint32_t length,const uint8_t *data)
@@ -273,7 +273,7 @@ static bool i2c_write_sw(static bool i2c_read_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4, +uint32_t clock_delay_div_4,uint8_t address,uint32_t length,uint8_t *data)
@@ -298,7 +298,7 @@ static bool i2c_read_sw(static bool start_sync_sw (struct dc_context *ctx,struct ddc *ddc_handle, -uint16_t clock_delay_div_4) +uint32_t clock_delay_div_4) {uint32_t retry =0 ;
@@ -399,7 +399,7 @@ static void dce_i2c_sw_engine_submit_channel_request(struct dce_i2c_sw *engine, struct i2c_request_transaction_data *req) {struct ddc *ddc = engine->ddc; -uint16_t clock_delay_div_4 = engine->clock_delay >>2 ; +uint32_t clock_delay_div_4 = engine->clock_delay >>2 ;/* send sync (start / repeated start) */
drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c +2 -2
@@ -415,10 +415,10 @@ bool dsc_prepare_config(const struct dsc_config *dsc_cfg, struct dsc_reg_values dsc_reg_vals->ich_reset_at_eol = (dsc_cfg->is_odm || dsc_reg_vals->num_slices_h >1 ) ?0xF :0 ;// Need to find the ceiling value for the slice width - dsc_reg_vals->pps.slice_width = (dsc_cfg->pic_width + dsc_cfg->dsc_padding + dsc_cfg->dc_dsc_cfg.num_slices_h -1 ) / dsc_cfg->dc_dsc_cfg.num_slices_h; + dsc_reg_vals->pps.slice_width = (u16)((dsc_cfg->pic_width + dsc_cfg->dsc_padding + dsc_cfg->dc_dsc_cfg.num_slices_h -1 ) / dsc_cfg->dc_dsc_cfg.num_slices_h);// TODO: in addition to validating slice height (pic height must be divisible by slice height), // see what happens when the same condition doesn't apply for slice_width/pic_width. - dsc_reg_vals->pps.slice_height = dsc_cfg->pic_height / dsc_cfg->dc_dsc_cfg.num_slices_v; + dsc_reg_vals->pps.slice_height = (u16)(dsc_cfg->pic_height / dsc_cfg->dc_dsc_cfg.num_slices_v);ASSERT (dsc_reg_vals->pps.slice_height * dsc_cfg->dc_dsc_cfg.num_slices_v == dsc_cfg->pic_height);if (!(dsc_reg_vals->pps.slice_height * dsc_cfg->dc_dsc_cfg.num_slices_v == dsc_cfg->pic_height)) {
drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c +2 -1
@@ -103,7 +103,8 @@ int dscc_compute_dsc_parameters(const struct drm_dsc_config *pps,struct drm_dsc_config dsc_cfg; dsc_params->pps = *pps; - dsc_params->pps.initial_scale_value =8 * rc->rc_model_size / (rc->rc_model_size - rc->initial_fullness_offset); + dsc_params->pps.initial_scale_value = (u8)(8 * rc->rc_model_size / + (rc->rc_model_size - rc->initial_fullness_offset));copy_pps_fields (&dsc_cfg, &dsc_params->pps);copy_rc_to_cfg (&dsc_cfg, rc);
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +2 -2
@@ -1443,8 +1443,8 @@ void build_audio_output( (stream->timing.flags.INTERLACE !=0 ); audio_output->crtc_info.refresh_rate = - (stream->timing.pix_clk_100hz*100 )/ - (stream->timing.h_total*stream->timing.v_total); + (uint16_t )((stream->timing.pix_clk_100hz*100 )/ + (stream->timing.h_total*stream->timing.v_total)); audio_output->crtc_info.color_depth = stream->timing.display_color_depth;
drivers/gpu/drm/amd/display/dc/irq/dce110/irq_service_dce110.c +1 -1
@@ -210,7 +210,7 @@ bool dce110_vblank_set(struct irq_service *irq_service,dc_interrupt_to_irq_source (irq_service->ctx->dc, info->src_id, info->ext_id); -uint8_t pipe_offset = dal_irq_src -IRQ_TYPE_VBLANK ; +unsigned int pipe_offset = dal_irq_src -IRQ_TYPE_VBLANK ;struct timing_generator *tg;
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +5 -5
@@ -546,24 +546,24 @@ static void update_psp_stream_config(struct pipe_ctx *pipe_ctx, bool dpms_off) config.dig_fe = (uint8_t ) pipe_ctx->stream_res.stream_enc->stream_enc_inst;/* stream encoder index */ - config.stream_enc_idx = pipe_ctx->stream_res.stream_enc->id -ENGINE_ID_DIGA ; + config.stream_enc_idx = (uint8_t )(pipe_ctx->stream_res.stream_enc->id -ENGINE_ID_DIGA );if (dp_is_128b_132b_signal (pipe_ctx)) config.stream_enc_idx = - pipe_ctx->stream_res.hpo_dp_stream_enc->id -ENGINE_ID_HPO_DP_0 ; + (uint8_t )(pipe_ctx->stream_res.hpo_dp_stream_enc->id -ENGINE_ID_HPO_DP_0 );/* dig back end */ config.dig_be = pipe_ctx->stream->link->link_enc_hw_inst;/* link encoder index */ - config.link_enc_idx = link_enc->transmitter -TRANSMITTER_UNIPHY_A ; + config.link_enc_idx = (uint8_t )(link_enc->transmitter -TRANSMITTER_UNIPHY_A );if (dp_is_128b_132b_signal (pipe_ctx)) config.link_enc_idx = (uint8_t )pipe_ctx->link_res.hpo_dp_link_enc->inst;/* dio output index is dpia index for DPIA endpoint & dcio index by default */ if (pipe_ctx->stream->link->ep_type ==DISPLAY_ENDPOINT_USB4_DPIA ) - config.dio_output_idx = pipe_ctx->stream->link->link_id.enum_id -ENUM_ID_1 ; + config.dio_output_idx = (uint8_t )(pipe_ctx->stream->link->link_id.enum_id -ENUM_ID_1 );else - config.dio_output_idx = link_enc->transmitter -TRANSMITTER_UNIPHY_A ; + config.dio_output_idx = (uint8_t )(link_enc->transmitter -TRANSMITTER_UNIPHY_A );/* phy index */
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia.c +1 -1
@@ -119,7 +119,7 @@ bool dpia_query_hpd_status(struct dc_link *link)/* prepare QUERY_HPD command */ cmd.query_hpd.header.type =DMUB_CMD__QUERY_HPD_STATE ; cmd.query_hpd.header.payload_bytes =sizeof (cmd.query_hpd.data); - cmd.query_hpd.data.instance = link->link_id.enum_id -ENUM_ID_1 ; + cmd.query_hpd.data.instance = (uint8_t )(link->link_id.enum_id -ENUM_ID_1 ); cmd.query_hpd.data.ch_type =AUX_CHANNEL_DPIA ;/* Query dpia hpd status from dmub */
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c +3 -3
@@ -180,7 +180,7 @@ static void dpia_bw_alloc_unplug(struct dc_link *link)static void link_dpia_send_bw_alloc_request (struct dc_link *link,int req_bw) { -uint8_t request_reg_val; +uint32_t request_reg_val;uint32_t temp, request_bw;if (link->dpia_bw_alloc_config.bw_granularity ==0 ) {
@@ -212,8 +212,8 @@ static void link_dpia_send_bw_alloc_request(struct dc_link *link, int req_bw) link->dpia_bw_alloc_config.allocated_bw = request_bw;DC_LOG_DC ("%s: Link[%d]: Request BW: %d" , __func__, link->link_index, request_bw); -core_link_write_dpcd (link,REQUESTED_BW , - &request_reg_val, +uint8_t requested_bw_dpcd = (uint8_t )request_reg_val; +core_link_write_dpcd (link,REQUESTED_BW , &requested_bw_dpcd,sizeof (uint8_t )); }
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c +2 -2
@@ -328,9 +328,9 @@ bool dp_pr_copy_settings(struct dc_link *link, struct replay_context *replay_con link->dpcd_caps.vesa_replay_su_info.pr_su_y_granularity_extended_caps;if (pipe_ctx->stream->timing.dsc_cfg.num_slices_v >0 ) - cmd.pr_copy_settings.data.dsc_slice_height = (pipe_ctx->stream->timing.v_addressable + + cmd.pr_copy_settings.data.dsc_slice_height = (uint16_t )((pipe_ctx->stream->timing.v_addressable + pipe_ctx->stream->timing.v_border_top + pipe_ctx->stream->timing.v_border_bottom) / - pipe_ctx->stream->timing.dsc_cfg.num_slices_v; + pipe_ctx->stream->timing.dsc_cfg.num_slices_v);if (dc_is_embedded_signal (link->connector_signal)) cmd.pr_copy_settings.data.main_link_activity_option =OPTION_1C ;
drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource_helpers.c +1 -1
@@ -333,7 +333,7 @@ void dcn32_determine_det_override(struct dc *dc,continue ;if (context->stream_status[i].plane_count >0 ) - plane_segments = stream_segments / context->stream_status[i].plane_count; + plane_segments = (uint8_t )(stream_segments / context->stream_status[i].plane_count);else plane_segments = stream_segments;for (j =0 ; j < dc->res_pool->pipe_count; j++) {
drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn401/dcn401_soc_and_ip_translator.c +7 -7
@@ -49,7 +49,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].dcfclk_mhz > dc_bw_params->dc_mode_limit.dcfclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].dcfclk_mhz < dc_bw_params->dc_mode_limit.dcfclk_mhz) { dml_clk_table->dcfclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.dcfclk_mhz *1000 ; - dml_clk_table->dcfclk.num_clk_values = i +1 ; + dml_clk_table->dcfclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->dcfclk.clk_values_khz[i] =0 ; dml_clk_table->dcfclk.num_clk_values = (uint8_t )i;
@@ -72,7 +72,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].fclk_mhz > dc_bw_params->dc_mode_limit.fclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].fclk_mhz < dc_bw_params->dc_mode_limit.fclk_mhz) { dml_clk_table->fclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.fclk_mhz *1000 ; - dml_clk_table->fclk.num_clk_values = i +1 ; + dml_clk_table->fclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->fclk.clk_values_khz[i] =0 ; dml_clk_table->fclk.num_clk_values = (uint8_t )i;
@@ -95,7 +95,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].memclk_mhz > dc_bw_params->dc_mode_limit.memclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].memclk_mhz < dc_bw_params->dc_mode_limit.memclk_mhz) { dml_clk_table->uclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.memclk_mhz *1000 ; - dml_clk_table->uclk.num_clk_values = i +1 ; + dml_clk_table->uclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->uclk.clk_values_khz[i] =0 ; dml_clk_table->uclk.num_clk_values = (uint8_t )i;
@@ -121,7 +121,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].dispclk_mhz > dc_bw_params->dc_mode_limit.dispclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].dispclk_mhz < dc_bw_params->dc_mode_limit.dispclk_mhz) { dml_clk_table->dispclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.dispclk_mhz *1000 ; - dml_clk_table->dispclk.num_clk_values = i +1 ; + dml_clk_table->dispclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->dispclk.clk_values_khz[i] =0 ; dml_clk_table->dispclk.num_clk_values = (uint8_t )i;
@@ -144,7 +144,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].dppclk_mhz > dc_bw_params->dc_mode_limit.dppclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].dppclk_mhz < dc_bw_params->dc_mode_limit.dppclk_mhz) { dml_clk_table->dppclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.dppclk_mhz *1000 ; - dml_clk_table->dppclk.num_clk_values = i +1 ; + dml_clk_table->dppclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->dppclk.clk_values_khz[i] =0 ; dml_clk_table->dppclk.num_clk_values = (uint8_t )i;
@@ -167,7 +167,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].dtbclk_mhz > dc_bw_params->dc_mode_limit.dtbclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].dtbclk_mhz < dc_bw_params->dc_mode_limit.dtbclk_mhz) { dml_clk_table->dtbclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.dtbclk_mhz *1000 ; - dml_clk_table->dtbclk.num_clk_values = i +1 ; + dml_clk_table->dtbclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->dtbclk.clk_values_khz[i] =0 ; dml_clk_table->dtbclk.num_clk_values = (uint8_t )i;
@@ -190,7 +190,7 @@ static void dcn401_convert_dc_clock_table_to_soc_bb_clock_table( dc_clk_table->entries[i].socclk_mhz > dc_bw_params->dc_mode_limit.socclk_mhz) {if (i ==0 || dc_clk_table->entries[i-1 ].socclk_mhz < dc_bw_params->dc_mode_limit.socclk_mhz) { dml_clk_table->socclk.clk_values_khz[i] = dc_bw_params->dc_mode_limit.socclk_mhz *1000 ; - dml_clk_table->socclk.num_clk_values = i +1 ; + dml_clk_table->socclk.num_clk_values = (uint8_t )(i +1 ); }else { dml_clk_table->socclk.clk_values_khz[i] =0 ; dml_clk_table->socclk.num_clk_values = (uint8_t )i;
drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c +1 -1
@@ -246,7 +246,7 @@ void set_vsc_packet_colorimetry_data(break ; } - info_packet->sb[16 ] = (pixelEncoding <<4 ) | colorimetryFormat; + info_packet->sb[16 ] = (uint8_t )((pixelEncoding <<4 ) | colorimetryFormat);/* Set color depth */ switch (stream->timing.display_color_depth) {
drivers/gpu/drm/amd/display/modules/power/power_helpers.c +8 -8
@@ -647,12 +647,12 @@ static void fill_iram_v_2_3(struct iram_table_v_2_2 *ram_table, struct dmcu_iramunsigned int set = params.set; ram_table->flags =0x0 ; - ram_table->min_abm_backlight = (big_endian) ? + ram_table->min_abm_backlight = (uint16_t )((big_endian) ?cpu_to_be16 (params.min_abm_backlight) : -cpu_to_le16 (params.min_abm_backlight); +cpu_to_le16 (params.min_abm_backlight));for (i =0 ; i <NUM_AGGR_LEVEL ; i++) { - ram_table->hybrid_factor[i] = abm_settings[set][i].brightness_gain; + ram_table->hybrid_factor[i] = (uint8_t )abm_settings[set][i].brightness_gain; ram_table->contrast_factor[i] = abm_settings[set][i].contrast_factor; ram_table->deviation_gain[i] = abm_settings[set][i].deviation_gain; ram_table->min_knee[i] = abm_settings[set][i].min_knee;
@@ -960,8 +960,8 @@ bool psr_su_set_dsc_slice_height(struct dc *dc, struct dc_link *link,struct dc_stream_state *stream, struct psr_config *config) { - uint16_t pic_height; -uint16_t slice_height; + uint32_t pic_height; +uint32_t slice_height; config->dsc_slice_height =0 ; if (!(link->connector_signal & SIGNAL_TYPE_EDP) ||
@@ -978,7 +978,7 @@ bool psr_su_set_dsc_slice_height(struct dc *dc, struct dc_link *link,return false; slice_height = pic_height / stream->timing.dsc_cfg.num_slices_v; - config->dsc_slice_height = slice_height; + config->dsc_slice_height = (uint16_t )slice_height;if (slice_height) { if (config->su_y_granularity &&
@@ -1056,7 +1056,7 @@ void set_replay_low_rr_full_screen_video_src_vtotal(struct dc_link *link, uint16void calculate_replay_link_off_frame_count (struct dc_link *link,uint16_t vtotal,uint16_t htotal) { -uint8_t max_link_off_frame_count =0 ; +uint32_t max_link_off_frame_count =0 ;uint16_t max_deviation_line =0 , pixel_deviation_per_line =0 ;if (!link || link->replay_settings.config.replay_version !=DC_FREESYNC_REPLAY )
@@ -1093,7 +1093,7 @@ bool fill_custom_backlight_caps(unsigned int config_no, struct dm_acpi_atif_back caps->dc_level_percentage = custom_backlight_profiles[config_no].dc_level_percentage; caps->min_input_signal = custom_backlight_profiles[config_no].min_input_signal; caps->max_input_signal = custom_backlight_profiles[config_no].max_input_signal; - caps->num_data_points = custom_backlight_profiles[config_no].num_data_points; + caps->num_data_points = (uint8_t )custom_backlight_profiles[config_no].num_data_points;memcpy (caps->data_points, custom_backlight_profiles[config_no].data_points, data_points_size);return true; }
Signature · 1 line
2.43.0
PATCH 16/19 drm/amd/display: Add README.md file to DML2_0 repository
In reply to Chenyu ChenFrom: Samson Tam <[email protected]>
[Why/How]
Add README.md file to repository
Use it to categorize directories for tracking purposes
--- .../gpu/drm/amd/display/dc/dml2_0/README.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/README.md
drivers/gpu/drm/amd/display/dc/dml2_0/README.md new file +31 -0
@@ -0,0 +1,31 @@ +# DML2_0 (Display Mode Library 2.0) repository + +## Category to Directory Mapping + +```yaml +directory_categories: + app_tools: + - dml21/build/ + - dml21/src/dml2_unit_test/ + - utils/ + + driver_hw_dependent: + - dml21/inc/bounding_boxes/ + - dml21/src/dml2_cga/ + - dml21/src/dml2_core/ + - dml21/src/dml2_dpmm/ + - dml21/src/dml2_mcg/ + - dml21/src/dml2_pmo/ + - dml21/src/dml2_standalone_libraries/ + - dml21/src/dml2_utm_soc_bb/ + + driver_hw_independent: + - ./ + - dml21/ + - dml21/inc/ + - dml21/src/dml2_top/ + - dml21/src/inc/ + + undefined: + - .github/ +```
Signature · 1 line
2.43.0
PATCH 15/19 drm/amd/display: Fix dml2_0 narrowing boundaries
In reply to Chenyu ChenFrom: Gaghik Khachatrian <[email protected]>
[Why] drm/amd/display dml2_0 code had implicit narrowing conversions reported by a warning in timing, watermark, and translation paths.
[How] Apply explicit boundary casts for intentional narrowing, preserve wider intermediate math, and use wider timing intermediates where required for safe range handling.
--- .../amd/display/dc/dml2_0/display_mode_core.c | 14 +-- .../amd/display/dc/dml2_0/display_mode_util.c | 20 ++-- .../dml2_0/dml21/dml21_translation_helper.c | 8 +- .../amd/display/dc/dml2_0/dml21/dml21_utils.c | 2 +- .../amd/display/dc/dml2_0/dml2_mall_phantom.c | 100 +++++++++--------- .../drm/amd/display/dc/dml2_0/dml2_policy.c | 6 +- .../dc/dml2_0/dml2_translation_helper.c | 4 +- .../drm/amd/display/dc/dml2_0/dml2_utils.c | 40 +++---- 8 files changed, 97 insertions(+), 97 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2_0/display_mode_core.c +7 -7
@@ -1119,10 +1119,10 @@ static dml_bool_t CalculatePrefetchSchedule(struct display_mode_lib_scratch_st *if (p->myPipe->Dppclk ==0.0 || p->myPipe->Dispclk ==0.0 )return true; - *p->DSTXAfterScaler = (dml_uint_t )dml_round (s->DPPCycles * p->myPipe->PixelClock / p->myPipe->Dppclk + s->DISPCLKCycles * p->myPipe->PixelClock / p->myPipe->Dispclk + p->DSCDelay,1.0 ); + *p->DSTXAfterScaler = (dml_uint_t )dml_round (s->DPPCycles * p->myPipe->PixelClock / p->myPipe->Dppclk + s->DISPCLKCycles * p->myPipe->PixelClock / p->myPipe->Dispclk + p->DSCDelay, true); *p->DSTXAfterScaler = (dml_uint_t )dml_round (*p->DSTXAfterScaler + (p->myPipe->ODMMode != dml_odm_mode_bypass ?18 :0 ) + (p->myPipe->DPPPerSurface -1 ) * p->DPP_RECOUT_WIDTH + ((p->myPipe->ODMMode == dml_odm_mode_split_1to2 || p->myPipe->ODMMode == dml_odm_mode_mso_1to2) ? (dml_float_t )p->myPipe->HActive /2.0 :0 ) + - ((p->myPipe->ODMMode == dml_odm_mode_mso_1to4) ? (dml_float_t )p->myPipe->HActive *3.0 /4.0 :0 ),1.0 ); + ((p->myPipe->ODMMode == dml_odm_mode_mso_1to4) ? (dml_float_t )p->myPipe->HActive *3.0 /4.0 :0 ), true);#ifdef __DML_VBA_DEBUG__dml_print ("DML::%s: DPPCycles = %u\n" , __func__, s->DPPCycles);
@@ -4301,7 +4301,7 @@ static void CalculateSwathAndDETConfiguration(struct display_mode_lib_scratch_st *p->compbuf_reserved_space_64b =2 * p->PixelChunkSizeInKByte *1024 /64 ;if (*p->UnboundedRequestEnabled) { - *p->compbuf_reserved_space_64b =dml_max (*p->compbuf_reserved_space_64b, + *p->compbuf_reserved_space_64b = (dml_uint_t )dml_max (*p->compbuf_reserved_space_64b, (dml_float_t)(p->ROBBufferSizeInKByte *1024 /64 ) - (dml_float_t)(RoundedUpSwathSizeBytesY[SurfaceDoingUnboundedRequest] *TTUFIFODEPTH /MAXIMUMCOMPRESSION /64 )); }
@@ -6178,9 +6178,9 @@ static void CalculateImmediateFlipBandwithSupport(static dml_uint_t MicroSecToVertLines (dml_uint_t num_us,dml_uint_t h_total,dml_float_t pixel_clock) { -dml_uint_t lines_time_in_ns =1000.0 * (h_total *1000.0 ) / (pixel_clock *1000.0 ); +dml_uint_t lines_time_in_ns = (dml_uint_t)(1000.0 * (h_total *1000.0 ) / (pixel_clock *1000.0 )); -return dml_ceil (1000.0 * num_us / lines_time_in_ns,1.0 ); +return (dml_uint_t )dml_ceil (1000.0 * num_us / lines_time_in_ns,1.0 ); }/// @brief Calculate the maximum vstartup for mode support and mode programming consideration
@@ -6207,9 +6207,9 @@ static dml_uint_t CalculateMaxVStartup(// + 2 is because // 1 -> VStartup_start should be 1 line before VSync // 1 -> always reserve 1 line between start of VBlank to VStartup signal -dml_uint_t vblank_nom_vsync_capped =dml_max (vblank_nom_input, +dml_uint_t vblank_nom_vsync_capped = (dml_uint_t )dml_max (vblank_nom_input, timing->VTotal[plane_idx] - timing->VActive[plane_idx] - timing->VFrontPorch[plane_idx] +2 ); -dml_uint_t vblank_nom_max_allowed_capped =dml_min (vblank_nom_vsync_capped, max_allowed_vblank_nom); +dml_uint_t vblank_nom_max_allowed_capped = (dml_uint_t )dml_min (vblank_nom_vsync_capped, max_allowed_vblank_nom);dml_uint_t vblank_avail = (vblank_nom_max_allowed_capped ==0 ) ? vblank_nom_default_in_line : vblank_nom_max_allowed_capped;
drivers/gpu/drm/amd/display/dc/dml2_0/display_mode_util.c +10 -10
@@ -80,7 +80,7 @@ static inline float dcn_bw_pow(float a, float exp)/*ASSERT(exp == (int)exp);*/ if ((int )exp ==0 )return 1 ; - temp =dcn_bw_pow (a, (int )(exp /2 )); + temp =dcn_bw_pow (a, (float )(exp /2 ));if (((int )exp %2 ) ==0 ) {return temp * temp; }else {
@@ -110,7 +110,7 @@ dml_float_t dml_ceil(dml_float_t x, dml_float_t granularity)if (granularity ==0 )return 0 ;//return (dml_float_t) (ceil(x / granularity) * granularity); -return (dml_float_t )dcn_bw_ceil2 (x, granularity); +return (dml_float_t )dcn_bw_ceil2 ((float )x, (float )granularity); }dml_float_t dml_floor (dml_float_t x,dml_float_t granularity)
@@ -118,7 +118,7 @@ dml_float_t dml_floor(dml_float_t x, dml_float_t granularity)if (granularity ==0 )return 0 ;//return (dml_float_t) (floor(x / granularity) * granularity); -return (dml_float_t )dcn_bw_floor2 (x, granularity); +return (dml_float_t )dcn_bw_floor2 ((float )x, (float )granularity); }dml_float_t dml_min (dml_float_t x,dml_float_t y)
@@ -168,12 +168,12 @@ dml_float_t dml_max5(dml_float_t a, dml_float_t b, dml_float_t c, dml_float_t d, }dml_float_t dml_log (dml_float_t x,dml_float_t base) { -return (dml_float_t) (_log (x) /_log (base)); +return (dml_float_t) (_log ((float )x) /_log ((float )base)); }dml_float_t dml_log2 (dml_float_t x) { -return (dml_float_t) (_log (x) /_log (2 )); +return (dml_float_t) (_log ((float )x) /_log (2.0f )); }dml_float_t dml_round (dml_float_t val,dml_bool_t bankers_rounding)
@@ -184,19 +184,19 @@ dml_float_t dml_round(dml_float_t val, dml_bool_t bankers_rounding)// else { // return round(val); double round_pt =0.5 ; -double ceil =dml_ceil (val,1 ); -double floor =dml_floor (val,1 ); +double ceil =dml_ceil (val,1.0 ); +double floor =dml_floor (val,1.0 );if (val - floor >= round_pt) -return ceil; +return (dml_float_t )ceil;else -return floor; +return (dml_float_t )floor;// } }dml_float_t dml_pow (dml_float_t base,int exp) { -return (dml_float_t )dcn_bw_pow (base, exp); +return (dml_float_t )dcn_bw_pow ((float )base, (float )exp); }dml_uint_t dml_round_to_multiple (dml_uint_t num,dml_uint_t multiple,dml_bool_t up)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_translation_helper.c +4 -4
@@ -851,10 +851,10 @@ void dml21_copy_clocks_to_dc_state(struct dml2_context *in_ctx, struct dc_state context->bw_ctx.bw.dcn.clk.socclk_khz = in_ctx->v21.mode_programming.programming->min_clocks.dcn4x.socclk_khz; context->bw_ctx.bw.dcn.clk.subvp_prefetch_dramclk_khz = in_ctx->v21.mode_programming.programming->min_clocks.dcn4x.svp_prefetch_no_throttle.uclk_khz; context->bw_ctx.bw.dcn.clk.subvp_prefetch_fclk_khz = in_ctx->v21.mode_programming.programming->min_clocks.dcn4x.svp_prefetch_no_throttle.fclk_khz; - context->bw_ctx.bw.dcn.clk.stutter_efficiency.base_efficiency = in_ctx->v21.mode_programming.programming->stutter.base_percent_efficiency; - context->bw_ctx.bw.dcn.clk.stutter_efficiency.low_power_efficiency = in_ctx->v21.mode_programming.programming->stutter.low_power_percent_efficiency; - context->bw_ctx.bw.dcn.clk.stutter_efficiency.z8_stutter_efficiency = in_ctx->v21.mode_programming.programming->informative.power_management.z8.stutter_efficiency; - context->bw_ctx.bw.dcn.clk.stutter_efficiency.z8_stutter_period = in_ctx->v21.mode_programming.programming->informative.power_management.z8.stutter_period; + context->bw_ctx.bw.dcn.clk.stutter_efficiency.base_efficiency = (uint8_t )in_ctx->v21.mode_programming.programming->stutter.base_percent_efficiency; + context->bw_ctx.bw.dcn.clk.stutter_efficiency.low_power_efficiency = (uint8_t )in_ctx->v21.mode_programming.programming->stutter.low_power_percent_efficiency; + context->bw_ctx.bw.dcn.clk.stutter_efficiency.z8_stutter_efficiency = (uint8_t )in_ctx->v21.mode_programming.programming->informative.power_management.z8.stutter_efficiency; + context->bw_ctx.bw.dcn.clk.stutter_efficiency.z8_stutter_period = (int )in_ctx->v21.mode_programming.programming->informative.power_management.z8.stutter_period; context->bw_ctx.bw.dcn.clk.zstate_support = in_ctx->v21.mode_programming.programming->z8_stutter.supported_in_blank;/*ignore meets_eco since it is not used*/ }
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_utils.c +1 -1
@@ -267,7 +267,7 @@ static struct dc_stream_state *dml21_add_phantom_stream(struct dml2_context *dml phantom_stream->dst.height = stream_programming->phantom_stream.descriptor.timing.v_active; phantom_stream->src.y =0 ; - phantom_stream->src.height = (double )phantom_stream_descriptor->timing.v_active * (double )main_stream->src.height / (double )main_stream->dst.height; + phantom_stream->src.height = (int )((double )phantom_stream_descriptor->timing.v_active * (double )main_stream->src.height / (double )main_stream->dst.height); phantom_stream->use_dynamic_meta = false;
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_mall_phantom.c +50 -50
170 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_policy.c +3 -3
@@ -123,9 +123,9 @@ int dml2_policy_build_synthetic_soc_states(struct dml2_policy_build_synthetic_so struct dml2_policy_build_synthetic_soc_states_params *p) {int i, j; -unsigned int min_fclk_mhz = p->in_states->state_array[0 ].fabricclk_mhz; -unsigned int min_dcfclk_mhz = p->in_states->state_array[0 ].dcfclk_mhz; -unsigned int min_socclk_mhz = p->in_states->state_array[0 ].socclk_mhz; +unsigned int min_fclk_mhz = (unsigned int )p->in_states->state_array[0 ].fabricclk_mhz; +unsigned int min_dcfclk_mhz = (unsigned int )p->in_states->state_array[0 ].dcfclk_mhz; +unsigned int min_socclk_mhz = (unsigned int )p->in_states->state_array[0 ].socclk_mhz;int max_dcfclk_mhz =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 , max_phyclk_mhz = 0, max_dtbclk_mhz = 0, max_fclk_mhz = 0,
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_translation_helper.c +2 -2
@@ -508,11 +508,11 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc,/* DCFCLK stas values are project specific */ if ((dml2->v20.dml_core_ctx.project == dml_project_dcn32) || (dml2->v20.dml_core_ctx.project == dml_project_dcn321)) { - p->dcfclk_stas_mhz[0 ] = p->in_states->state_array[0 ].dcfclk_mhz; + p->dcfclk_stas_mhz[0 ] = (int )p->in_states->state_array[0 ].dcfclk_mhz; p->dcfclk_stas_mhz[1 ] =615 ; p->dcfclk_stas_mhz[2 ] =906 ; p->dcfclk_stas_mhz[3 ] =1324 ; - p->dcfclk_stas_mhz[4 ] = p->in_states->state_array[1 ].dcfclk_mhz; + p->dcfclk_stas_mhz[4 ] = (int )p->in_states->state_array[1 ].dcfclk_mhz; }else if (dml2->v20.dml_core_ctx.project != dml_project_dcn35 && dml2->v20.dml_core_ctx.project != dml_project_dcn36 && dml2->v20.dml_core_ctx.project != dml_project_dcn351) {
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_utils.c +20 -20
@@ -333,7 +333,7 @@ void dml2_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_state *cont } context->bw_ctx.bw.dcn.compbuf_size_kb -= context->res_ctx.pipe_ctx[dc_pipe_ctx_index].det_buffer_size_kb; - context->res_ctx.pipe_ctx[dc_pipe_ctx_index].plane_res.bw.dppclk_khz =dml_get_dppclk_calculated (&context->bw_ctx.dml2->v20.dml_core_ctx, dml_pipe_idx) *1000 ; + context->res_ctx.pipe_ctx[dc_pipe_ctx_index].plane_res.bw.dppclk_khz = (int )(dml_get_dppclk_calculated (&context->bw_ctx.dml2->v20.dml_core_ctx, dml_pipe_idx) *1000 );if (context->bw_ctx.bw.dcn.clk.dppclk_khz < context->res_ctx.pipe_ctx[dc_pipe_ctx_index].plane_res.bw.dppclk_khz) context->bw_ctx.bw.dcn.clk.dppclk_khz = context->res_ctx.pipe_ctx[dc_pipe_ctx_index].plane_res.bw.dppclk_khz;
@@ -362,10 +362,10 @@ void dml2_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_state *cont context->bw_ctx.bw.dcn.clk.bw_dppclk_khz = context->bw_ctx.bw.dcn.clk.dppclk_khz; context->bw_ctx.bw.dcn.clk.bw_dispclk_khz = context->bw_ctx.bw.dcn.clk.dispclk_khz; - context->bw_ctx.bw.dcn.clk.max_supported_dppclk_khz = in_ctx->v20.dml_core_ctx.states.state_array[in_ctx->v20.scratch.mode_support_params.out_lowest_state_idx].dppclk_mhz - *1000 ; - context->bw_ctx.bw.dcn.clk.max_supported_dispclk_khz = in_ctx->v20.dml_core_ctx.states.state_array[in_ctx->v20.scratch.mode_support_params.out_lowest_state_idx].dispclk_mhz - *1000 ; + context->bw_ctx.bw.dcn.clk.max_supported_dppclk_khz = (int )(in_ctx->v20.dml_core_ctx.states.state_array[in_ctx->v20.scratch.mode_support_params.out_lowest_state_idx].dppclk_mhz + *1000 ); + context->bw_ctx.bw.dcn.clk.max_supported_dispclk_khz = (int )(in_ctx->v20.dml_core_ctx.states.state_array[in_ctx->v20.scratch.mode_support_params.out_lowest_state_idx].dispclk_mhz + *1000 );if (dc->config.forced_clocks || dc->debug.max_disp_clk) { context->bw_ctx.bw.dcn.clk.bw_dispclk_khz = context->bw_ctx.bw.dcn.clk.max_supported_dispclk_khz;
@@ -375,18 +375,18 @@ void dml2_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_state *contvoid dml2_extract_watermark_set (struct dcn_watermarks *watermark,struct display_mode_lib_st *dml_core_ctx) { - watermark->urgent_ns =dml_get_wm_urgent (dml_core_ctx) *1000 ; - watermark->cstate_pstate.cstate_enter_plus_exit_ns =dml_get_wm_stutter_enter_exit (dml_core_ctx) *1000 ; - watermark->cstate_pstate.cstate_exit_ns =dml_get_wm_stutter_exit (dml_core_ctx) *1000 ; - watermark->cstate_pstate.pstate_change_ns =dml_get_wm_dram_clock_change (dml_core_ctx) *1000 ; - watermark->pte_meta_urgent_ns =dml_get_wm_memory_trip (dml_core_ctx) *1000 ; - watermark->frac_urg_bw_nom =dml_get_fraction_of_urgent_bandwidth (dml_core_ctx) *1000 ; - watermark->frac_urg_bw_flip =dml_get_fraction_of_urgent_bandwidth_imm_flip (dml_core_ctx) *1000 ; - watermark->urgent_latency_ns =dml_get_urgent_latency (dml_core_ctx) *1000 ; - watermark->cstate_pstate.fclk_pstate_change_ns =dml_get_wm_fclk_change (dml_core_ctx) *1000 ; - watermark->usr_retraining_ns =dml_get_wm_usr_retraining (dml_core_ctx) *1000 ; - watermark->cstate_pstate.cstate_enter_plus_exit_z8_ns =dml_get_wm_z8_stutter_enter_exit (dml_core_ctx) *1000 ; - watermark->cstate_pstate.cstate_exit_z8_ns =dml_get_wm_z8_stutter (dml_core_ctx) *1000 ; + watermark->urgent_ns = (uint32_t )(dml_get_wm_urgent (dml_core_ctx) *1000 ); + watermark->cstate_pstate.cstate_enter_plus_exit_ns = (uint32_t )(dml_get_wm_stutter_enter_exit (dml_core_ctx) *1000 ); + watermark->cstate_pstate.cstate_exit_ns = (uint32_t )(dml_get_wm_stutter_exit (dml_core_ctx) *1000 ); + watermark->cstate_pstate.pstate_change_ns = (uint32_t )(dml_get_wm_dram_clock_change (dml_core_ctx) *1000 ); + watermark->pte_meta_urgent_ns = (uint32_t )(dml_get_wm_memory_trip (dml_core_ctx) *1000 ); + watermark->frac_urg_bw_nom = (uint32_t )(dml_get_fraction_of_urgent_bandwidth (dml_core_ctx) *1000 ); + watermark->frac_urg_bw_flip = (uint32_t )(dml_get_fraction_of_urgent_bandwidth_imm_flip (dml_core_ctx) *1000 ); + watermark->urgent_latency_ns = (uint32_t )(dml_get_urgent_latency (dml_core_ctx) *1000 ); + watermark->cstate_pstate.fclk_pstate_change_ns = (uint32_t )(dml_get_wm_fclk_change (dml_core_ctx) *1000 ); + watermark->usr_retraining_ns = (uint32_t )(dml_get_wm_usr_retraining (dml_core_ctx) *1000 ); + watermark->cstate_pstate.cstate_enter_plus_exit_z8_ns = (uint32_t )(dml_get_wm_z8_stutter_enter_exit (dml_core_ctx) *1000 ); + watermark->cstate_pstate.cstate_exit_z8_ns = (uint32_t )(dml_get_wm_z8_stutter (dml_core_ctx) *1000 ); } unsigned int dml2_calc_max_scaled_time(
@@ -434,9 +434,9 @@ void dml2_extract_writeback_wm(struct dc_state *context, struct display_mode_libfor (j =0 ; j <4 ; j++) {/*current dml only has one set of watermark, need to follow up*/ bw_writeback->mcif_wb_arb[i].cli_watermark[j] = -dml_get_wm_writeback_urgent (dml_core_ctx) *1000 ; + (unsigned int )(dml_get_wm_writeback_urgent (dml_core_ctx) *1000 ); bw_writeback->mcif_wb_arb[i].pstate_watermark[j] = -dml_get_wm_writeback_dram_clock_change (dml_core_ctx) *1000 ; + (unsigned int )(dml_get_wm_writeback_dram_clock_change (dml_core_ctx) *1000 ); }if (context->res_ctx.pipe_ctx[i].stream->phy_pix_clk !=0 ) {/* time_per_pixel should be in u6.6 format */
@@ -450,7 +450,7 @@ void dml2_extract_writeback_wm(struct dc_state *context, struct display_mode_lib wbif_mode, wb_arb_params->cli_watermark[0]);/*not required any more*/ bw_writeback->mcif_wb_arb[i].dram_speed_change_duration = -dml_get_wm_writeback_dram_clock_change (dml_core_ctx) *1000 ; + (unsigned int )(dml_get_wm_writeback_dram_clock_change (dml_core_ctx) *1000 ); } }
Signature · 1 line
2.43.0
PATCH 17/19 drm/amd/display: Fix DPMS using partially updated pipe context
In reply to Chenyu ChenFrom: Dominik Kaszewski <[email protected]>
[Why & How]
DPMS functions should not use partially updated pipe context passed as argument of commit_planes_do_stream_update, and instead use the one in current_state, which is guaranteed to be the most recently programmed HW config.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +14 -7
@@ -3898,27 +3898,34 @@ static void commit_planes_do_stream_update(struct dc *dc,resource_build_test_pattern_params (&context->res_ctx, pipe_ctx); } +// DPMS should not use partially updated pipe context +struct pipe_ctx *dpms_pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[j]; +if (stream_update->dpms_off) {if (*stream_update->dpms_off) { - dc->link_srv->set_dpms_off (pipe_ctx); + dc->link_srv->set_dpms_off (dpms_pipe_ctx);/* for dpms, keep acquired resources*/ -if (pipe_ctx->stream_res.audio && !dc->debug.az_endpoint_mute_only) - pipe_ctx->stream_res.audio->funcs->az_disable (pipe_ctx->stream_res.audio); +if (dpms_pipe_ctx->stream_res.audio && !dc->debug.az_endpoint_mute_only) { +struct audio *audio = dpms_pipe_ctx->stream_res.audio; + + audio->funcs->az_disable (audio); + } dc->optimized_required = true; }else {if (get_seamless_boot_stream_count (context) ==0 ) dc->hwss.prepare_bandwidth (dc, dc->current_state); - dc->link_srv->set_dpms_on (dc->current_state, pipe_ctx); + dc->link_srv->set_dpms_on (dc->current_state, dpms_pipe_ctx); } - }else if (pipe_ctx->stream->link->wa_flags.blank_stream_on_ocs_change && stream_update->output_color_space - && !stream->dpms_off &&dc_is_dp_signal (pipe_ctx->stream->signal)) { + }else if (dpms_pipe_ctx->stream->link->wa_flags.blank_stream_on_ocs_change && + stream_update->output_color_space && + !stream->dpms_off &&dc_is_dp_signal (dpms_pipe_ctx->stream->signal)) {/* * Workaround for firmware issue in some receivers where they don't pick up * correct output color space unless DP link is disabled/re-enabled */ - dc->link_srv->set_dpms_on (dc->current_state, pipe_ctx); + dc->link_srv->set_dpms_on (dc->current_state, dpms_pipe_ctx); }if (stream_update->abm_level && pipe_ctx->stream_res.abm) {
Signature · 1 line
2.43.0
PATCH 18/19 drm/amd/display: Move dml2_destroy to non-FPU compilation unit
In reply to Chenyu ChenFrom: Rafal Ostrowski <[email protected]>
On PREEMPT_RT kernels, vfree() can sleep because spin_lock is converted to rt_mutex. dml2_destroy() calls vfree() while inside an FPU-guarded region (preempt_count=2), which is illegal.
dml2_wrapper_fpu.c is compiled with CC_FLAGS_FPU which defines _LINUX_FPU_COMPILATION_UNIT, making DC_RUN_WITH_PREEMPTION_ENABLED() resolve to a no-op. This prevents the macro from cycling FPU context off/on around vfree().
Move dml2_destroy() to dml2_wrapper.c (non-FPU compilation unit) where DC_RUN_WITH_PREEMPTION_ENABLED() properly cycles DC_FP_END/ DC_FP_START around vfree(). This pairs it with dml2_allocate_memory() which already lives there.
--- .../drm/amd/display/dc/dml2_0/dml21/dml21_wrapper.c | 4 ++-- drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c | 11 +++++++++++ .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 10 ---------- 3 files changed, 13 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper.c +2 -2
@@ -58,8 +58,8 @@ bool dml21_create(const struct dc *in_dc, struct dml2_context **dml_ctx, const svoid dml21_destroy (struct dml2_context *dml2) { -vfree (dml2->v21.dml_init.dml2_instance); -vfree (dml2->v21.mode_programming.programming); +DC_RUN_WITH_PREEMPTION_ENABLED (vfree (dml2->v21.dml_init.dml2_instance)); +DC_RUN_WITH_PREEMPTION_ENABLED (vfree (dml2->v21.mode_programming.programming)); } void dml21_copy(struct dml2_context *dst_dml_ctx,
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c +11 -0
@@ -108,6 +108,17 @@ bool dml2_create(const struct dc *in_dc, const struct dml2_configuration_optionsreturn true; } +void dml2_destroy (struct dml2_context *dml2) +{ +if (!dml2) +return ; + +if (dml2->architecture == dml2_architecture_21) +dml21_destroy (dml2); + +DC_RUN_WITH_PREEMPTION_ENABLED (vfree (dml2)); +} +void dml2_reinit (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2)
drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c +0 -10
@@ -548,16 +548,6 @@ void dml2_apply_debug_options(const struct dc *dc, struct dml2_context *dml2) } } -void dml2_destroy (struct dml2_context *dml2) -{ -if (!dml2) -return ; - -if (dml2->architecture == dml2_architecture_21) -dml21_destroy (dml2); -vfree (dml2); -} -void dml2_extract_dram_and_fclk_change_support (struct dml2_context *dml2,unsigned int *fclk_change_support,unsigned int *dram_clk_change_support) {
Signature · 1 line
2.43.0
PATCH 19/19 drm/amd/display: Promote DC to 3.2.379
In reply to Chenyu ChenFrom: Taimur Hassan <[email protected]>
This version brings along the following updates:
- Add allow_clock_gating to dcn42 dccg.
- Bypass post csc for additional color spaces in dcn42.
- Remove unused dml2_project.
- Unset Replay desync error verification by default.
- Align HWSS fast commit path with legacy path.
- Fix implicit narrowing conversion warnings.
- Fix double free.
- Introduce power module on Linux.
- Add power module on Linux.
- Fix fpu guard warning.
- Add Replay/PSR active check in link loss status check.
- Remove SYMCLK F and G values from link encoder and MANUAL_FLOW_CONTROL from optc.
- Add minimum vfp requirement.
- Fix narrowing boundaries and eDP parser assignment.
- Fix dml2_0 narrowing boundaries.
- Add README.md file to DML2_0 repository.
- Fix DPMS using partially updated pipe context.
- Move dml2_destroy to non-FPU compilation unit.
--- 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
@@ -63,7 +63,7 @@ struct dcn_dsc_reg_state;struct dcn_optc_reg_state ;struct dcn_dccg_reg_state ; -#define DC_VER "3.2.378" +#define DC_VER "3.2.379"/** * MAX_SURFACES - representative of the upper bound of surfaces that can be piped to a single CRTC
Signature · 1 line
2.43.0
Re: [PATCH 10/19] drm/amd/display: Fix fpu guard warning
In reply to Chenyu ChenQuoted 368 lines · Chenyu Chen
From: Wayne Lin <[email protected]>
[Why]
Due to improper fpu guarding, we encounter this warning during boot up:[ 10.027021] WARNING:
drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/dc_fpu.c:58atdc_assert_fp_enabled+0x12/0x20[amdgpu], CPU#8: (udev-worker)/469 [ 10.027644] Modules linked in:binfmt_miscsnd_ctl_lednls_iso8859_1intel_rapl_msramd_atlintel_rapl_commonamdgpu(+)snd_acp_legacy_machsnd_acp_machsnd_soc_nau8821snd_acp3x_pdm_dmasnd_acp3x_rnsnd_soc_dmicsnd_sof_amd_acp63snd_sof_amd_vangoghsnd_sof_amd_rembrandtsnd_sof_amd_renoirsnd_sof_amd_acpsnd_sof_pcisnd_hda_codec_alc269snd_sof_xtensa_dspsnd_hda_scodec_componentsnd_hda_codec_realtek_libsnd_sofsnd_hda_codec_genericsnd_sof_utilssnd_pci_pssnd_soc_acpi_amd_matchsnd_amd_sdw_acpisoundwire_amdsnd_hda_codec_atihdmisoundwire_generic_allocationsnd_hda_codec_hdmisoundwire_bussnd_soc_sdcaedac_mce_amdsnd_hda_intelsnd_soc_coresnd_hda_codeckvm_amdsnd_compresssnd_hda_coreac97_busee1004 amdxcpsnd_pcm_dmaenginesnd_intel_dspcfgsnd_intel_sdw_acpikvmdrm_panel_backlight_quirkssnd_rpl_pci_acp6xgpu_schedsnd_hwdepsnd_acp_pciirqbypasssnd_amd_acpi_machdrm_buddysnd_acp_legacy_commonsnd_seq_midighash_clmulni_inteldrm_ttm_helperaesni_intelsnd_seq_midi_eventsnd_pci_acp6xjoydev rapl
[ 10.027750]snd_pcmsnd_rawmidittmsnd_seqsnd_pci_acp5xdrm_execdrm_suballoc_helpersnd_seq_devicewmi_bmofsnd_rn_pci_acp3xdrm_display_helpersnd_timersnd_acp_configcecsnd_soc_acpisndrc_corei2c_piix4ccpsnd_pci_acp3xi2c_smbussoundcore k10tempi2c_algo_bitspi_amdcdc_mbiminput_ledscdc_wdmmac_hidsch_fq_codelmsrparport_pcppdev lp parportefi_pstorenfnetlinkdmi_sysfsautofs4cdc_ncmcdc_etherusbnet miihid_logitech_hidpphid_logitech_djhid_genericnvmenvme_coreahciserio_rawnvme_keyringusbhiducsi_acpiamd_xgbenvme_authlibahci hkdftypec_ucsivideo typec wmii2c_hid_acpii2c_hidhid
[ 10.027853] CPU: 8 UID: 0 PID: 469 Comm: (udev-worker) Not tainted 6.19.0asdn-260408-asdn #1 PREEMPT(voluntary)
[ 10.027858] Hardware name: AMD Crater-RN/Crater-RN, BIOS TCR1004A 03/12/2024
[ 10.027861] RIP: 0010:dc_assert_fp_enabled+0x12/0x20 [amdgpu] [ 10.028416] Code: 00 00 00 00 00 0f 1f 00 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 65 8b 05 39 79 cc c4 85 c0 7e 07 31 c0 e9 9e 75 2a c3 <0f> 0b 31 c0 e9 95 75 2a c3 0f 1f 44 00 00 90 90 90 90 90 90 90 90
[ 10.028420] RSP: 0018:ffffcca10188b348 EFLAGS: 00010246 [ 10.028425] RAX: 0000000000000000 RBX:ffff88c6077f8000RCX:
0000000000000000
[ 10.028428] RDX:ffff88c607d0e400RSI:ffffffffc204d860RDI:ffff88c624c00000
[ 10.028430] RBP:ffffcca10188b3e8R08:ffff88c624c35c88R09:
0000000000000000
[ 10.028433] R10: 0000000000000000 R11: 0000000000000000 R12:ffffcca10188b548
[ 10.028435] R13:ffff88c60be5bd00R14:ffffffffc204d860R15:ffff88c624c00000
[ 10.028438] FS: 00007c80c2432980(0000) GS:ffff88cdc7464000(0000) knlGS:0000000000000000
[ 10.028441] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 10.028443] CR2:00007866ae013da8CR3:000000010a511000CR4:0000000000350ef0
[ 10.028446] Call Trace:
[ 10.028449] <TASK>
[ 10.028452] ?dcn21_update_bw_bounding_box+0x38/0xb30[amdgpu] [ 10.028991] ?srso_return_thunk+0x5/0x5f
[ 10.029001]dc_create+0x37c/0x730[amdgpu]
[ 10.029505] ?srso_return_thunk+0x5/0x5f
[ 10.029512]amdgpu_dm_init+0x374/0x2ff0[amdgpu]
[ 10.030053] ?srso_return_thunk+0x5/0x5f
[ 10.030057] ?__irq_work_queue_local+0x61/0xe0
[ 10.030063] ?srso_return_thunk+0x5/0x5f
[ 10.030067] ?irq_work_queue+0x2f/0x70
[ 10.030071] ?srso_return_thunk+0x5/0x5f
[ 10.030075] ?__wake_up_klogd+0x75/0xa0
[ 10.030081] ?srso_return_thunk+0x5/0x5f
[ 10.030085] ?vprintk_emit+0x35b/0x3f0
[ 10.030102]dm_hw_init+0x1c/0x110[amdgpu]
[ 10.030625]amdgpu_device_init+0x23e8/0x3210[amdgpu] [ 10.031041] ?pci_read+0x55/0x90
[ 10.031047] ?srso_return_thunk+0x5/0x5f
[ 10.031051] ?pci_read_config_word+0x27/0x50
[ 10.031057] ?srso_return_thunk+0x5/0x5f
[ 10.031061] ?do_pci_enable_device+0x155/0x180
[ 10.031068]amdgpu_driver_load_kms+0x1a/0xd0[amdgpu] [ 10.031486]amdgpu_pci_probe+0x28c/0x6f0[amdgpu]
[ 10.031902]local_pci_probe+0x47/0xb0
[ 10.031908]pci_device_probe+0xf3/0x270
[ 10.031914]really_probe+0xf1/0x410
[ 10.031920]__driver_probe_device+0x8c/0x190
[ 10.031924]driver_probe_device+0x24/0xd0
[ 10.031928]__driver_attach+0x10b/0x240
[ 10.031932] ?__pfx___driver_attach+0x10/0x10
[ 10.031936]bus_for_each_dev+0x8c/0xf0
[ 10.031942]driver_attach+0x1e/0x30
[ 10.031947]bus_add_driver+0x160/0x2a0
[ 10.031952]driver_register+0x5e/0x130
[ 10.031957] ?__pfx_amdgpu_init+0x10/0x10[amdgpu]
[ 10.032361]__pci_register_driver+0x5e/0x70
[ 10.032366]amdgpu_init+0x5d/0xff0[amdgpu]
[ 10.032768] ?srso_return_thunk+0x5/0x5f
[ 10.032773]do_one_initcall+0x5d/0x340
[ 10.032783]do_init_module+0x97/0x2c0
[ 10.032788]load_module+0x2b49/0x2c30
[ 10.032800]init_module_from_file+0xf4/0x120
[ 10.032804] ?init_module_from_file+0xf4/0x120
[ 10.032813]idempotent_init_module+0x10f/0x300
[ 10.032820]__x64_sys_finit_module+0x73/0xf0
[ 10.032824] ?srso_return_thunk+0x5/0x5f
[ 10.032829]x64_sys_call+0x1d68/0x26b0
[ 10.032834]do_syscall_64+0x81/0x500
[ 10.032839] ?srso_return_thunk+0x5/0x5f
[ 10.032843] ?do_syscall_64+0x2e5/0x500
[ 10.032848] ?srso_return_thunk+0x5/0x5f
[ 10.032852] ?native_flush_tlb_global+0x95/0xb0
[ 10.032860] ?srso_return_thunk+0x5/0x5f
[ 10.032864] ?__flush_tlb_all+0x13/0x60
[ 10.032870] ?srso_return_thunk+0x5/0x5f
[ 10.032874] ?do_flush_tlb_all+0xe/0x20
[ 10.032879] ?srso_return_thunk+0x5/0x5f
[ 10.032882] ?__flush_smp_call_function_queue+0x9c/0x430[ 10.032888] ?srso_return_thunk+0x5/0x5f
[ 10.032897] ?irqentry_exit+0xb2/0x740
[ 10.032901] ?srso_return_thunk+0x5/0x5f
[ 10.032906] ?srso_return_thunk+0x5/0x5f
[ 10.032911]entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 10.032915] RIP: 0033:0x7c80c1d3490d
[ 10.032920] Code: ff c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d d3 f4 0f 00 f7 d8 64 89 01 48
[ 10.032923] RSP: 002b:00007fff3a12fe28 EFLAGS: 00000246ORIG_RAX:
0000000000000139
[ 10.032928] RAX: ffffffffffffffda RBX:00005c44096804f0RCX:00007c80c1d3490d
[ 10.032930] RDX: 0000000000000000 RSI:00005c4409681690RDI:000000000000002b
[ 10.032933] RBP:00007fff3a12fec0R08: 0000000000000000 R09:00005c4409681790
[ 10.032935] R10: 0000000000000000 R11: 0000000000000246 R12:00005c4409681690
[ 10.032937] R13: 0000000000020000 R14:00005c44094ff7f0R15:00005c4409681690
[ 10.032945] </TASK>
[ 10.032948] ---[ end trace 0000000000000000 ]---[How]
Add wrapper function to guard fpu properly for
dcn21/dcn31/dcn315/dcn316.Fixes 1489d86d9ac9 ("drm/amd/display: Move FPU Guards From DML To DC- Part 1")
Reviewed-by Dillon Varone <[email protected]>Reviewed-by Rafal Ostrowski <[email protected]>Signed-off-by Wayne Lin <[email protected]>Signed-off-by Chenyu Chen <[email protected]>---
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 +- drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 2 +- drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 6 +++---
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 6 +++-- -.../gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c| 7
+++++++
.../gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c | 7
+++++++
.../drm/amd/display/dc/resource/dcn315/dcn315_resource.c | 7
+++++++
.../drm/amd/display/dc/resource/dcn316/dcn316_resource.c | 7
+++++++8 files changed, 36 insertions(+), 8 deletions(-)drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +0
-0@@ -2400,7 +2400,7 @@ static struct _vcs_dpi_voltage_scaling_stconstruct_low_pstate_lvl(struct
clk_li
returnlow_pstate_lvl;
}
-voiddcn21_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
+voiddcn21_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params)
{
struct_vcs_dpi_voltage_scaling_st*s = dc-Quoted 1 line
scratch.update_bw_bounding_box.clock_limits;
struct
dcn21_resource_pool*pool = TO_DCN21_RES_POOL(dc-Quoted 1 line
res_pool);drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h +0
-0@@ -78,7 +78,7 @@ int dcn21_populate_dml_pipes_from_context(struct dc *dc,enum
dc_validate_modevalidate_mode);
bool dcn21_validate_bandwidth_fp(struct dc *dc, structdc_state*context, enum
dc_validate_mode,display_e2e_pipe_params_st*pipes);
-voiddcn21_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params);
+voiddcn21_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params);
voiddcn21_clk_mgr_set_bw_params_wm_table(struct clk_bw_params *bw_params);drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +0
-0@@ -587,7 +587,7 @@ void dcn31_calculate_wm_and_dlg_fp(
context->bw_ctx.bw.dcn.compbuf_size_kb= context-Quoted 1 line
bw_ctx.dml.ip.config_return_buffer_size_in_kbytes -
total_det;}
-voiddcn31_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
+voiddcn31_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params)
{
struct_vcs_dpi_voltage_scaling_st*s = dc-Quoted 1 line
scratch.update_bw_bounding_box.clock_limits;
struct
clk_limit_table*clk_table=&bw_params->clk_table;drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +0
-0@@ -665,7 +665,7 @@ void dcn31_update_bw_bounding_box(struct dc *dc,struct
clk_bw_params*bw_paramsdml_init_instance(&dc->dml, &dcn3_1_soc, &dcn3_1_ip, DML_PROJECT_DCN31);
}
-voiddcn315_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
+voiddcn315_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params)
{
structclk_limit_table*clk_table=&bw_params->clk_table; int i,max_dispclk_mhz= 0,max_dppclk_mhz= 0;drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +0
-0@@ -726,7 +726,7 @@ void dcn315_update_bw_bounding_box(struct dc *dc,struct
clk_bw_params*bw_paramdml_init_instance(&dc->dml, &dcn3_15_soc, &dcn3_15_ip, DML_PROJECT_DCN315);
}
-voiddcn316_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)
+voiddcn316_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params)
{
struct_vcs_dpi_voltage_scaling_st*s = dc-Quoted 1 line
scratch.update_bw_bounding_box.clock_limits;
struct
clk_limit_table*clk_table=&bw_params->clk_table;drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h +0
-0@@ -44,9 +44,9 @@ void dcn31_calculate_wm_and_dlg_fp( int pipe_cnt, int vlevel);
-voiddcn31_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params);
-voiddcn315_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params);
-voiddcn316_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params);
+voiddcn31_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params);
+voiddcn315_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params);
+voiddcn316_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_params);
intdcn_get_max_non_odm_pix_rate_100hz(struct _vcs_dpi_soc_bounding_box_st *soc);
int dcn_get_approx_det_segs_required_for_pstate( struct_vcs_dpi_soc_bounding_box_st*soc, diff --gita/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.cb/drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.cindex89a1931b8d23..775cfa901f08100644drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c +0
-0@@ -1395,6 +1395,13 @@ static enum dc_statusdcn21_patch_unknown_plane_state(struct
dc_plane_state*pla returndcn20_patch_unknown_plane_state(plane_state); }
+static voiddcn21_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)drivers/gpu/drm/amd/display/dc/resource/dcn21/dcn21_resource.c +6
-0+{ +DC_FP_START (); +dcn21_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static const struct
resource_funcsdcn21_res_pool_funcs= { .destroy =dcn21_destroy_resource_pool, .link_enc_create =dcn21_link_encoder_create, diff --gita/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.cb/drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.cindex649b5e7c0373..200be0f46ab0100644drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +0
-0@@ -1858,6 +1858,13 @@ static struct dc_cap_funcs cap_funcs = {.get_dcc_compression_cap =
dcn20_get_dcc_compression_cap};
+static voiddcn31_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +6
-0+{ +DC_FP_START (); +dcn31_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static struct
resource_funcsdcn31_res_pool_funcs= { .destroy =dcn31_destroy_resource_pool, .link_enc_create =dcn31_link_encoder_create, diff --gita/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.cb/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.cindex1e86a5e4d113..76b112426f33100644
---a/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.c
+++b/drivers/gpu/drm/amd/display/dc/resource/dcn315/dcn315_resource.cdrivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +0
-0@@ -1853,6 +1853,13 @@ static struct dc_cap_funcs cap_funcs = {.get_dcc_compression_cap =
dcn20_get_dcc_compression_cap};
+static voiddcn315_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +6
-0+{ +DC_FP_START (); +dcn315_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +static struct
resource_funcsdcn315_res_pool_funcs= { .destroy =dcn315_destroy_resource_pool, .link_enc_create =dcn31_link_encoder_create, diff --gita/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.cb/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.cindex6369fc90f84b..2d34db42dd83100644
---a/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.c
+++b/drivers/gpu/drm/amd/display/dc/resource/dcn316/dcn316_resource.cdrivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +0
-0@@ -1729,6 +1729,13 @@ static struct dc_cap_funcs cap_funcs = {.get_dcc_compression_cap =
dcn20_get_dcc_compression_cap};
+static voiddcn316_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_params)drivers/gpu/drm/amd/display/dc/resource/dcn31/dcn31_resource.c +6
-0+{ +DC_FP_START (); +dcn316_update_bw_bounding_box_fpu (dc, bw_params); +DC_FP_END (); +} +
Quoted 3 lines
static struct
resource_funcsdcn316_res_pool_funcs= { .destroy =dcn316_destroy_resource_pool, .link_enc_create =dcn31_link_encoder_create,
Confirmed this fixes the dc_assert_fp_enabled warning on Ryzen 7000 (Raphael) iGPU (dcn315). Independently arrived at the same fix for the dcn31 family before noticing this series — dropping my duplicate submission [1].
[Public]
Hi all,
This week this patchset was tested on 4 systems, two dGPU and two APU based, and tested across multiple display and connection types.
APU
* Single Display eDP -> 1080p 60hz, 1920x1200 165hz, 3840x2400 60hz
* Single Display DP (SST DSC) -> 4k144hz, 4k240hz
* Multi display -> eDP + DP/HDMI/USB-C -> 1080p 60hz eDP + 4k 144hz, 4k 240hz (Includes USB-C to DP/HDMI adapters)
* Thunderbolt -> LG Ultrafine 5k
* MST DSC -> Cable Matters 101075 (DP to 3x DP) with 3x 4k60hz displays, HP Hook G2 with 2x 4k60hz displays
* USB 4 -> HP Hook G4, Lenovo Thunderbolt Dock, both with 2x 4k60hz DP and 1x 4k60hz HDMI displays
* SST PCON -> Club3D CAC-1085 + 1x 4k 144hz, FRL3, at a max resolution supported by the dongle of 4k 120hz YUV420 12bpc.
* MST PCON -> 1x 4k 144hz, FRL3, at a max resolution supported by the adapter of 4k 120hz RGB 8bpc.
DGPU
* Single Display DP (SST DSC) -> 4k144hz, 4k240hz
* Multiple Display DP -> 4k240hz + 4k144hz
* MST (Startech MST14DP123DP [DP to 3x DP] and 2x 4k 60hz displays)
* MST DSC (with Cable Matters 101075 [DP to 3x DP] with 3x 4k60hz displays)
The testing is a mix of automated and manual tests. Manual testing includes (but is not limited to)
* Changing display configurations and settings
* Video/Audio playback
* Benchmark testing
* Suspend/Resume testing
* Feature testing (Freesync, HDCP, etc.)
Automated testing includes (but is not limited to)
* Script testing (scripts to automate some of the manual checks)
* IGT testing
The testing is mainly tested on the following displays, but occasionally there are tests with other displays
* Samsung G8 Neo 4k240hz
* Samsung QN55QN95B 4k 120hz
* Acer XV322QKKV 4k144hz
* HP U27 4k Wireless 4k60hz
* LG 27UD58B 4k60hz
* LG 32UN650WA 4k60hz
* LG Ultrafine 5k 5k60hz
* AU Optronics B140HAN01.1 1080p 60hz eDP
* AU Optronics B160UAN01.J 1920x1200 165hz eDP
* Samsung ATNA60YV02-0 3840x2400 60Hz OLED eDP
The patchset consists of the amd-staging-drm-next branch (Head commit - 5fc862467a34397739ce66733b6344c4e671ef50 -> drm/amdgpu/userq: unmap_helper dont return the queue state) with new patches added on top of it.
Tested on Ubuntu 24.04.3, on Wayland and X11, using Gnome.
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
amd.com
Thank you,
Dan Wheeler
Sr. Technologist | AMD
SW Display
------------------------------------------------------------------------------------------------------------------
1 Commerce Valley Dr E, Thornhill, ON L3T 7X6
amd.com
-----Original Message-----
From: Chenyu Chen <[email protected]>
Sent: Wednesday, April 15, 2026 3:40 AM
To: [email protected]
Cc: Wentland, Harry <[email protected]>; Li, Sun peng (Leo) <[email protected]>; Pillai, Aurabindo <[email protected]>; Li, Roman <[email protected]>; Lin, Wayne <[email protected]>; Chung, ChiaHsuan (Tom) <[email protected]>; Zuo, Jerry <[email protected]>; Wheeler, Daniel <[email protected]>; Wu, Ray <[email protected]>; LIPSKI, IVAN <[email protected]>; Hung, Alex <[email protected]>; Tseng, Chuan Yu (Max) <[email protected]>; Chen, Chen-Yu <[email protected]>
Subject: [PATCH 00/19] DC Patches Apr 20 2026
This DC patchset brings improvements in multiple areas. In summary, we highlight:
- Add allow_clock_gating to dcn42 dccg.
- Bypass post csc for additional color spaces in dcn42.
- Remove unused dml2_project.
- Unset Replay desync error verification by default.
- Align HWSS fast commit path with legacy path.
- Fix implicit narrowing conversion warnings.
- Enable driver power gating.
- Fix double free.
- Introduce power module on Linux.
- Add power module on Linux.
- Fix fpu guard warning.
- Add Replay/PSR active check in link loss status check.
- Remove SYMCLK F and G values from link encoder and MANUAL_FLOW_CONTROL from optc.
- Add minimum vfp requirement.
- Fix narrowing boundaries and eDP parser assignment.
- Fix dml2_0 narrowing boundaries.
- Add README.md file to DML2_0 repository.
- Fix DPMS using partially updated pipe context.
- Move dml2_destroy to non-FPU compilation unit.
Allen Li (2):
drm/amd/display: Unset Replay desync error verification by default drm/amd/display: Add Replay/PSR active check in link loss status check
Andrew Lichmanov (1):
drm/amd/display: Remove SYMCLK F and G values from link encoder and
MANUAL_FLOW_CONTROL from optc
Dillon Varone (1):
drm/amd/display: Add minimum vfp requirement
Dominik Kaszewski (1):
drm/amd/display: Fix DPMS using partially updated pipe context
Gaghik Khachatrian (3):
drm/amd/display: Fix implicit narrowing conversion warnings drm/amd/display: Fix narrowing boundaries and eDP parser assignment drm/amd/display: Fix dml2_0 narrowing boundaries
Ilya Bakoulin (1):
drm/amd/display: Fix double free
Rafal Ostrowski (2):
drm/amd/display: Align HWSS fast commit path with legacy path drm/amd/display: Move dml2_destroy to non-FPU compilation unit
Ray Wu (2):
drm/amd/display: Introduce power module on Linux drm/amd/display: Add power module on Linux
Roman Li (3):
drm/amd/display: Add allow_clock_gating to dcn42 dccg drm/amd/display: bypass post csc for additional color spaces in dcn42 drm/amd/display: Remove unused dml2_project
Samson Tam (1):
drm/amd/display: Add README.md file to DML2_0 repository
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.379
Wayne Lin (1):
drm/amd/display: Fix fpu guard warning
.../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 344 +- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 36 +- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 74 +- .../amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 5 +- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 60 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 26 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 242 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 13 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.c | 143 +- .../amd/display/amdgpu_dm/amdgpu_dm_replay.h | 28 +- .../display/amdgpu_dm/amdgpu_dm_services.c | 27 + .../drm/amd/display/dc/basics/custom_float.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- .../gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +- .../drm/amd/display/dc/bios/bios_parser2.c | 21 +- .../drm/amd/display/dc/bios/command_table.c | 12 +- .../drm/amd/display/dc/bios/command_table2.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 39 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 13 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 14 +- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 15 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 15 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 43 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 16 +- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 40 +- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 22 +- .../amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 1 - drivers/gpu/drm/amd/display/dc/core/dc.c | 206 +- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 565 ++- .../gpu/drm/amd/display/dc/core/dc_resource.c | 66 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 26 +- .../gpu/drm/amd/display/dc/core/dc_surface.c | 2 +- drivers/gpu/drm/amd/display/dc/dc.h | 17 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 137 +- drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 6 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 12 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 38 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 30 + .../amd/display/dc/dccg/dcn31/dcn31_dccg.c | 4 +- .../amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 +- .../amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- .../drm/amd/display/dc/dce/dce_clock_source.c | 24 +- .../gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 2 +- .../gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 +- .../drm/amd/display/dc/dce/dce_panel_cntl.c | 4 +- .../drm/amd/display/dc/dce/dce_transform.c | 8 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 14 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 12 +- .../gpu/drm/amd/display/dc/dce/dmub_replay.c | 23 +- .../display/dc/dce80/dce80_timing_generator.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 4 +- .../drm/amd/display/dc/dcn30/dcn30_mmhubbub.c | 16 +- .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 2 +- .../dc/dio/dcn42/dcn42_dio_link_encoder.h | 2 - .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 4 +- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 5 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 9 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 2 +- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 6 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 6 +- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 37 +- .../gpu/drm/amd/display/dc/dml2_0/README.md | 31 + .../amd/display/dc/dml2_0/display_mode_core.c | 14 +- .../amd/display/dc/dml2_0/display_mode_util.c | 20 +- .../dml2_0/dml21/dml21_translation_helper.c | 15 +- .../amd/display/dc/dml2_0/dml21/dml21_utils.c | 2 +- .../display/dc/dml2_0/dml21/dml21_wrapper.c | 4 +- .../dc/dml2_0/dml21/inc/dml_top_types.h | 1 - .../dml21/src/dml2_core/dml2_core_factory.c | 1 - .../dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - .../dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - .../dml21/src/dml2_pmo/dml2_pmo_factory.c | 3 +- .../dml21/src/dml2_top/dml2_top_interfaces.c | 1 - .../amd/display/dc/dml2_0/dml2_mall_phantom.c | 100 +- .../drm/amd/display/dc/dml2_0/dml2_policy.c | 6 +- .../dc/dml2_0/dml2_translation_helper.c | 4 +- .../drm/amd/display/dc/dml2_0/dml2_utils.c | 40 +- .../drm/amd/display/dc/dml2_0/dml2_wrapper.c | 11 + .../amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 10 - .../drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 6 +- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 16 +- .../gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 33 +- drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 2 +- .../gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 2 +- drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 9 + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- .../display/dc/hubbub/dcn10/dcn10_hubbub.c | 16 +- .../display/dc/hubbub/dcn20/dcn20_hubbub.c | 28 +- .../display/dc/hubbub/dcn20/dcn20_hubbub.h | 3 + .../display/dc/hubbub/dcn21/dcn21_hubbub.c | 12 +- .../display/dc/hubbub/dcn30/dcn30_hubbub.c | 12 +- .../display/dc/hubbub/dcn31/dcn31_hubbub.c | 12 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 4 +- .../amd/display/dc/hubp/dcn21/dcn21_hubp.c | 4 +- .../amd/display/dc/hubp/dcn30/dcn30_hubp.c | 4 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 33 +- .../amd/display/dc/hwss/dce120/dce120_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 13 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 8 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 16 +- .../amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 18 +- .../drm/amd/display/dc/hwss/hw_sequencer.h | 138 + drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- .../dc/irq/dce110/irq_service_dce110.c | 2 +- .../display/dc/link/accessories/link_dp_cts.c | 37 +- .../display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- .../drm/amd/display/dc/link/link_detection.c | 4 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 16 +- .../drm/amd/display/dc/link/link_factory.c | 6 +- .../amd/display/dc/link/protocols/link_ddc.c | 5 +- .../dc/link/protocols/link_dp_capability.c | 2 +- .../display/dc/link/protocols/link_dp_dpia.c | 2 +- .../dc/link/protocols/link_dp_dpia_bw.c | 10 +- .../dc/link/protocols/link_dp_irq_handler.c | 57 +- .../dc/link/protocols/link_dp_panel_replay.c | 27 +- .../link/protocols/link_dp_training_8b_10b.c | 10 +- .../link/protocols/link_edp_panel_control.c | 41 +- .../dc/mmhubbub/dcn20/dcn20_mmhubbub.c | 4 +- .../dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- .../amd/display/dc/optc/dcn20/dcn20_optc.c | 4 +- .../amd/display/dc/optc/dcn42/dcn42_optc.h | 1 - .../dc/resource/dce110/dce110_resource.c | 4 +- .../dc/resource/dcn10/dcn10_resource.c | 4 +- .../dc/resource/dcn20/dcn20_resource.c | 24 +- .../dc/resource/dcn21/dcn21_resource.c | 9 +- .../dc/resource/dcn30/dcn30_resource.c | 14 +- .../dc/resource/dcn301/dcn301_resource.c | 8 +- .../dc/resource/dcn302/dcn302_resource.c | 4 +- .../dc/resource/dcn303/dcn303_resource.c | 4 +- .../dc/resource/dcn31/dcn31_resource.c | 11 +- .../dc/resource/dcn314/dcn314_resource.c | 4 +- .../dc/resource/dcn315/dcn315_resource.c | 11 +- .../dc/resource/dcn316/dcn316_resource.c | 11 +- .../dc/resource/dcn32/dcn32_resource.c | 20 +- .../resource/dcn32/dcn32_resource_helpers.c | 2 +- .../dc/resource/dcn321/dcn321_resource.c | 4 +- .../dc/resource/dcn35/dcn35_resource.c | 4 +- .../dc/resource/dcn351/dcn351_resource.c | 4 +- .../dc/resource/dcn36/dcn36_resource.c | 4 +- .../dc/resource/dcn401/dcn401_resource.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 4 +- .../dcn401/dcn401_soc_and_ip_translator.c | 42 +- .../dcn42/dcn42_soc_and_ip_translator.c | 14 +- .../drm/amd/display/modules/inc/mod_power.h | 415 +++ .../display/modules/info_packet/info_packet.c | 2 +- .../drm/amd/display/modules/power/Makefile | 2 +- .../gpu/drm/amd/display/modules/power/power.c | 3030 +++++++++++++++++ .../amd/display/modules/power/power_helpers.c | 16 +- 159 files changed, 5833 insertions(+), 1416 deletions(-) create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/README.md create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_power.h create mode 100644 drivers/gpu/drm/amd/display/modules/power/power.c
--
2.43.0