DC Patches May 4 2026
cover DC Patches May 4 2026
Start from:3bba7c80f8576f0cf68753abe25c1ca2a0f17018
SWDEV-553782 - test/diags: tcd-tts mapping - keyword search (#28664)
Stopped at:6ee9f5160ad6e0bf672329f7680398e718fc56f5
SWDEV-114487 - modules: [BACKPORT] drm/amd/display: Fix divide by zero in calc_psr_num_static_frames
This version brings along following update:
-add max bandwidth budget to QoS interface -Update tmz field for LSDMA -fix buffer overruns warnings -add memory bandwidth override debug interface -Find link encoder for flexible DIG mapping cases -Fix type mismatches using guards and explicit casts -Fix type mismatches in DC and DMUB modules -Skip HDR metadata update when Smart Power OLED enabled -Rename backlight_properties to pwr_backlight_properties -remove watermark range notify -Clean Up Legacy DML Content -Implement block sequencing infrastructure for modular hardware operations. -Do DML float narrowing explicit -Fix type mismatches in DML and normalize loop bounds -Remove unused state param from enable_link_analog -Fix Color Manager (3DLUT, Shaper, Blend)
Alex Hung (1):
drm/amd/display: Remove unused state param from enable_link_analog
Alvin Lee (1):
drm/amd/display: Update tmz field for LSDMA
Bhuvanachandra Pinninti (1):
drm/amd/display: Implement block sequencing infrastructure for modular
hardware operations.
Charlene Liu (1):
drm/amd/display: remove watermark range notify
Dillon Varone (1):
drm/amd/display: Fix Color Manager (3DLUT, Shaper, Blend)
Gaghik Khachatrian (5):
drm/amd/display: Fix type mismatches in DML and normalize loop bounds drm/amd/display: Do DML float narrowing explicit drm/amd/display: Fix type mismatches in DC and DMUB modules drm/amd/display: Fix type mismatches using guards and explicit casts drm/amd/display: fix buffer overruns warnings
Ian Chen (1):
drm/amd/display: Skip HDR metadata update when Smart Power OLED
enabled
Ovidiu Bunea (1):
drm/amd/display: Find link encoder for flexible DIG mapping cases
Ray Wu (1):
drm/amd/display: Rename backlight_properties to
pwr_backlight_properties
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.381
Wenjing Liu (2):
drm/amd/display: add memory bandwidth override debug interface drm/amd/display: add max bandwidth budget to QoS interface
Zheng, Austin (1):
drm/amd/display: Clean Up Legacy DML Content
.../drm/amd/display/dc/basics/conversion.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 30 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 17 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 30 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 41 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 55 +- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 53 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 43 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 21 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 111 +-- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 19 +- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 26 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 643 +++++++++++++++--- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 597 ++++++++++++++-- .../drm/amd/display/dc/core/dc_link_enc_cfg.c | 11 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 67 +- .../gpu/drm/amd/display/dc/core/dc_state.c | 4 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 14 +- .../gpu/drm/amd/display/dc/core/dc_surface.c | 6 +- drivers/gpu/drm/amd/display/dc/dc.h | 74 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 11 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 24 - drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 +- .../drm/amd/display/dc/dce/dce_link_encoder.c | 3 +- .../drm/amd/display/dc/dce/dce_transform.c | 4 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 12 +- .../dc/dcn10/dcn10_hw_sequencer_debug.c | 22 +- .../drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 2 +- .../amd/display/dc/dcn30/dcn30_cm_common.c | 8 +- .../display/dc/dio/dcn10/dcn10_link_encoder.c | 11 +- .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 6 +- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 9 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +- .../dc/dml/dcn20/display_mode_vba_20.c | 36 +- .../dc/dml/dcn20/display_mode_vba_20v2.c | 36 +- .../dc/dml/dcn21/display_mode_vba_21.c | 36 +- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 14 +- .../dc/dml/dcn30/display_mode_vba_30.c | 83 +-- .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 5 +- .../amd/display/dc/dml/dcn302/dcn302_fpu.c | 2 +- .../amd/display/dc/dml/dcn303/dcn303_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 15 +- .../dc/dml/dcn31/display_mode_vba_31.c | 121 ++-- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +- .../dc/dml/dcn314/display_mode_vba_314.c | 129 ++-- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 75 +- .../dc/dml/dcn32/display_mode_vba_32.c | 21 +- .../dc/dml/dcn32/display_mode_vba_util_32.c | 2 +- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 46 +- .../drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 5 +- .../amd/display/dc/dml/dcn351/dcn351_fpu.c | 5 +- .../drm/amd/display/dc/dml/display_mode_vba.c | 4 +- .../drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- .../dml21/src/dml2_mcg/dml2_mcg_dcn42.c | 2 +- .../dml21/src/dml2_top/dml2_top_legacy.h | 9 - .../amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 2 +- .../amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c | 2 +- .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 13 +- .../amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 2 +- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 2 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 3 +- .../amd/display/dc/dsc/dcn401/dcn401_dsc.c | 3 +- .../hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- .../display/dc/hubbub/dcn401/dcn401_hubbub.c | 7 +- .../display/dc/hubbub/dcn42/dcn42_hubbub.c | 5 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 2 +- .../amd/display/dc/hubp/dcn401/dcn401_hubp.c | 201 ++---- .../amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- .../amd/display/dc/hubp/dcn42/dcn42_hubp.c | 78 +-- .../amd/display/dc/hubp/dcn42/dcn42_hubp.h | 10 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 38 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 55 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 34 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 15 +- .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 32 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 68 +- .../amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 432 ++++++++---- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 520 ++++++++++++-- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 9 +- .../drm/amd/display/dc/hwss/hw_sequencer.h | 353 ++++++++-- .../gpu/drm/amd/display/dc/inc/core_types.h | 10 +- .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 35 +- drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 79 +-- .../amd/display/dc/inc/hw/stream_encoder.h | 1 + .../display/dc/inc/soc_and_ip_translator.h | 19 +- .../drm/amd/display/dc/link/link_detection.c | 6 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 10 +- .../drm/amd/display/dc/link/link_factory.c | 2 +- .../drm/amd/display/dc/link/link_validation.c | 4 +- .../dc/link/protocols/link_dp_capability.c | 4 +- .../dc/link/protocols/link_dp_dpia_bw.c | 2 +- .../dc/link/protocols/link_dp_irq_handler.c | 2 +- .../dc/link/protocols/link_dp_training.c | 4 +- .../drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 2 +- .../amd/display/dc/mpc/dcn401/dcn401_mpc.c | 177 +++-- .../amd/display/dc/mpc/dcn401/dcn401_mpc.h | 25 +- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 388 ++++++++++- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 49 +- .../amd/display/dc/optc/dcn10/dcn10_optc.c | 2 +- .../amd/display/dc/pg/dcn35/dcn35_pg_cntl.c | 6 +- .../amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 1 - .../dcn42/dcn42_soc_and_ip_translator.c | 6 +- .../drm/amd/display/dmub/src/dmub_dcn401.c | 2 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 2 +- .../amd/display/modules/color/color_gamma.c | 12 +- .../gpu/drm/amd/display/modules/power/power.c | 28 +- .../gpu/drm/amd/display/modules/vmid/vmid.c | 6 +- 121 files changed, 3870 insertions(+), 1702 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h
Signature · 1 line
2.43.0
PATCH 1/17 drm/amd/display: Fix Color Manager (3DLUT, Shaper, Blend)
From: Dillon Varone <[email protected]>
[WHY & HOW]
The original refactor and fixes are causing regressions. Revert them for now until they can be resolved
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 70 ++- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 1 - .../gpu/drm/amd/display/dc/core/dc_stream.c | 2 + drivers/gpu/drm/amd/display/dc/dc.h | 58 +- drivers/gpu/drm/amd/display/dc/dc_types.h | 24 - .../amd/display/dc/hubp/dcn401/dcn401_hubp.c | 201 +++---- .../amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- .../amd/display/dc/hubp/dcn42/dcn42_hubp.c | 78 +-- .../amd/display/dc/hubp/dcn42/dcn42_hubp.h | 10 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 389 +++++++++----- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 499 ++++++++++++++++-- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 9 +- drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 35 +- drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 79 ++- .../amd/display/dc/mpc/dcn401/dcn401_mpc.c | 177 +++---- .../amd/display/dc/mpc/dcn401/dcn401_mpc.h | 25 +- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 388 ++++++++++++-- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 49 +- .../dc/resource/dcn42/dcn42_resource.c | 1 - 19 files changed, 1438 insertions(+), 680 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +49 -21
@@ -2962,27 +2962,16 @@ static struct surface_update_descriptor det_surface_update(elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } -if (u->cm || (u->gamma &&dce_use_lut (u->plane_info ? u->plane_info->format : u->surface->format))) { +if (u->blend_tf || (u->gamma &&dce_use_lut (u->plane_info ? u->plane_info->format : u->surface->format))) { update_flags->bits.gamma_change =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } -if (u->cm && (u->cm->flags.bits.lut3d_enable || u->surface->cm.flags.bits.lut3d_enable)) { +if (u->lut3d_func || u->func_shaper) { update_flags->bits.lut_3d =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } -if (u->cm && u->cm->flags.bits.lut3d_dma_enable != u->surface->cm.flags.bits.lut3d_dma_enable && - u->cm->flags.bits.lut3d_enable && u->surface->cm.flags.bits.lut3d_enable) { -/* Toggling 3DLUT loading between DMA and Host is illegal */ -BREAK_TO_DEBUGGER (); - } - -if (u->cm && u->cm->flags.bits.lut3d_enable && !u->cm->flags.bits.lut3d_dma_enable) { -/* Host loading 3DLUT requires full update but only stream lock */ -elevate_update_type (&overall_type,UPDATE_TYPE_FULL ,LOCK_DESCRIPTOR_STREAM ); - } -if (u->hdr_mult.value)if (u->hdr_mult.value != u->surface->hdr_mult.value) {// TODO: Should be fast?
@@ -3001,6 +2990,20 @@ static struct surface_update_descriptor det_surface_update( update_flags->bits.cm_hist_change =1 ;elevate_update_type (&overall_type,UPDATE_TYPE_FAST ,LOCK_DESCRIPTOR_STREAM ); } +if (u->cm2_params) { +if (u->cm2_params->component_settings.shaper_3dlut_setting != u->surface->mcm_shaper_3dlut_setting + || u->cm2_params->component_settings.lut1d_enable != u->surface->mcm_lut1d_enable + || u->cm2_params->cm2_luts.lut3d_data.lut3d_src != u->surface->mcm_luts.lut3d_data.lut3d_src) { + update_flags->bits.mcm_transfer_function_enable_change =1 ; +elevate_update_type (&overall_type,UPDATE_TYPE_FULL ,LOCK_DESCRIPTOR_GLOBAL ); + } + } + +if (update_flags->bits.lut_3d && + u->surface->mcm_luts.lut3d_data.lut3d_src !=DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM ) { +elevate_update_type (&overall_type,UPDATE_TYPE_FULL ,LOCK_DESCRIPTOR_GLOBAL ); + } + if (check_config->enable_legacy_fast_update && (update_flags->bits.gamma_change || update_flags->bits.gamut_remap_change ||
@@ -3312,12 +3315,24 @@ static void copy_surface_update_to_plane( sizeof(struct dc_transfer_func_distributed_points)); } -/* Shaper, 3DLUT, 1DLUT */ -if (srf_update->cm) { -memcpy (&surface->cm, srf_update->cm, -sizeof (surface->cm)); +if (srf_update->cm2_params) { + surface->mcm_shaper_3dlut_setting = srf_update->cm2_params->component_settings.shaper_3dlut_setting; + surface->mcm_lut1d_enable = srf_update->cm2_params->component_settings.lut1d_enable; + surface->mcm_luts = srf_update->cm2_params->cm2_luts; + } + +if (srf_update->func_shaper) { +memcpy (&surface->in_shaper_func, srf_update->func_shaper, +sizeof (surface->in_shaper_func)); + +if (surface->mcm_shaper_3dlut_setting >=DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER ) + surface->mcm_luts.shaper = &surface->in_shaper_func; } +if (srf_update->lut3d_func) +memcpy (&surface->lut3d_func, srf_update->lut3d_func, +sizeof (surface->lut3d_func)); +if (srf_update->hdr_mult.value) surface->hdr_mult = srf_update->hdr_mult;
@@ -3326,6 +3341,17 @@ static void copy_surface_update_to_plane( surface->sdr_white_level_nits = srf_update->sdr_white_level_nits; +if (srf_update->blend_tf) { +memcpy (&surface->blend_tf, srf_update->blend_tf, +sizeof (surface->blend_tf)); + +if (surface->mcm_lut1d_enable) + surface->mcm_luts.lut1d_func = &surface->blend_tf; + } + +if (srf_update->cm2_params || srf_update->blend_tf) + surface->lut_bank_a = !surface->lut_bank_a; +if (srf_update->input_csc_color_matrix) surface->input_csc_color_matrix = *srf_update->input_csc_color_matrix;
@@ -4619,9 +4645,11 @@ static void commit_planes_for_stream(struct dc *dc,if (!should_update_pipe_for_plane (context, pipe_ctx, plane_state))continue ; -if (srf_updates[i].cm && - srf_updates[i].cm->flags.bits.lut3d_enable && - srf_updates[i].cm->flags.bits.lut3d_dma_enable && +if (srf_updates[i].cm2_params && + srf_updates[i].cm2_params->cm2_luts.lut3d_data.lut3d_src == +DC_CM2_TRANSFER_FUNC_SOURCE_VIDMEM && + srf_updates[i].cm2_params->component_settings.shaper_3dlut_setting == +DC_CM2_SHAPER_3DLUT_SETTING_ENABLE_SHAPER_3DLUT && dc->hwss.trigger_3dlut_dma_load) dc->hwss.trigger_3dlut_dma_load (dc, pipe_ctx);
@@ -6865,7 +6893,7 @@ bool dc_capture_register_software_state(struct dc *dc, struct dc_register_softwastruct dc_plane_state *plane_state = pipe_ctx->plane_state;/* MPCC blending tree and mode control - capture actual blend configuration */ - state->mpc.mpcc_mode[i] = (plane_state->cm.blend_func.type !=TF_TYPE_BYPASS ) ?1 :0 ; + state->mpc.mpcc_mode[i] = (plane_state->blend_tf.type !=TF_TYPE_BYPASS ) ?1 :0 ; state->mpc.mpcc_alpha_blend_mode[i] = plane_state->per_pixel_alpha ?1 :0 ; state->mpc.mpcc_alpha_multiplied_mode[i] = plane_state->pre_multiplied_alpha ?1 :0 ; state->mpc.mpcc_blnd_active_overlap_only[i] =0 ;/* Default - no overlap restriction */
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +0 -1
@@ -39,7 +39,6 @@#include "abm.h" #include "dcn10/dcn10_hubbub.h" #include "dce/dmub_hw_lock_mgr.h" -#include "custom_float.h" #include "link_service.h" #define MAX_NUM_MCACHE 8
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +2 -0
@@ -1002,6 +1002,7 @@ void dc_stream_release_3dlut_for_stream(if (rmcm_3dlut) { rmcm_3dlut->isInUse = false; rmcm_3dlut->stream =NULL ; + rmcm_3dlut->protection_bits =0 ; } }
@@ -1013,6 +1014,7 @@ void dc_stream_init_rmcm_3dlut(struct dc *dc)for (int i =0 ; i < num_rmcm; i++) { dc->res_pool->rmcm_3dlut[i].isInUse = false; dc->res_pool->rmcm_3dlut[i].stream =NULL ; + dc->res_pool->rmcm_3dlut[i].protection_bits =0 ; } }
drivers/gpu/drm/amd/display/dc/dc.h +10 -48
94 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dc_types.h +0 -24
@@ -1523,28 +1523,4 @@ struct dc_validation_dpia_set { uint32_t required_bw; }; -enum dc_cm_lut_swizzle { -CM_LUT_3D_SWIZZLE_LINEAR_RGB , -CM_LUT_3D_SWIZZLE_LINEAR_BGR , -CM_LUT_1D_PACKED_LINEAR -}; - -enum dc_cm_lut_pixel_format { -CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12MSB , -CM_LUT_PIXEL_FORMAT_BGRA16161616_UNORM_12MSB , -CM_LUT_PIXEL_FORMAT_RGBA16161616_UNORM_12LSB , -CM_LUT_PIXEL_FORMAT_BGRA16161616_UNORM_12LSB , -CM_LUT_PIXEL_FORMAT_RGBA16161616_FLOAT_FP1_5_10 , -CM_LUT_PIXEL_FORMAT_BGRA16161616_FLOAT_FP1_5_10 -}; - -enum dc_cm_lut_size { -CM_LUT_SIZE_NONE , -CM_LUT_SIZE_999 , -CM_LUT_SIZE_171717 , -CM_LUT_SIZE_333333 , -CM_LUT_SIZE_454545 , -CM_LUT_SIZE_656565 , -}; -#endif /* DC_TYPES_H_ */
drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c +67 -134
261 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h +19 -4
@@ -328,17 +328,32 @@ int hubp401_get_3dlut_fl_done(struct hubp *hubp);void hubp401_set_unbounded_requesting (struct hubp *hubp,bool enable); +void hubp401_update_3dlut_fl_bias_scale (struct hubp *hubp,uint16_t bias,uint16_t scale); +void hubp401_program_3dlut_fl_crossbar (struct hubp *hubp, -const enum dc_cm_lut_pixel_format format); +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_y_g, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_cb_b, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_cr_r); + +void hubp401_program_3dlut_fl_tmz_protected (struct hubp *hubp,uint8_t protection_bits); + +void hubp401_program_3dlut_fl_width (struct hubp *hubp,enum hubp_3dlut_fl_width width); + +void hubp401_program_3dlut_fl_addressing_mode (struct hubp *hubp,enum hubp_3dlut_fl_addressing_mode addr_mode);void hubp401_enable_3dlut_fl (struct hubp *hubp,bool enable);void hubp401_program_3dlut_fl_dlg_param (struct hubp *hubp,int refcyc_per_3dlut_group); -void hubp401_program_3dlut_fl_addr (struct hubp *hubp,const struct dc_plane_address *address); +void hubp401_program_3dlut_fl_addr (struct hubp *hubp,const struct dc_plane_address address); -void hubp401_program_3dlut_fl_config (struct hubp *hubp, -const struct dc_3dlut_dma *config); +void hubp401_program_3dlut_fl_format (struct hubp *hubp,enum hubp_3dlut_fl_format format); + +void hubp401_program_3dlut_fl_mode (struct hubp *hubp,enum hubp_3dlut_fl_mode mode); + +void hubp401_program_3dlut_fl_config ( +struct hubp *hubp, +struct hubp_fl_3dlut_config *cfg);void hubp401_clear_tiling (struct hubp *hubp);
drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c +9 -69
103 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h +5 -5
@@ -58,11 +58,11 @@ bool hubp42_construct(const struct dcn_hubp2_shift *hubp_shift, const struct dcn_hubp2_mask *hubp_mask); -void hubp42_program_3dlut_fl_crossbar (struct hubp *hubp, -const enum dc_cm_lut_pixel_format format); - -void hubp42_program_3dlut_fl_config (struct hubp *hubp, -const struct dc_3dlut_dma *config); +void hubp42_program_3dlut_fl_crossbar ( +struct hubp *hubp, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_r, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_g, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_b);void hubp42_read_state (struct hubp *hubp);
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +257 -132
452 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c +463 -36
574 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h +8 -1
@@ -18,11 +18,18 @@ void dcn42_program_cm_hist(bool dcn42_set_mcm_luts (struct pipe_ctx *pipe_ctx,const struct dc_plane_state *plane_state); +void dcn42_populate_mcm_luts (struct dc *dc, +struct pipe_ctx *pipe_ctx, +struct dc_cm2_func_luts mcm_luts, +bool lut_bank_a); +bool dcn42_program_rmcm_luts (struct hubp *hubp,struct pipe_ctx *pipe_ctx, -const struct dc_plane_cm *cm, +enum dc_cm2_transfer_func_source lut3d_src, +struct dc_cm2_func_luts *mcm_luts,struct mpc *mpc, +bool lut_bank_a,int mpcc_id);void dcn42_hardware_release (struct dc *dc);
drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h +30 -5
@@ -89,7 +89,7 @@ enum hubp_3dlut_fl_addressing_mode {enum hubp_3dlut_fl_width { hubp_3dlut_fl_width_17 =17 , hubp_3dlut_fl_width_33 =33 , - hubp_3dlut_fl_width_17_transformed =4916 ,//mpc default + hubp_3dlut_fl_width_transformed =4916 ,//mpc default };enum hubp_3dlut_fl_crossbar_bit_slice {
@@ -99,6 +99,22 @@ enum hubp_3dlut_fl_crossbar_bit_slice { hubp_3dlut_fl_crossbar_bit_slice_48_63 =3 }; +struct hubp_fl_3dlut_config { +bool enabled; +enum hubp_3dlut_fl_width width; +enum hubp_3dlut_fl_mode mode; +enum hubp_3dlut_fl_format format; +uint16_t bias; +uint16_t scale; +struct dc_plane_address address; +enum hubp_3dlut_fl_addressing_mode addr_mode; +enum dc_cm2_gpu_mem_layout layout; +uint8_t protection_bits; +enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_y_g; +enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cb_b; +enum hubp_3dlut_fl_crossbar_bit_slice crossbar_bit_slice_cr_r; +}; +struct hubp {const struct hubp_funcs *funcs;struct dc_context *ctx;
@@ -273,15 +289,24 @@ struct hubp_funcs {void (*hubp_wait_pipe_read_start)(struct hubp *hubp);void (*hubp_program_mcache_id_and_split_coordinate)(struct hubp *hubp,struct dml2_hubp_pipe_mcache_regs *mcache_regs); +void (*hubp_update_3dlut_fl_bias_scale)(struct hubp *hubp,uint16_t bias,uint16_t scale); +void (*hubp_program_3dlut_fl_mode)(struct hubp *hubp, +enum hubp_3dlut_fl_mode mode); +void (*hubp_program_3dlut_fl_format)(struct hubp *hubp, +enum hubp_3dlut_fl_format format);void (*hubp_program_3dlut_fl_addr)(struct hubp *hubp, -const struct dc_plane_address *address); -void (*hubp_program_3dlut_fl_config)(struct hubp *hubp, -const struct dc_3dlut_dma *config); +const struct dc_plane_address address);void (*hubp_program_3dlut_fl_dlg_param)(struct hubp *hubp,int refcyc_per_3dlut_group);void (*hubp_enable_3dlut_fl)(struct hubp *hubp,bool enable); +void (*hubp_program_3dlut_fl_addressing_mode)(struct hubp *hubp,enum hubp_3dlut_fl_addressing_mode addr_mode); +void (*hubp_program_3dlut_fl_width)(struct hubp *hubp,enum hubp_3dlut_fl_width width); +void (*hubp_program_3dlut_fl_tmz_protected)(struct hubp *hubp,uint8_t protection_bits);void (*hubp_program_3dlut_fl_crossbar)(struct hubp *hubp, -enum dc_cm_lut_pixel_format format); +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_y_g, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_cb_b, +enum hubp_3dlut_fl_crossbar_bit_slice bit_slice_cr_r);int (*hubp_get_3dlut_fl_done)(struct hubp *hubp); +void (*hubp_program_3dlut_fl_config)(struct hubp *hubp,struct hubp_fl_3dlut_config *cfg);void (*hubp_clear_tiling)(struct hubp *hubp);uint32_t (*hubp_get_current_read_line)(struct hubp *hubp);uint32_t (*hubp_get_det_config_error)(struct hubp *hubp);
drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h +32 -47
136 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c +77 -100
251 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h +7 -18
@@ -206,32 +206,21 @@ void dcn401_mpc_construct(struct dcn401_mpc *mpc401, int num_rmu);void mpc401_set_movable_cm_location (struct mpc *mpc,enum mpcc_movable_cm_location location,int mpcc_id); -void mpc401_populate_lut (struct mpc *mpc, -const enum MCM_LUT_ID id, -const union mcm_lut_params *params, -bool lut_bank_a, -int mpcc_id); +void mpc401_populate_lut (struct mpc *mpc,const enum MCM_LUT_ID id,const union mcm_lut_params params, +bool lut_bank_a,int mpcc_id);void mpc401_program_lut_mode (struct mpc *mpc,const enum MCM_LUT_ID id, -const bool enable, -const bool lut_bank_a, -const enum dc_cm_lut_size size, -const int mpcc_id); - -void mpc401_get_lut_mode (struct mpc *mpc, -const enum MCM_LUT_ID id, -const int mpcc_id, -bool *enable, -bool *lut_bank_a); +const enum MCM_LUT_XABLE xable, +bool lut_bank_a, +int mpcc_id);void mpc401_program_lut_read_write_control (struct mpc *mpc,const enum MCM_LUT_ID id, -const bool lut_bank_a, -const unsigned int bit_depth, -const int mpcc_id); +bool lut_bank_a, +int mpcc_id); void mpc401_set_gamut_remap( struct mpc *mpc,
drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c +356 -32
448 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h +47 -2
71 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +0 -1
@@ -666,7 +666,6 @@ static const struct resource_caps res_cap_dcn42 = { .num_vmid = 16, .num_mpc_3dlut = 2, .num_dsc = 4, - .num_rmcm = 2, };static const struct dc_plane_cap plane_cap = {
Signature · 1 line
2.43.0
PATCH 2/17 drm/amd/display: Remove unused state param from enable_link_analog
In reply to James LinFrom: Alex Hung <[email protected]>
[WHY & HOW]
The 'state' parameter in enable_link_analog() is never used within the function body. Remove it from the function.
--- drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +2 -4
@@ -2016,9 +2016,7 @@ static enum dc_status enable_link_dp_mst(return enable_link_dp (state, pipe_ctx); } -static enum dc_status enable_link_analog ( -struct dc_state *state, -struct pipe_ctx *pipe_ctx) +static enum dc_status enable_link_analog (struct pipe_ctx *pipe_ctx) {struct dc_link *link = pipe_ctx->stream->link;
@@ -2083,7 +2081,7 @@ static enum dc_status enable_link( status =DC_OK ;break ;case SIGNAL_TYPE_RGB : - status =enable_link_analog (state, pipe_ctx); + status =enable_link_analog (pipe_ctx);break ;case SIGNAL_TYPE_VIRTUAL : status =enable_link_virtual (pipe_ctx);
Signature · 1 line
2.43.0
PATCH 3/17 drm/amd/display: Fix type mismatches in DML and normalize loop bounds
In reply to James LinFrom: Gaghik Khachatrian <[email protected]>
[Why]
Address signed/unsigned comparison warnings across DML paths to keep builds warning-clean and improve type safety at comparison boundaries. Most warnings came from signed loop/index temporaries compared against unsigned counters (for example pipe_count, num_states, and candidate/state counts), plus a small number of mixed signed/unsigned clock and geometry checks.
[How]
Aligned iterator and temporary variable types with the semantic type of the compared bounds. Used unsigned indices for loops bounded by unsigned counters, and retained signed types where values are semantically signed (for example plane_count math, timing/micro-schedule arithmetic, and reverse/sentinel-style iteration). Where mixed signed/unsigned comparisons are intentional, applied explicit boundary casts instead of broad type changes (for example dispclk minimum clamp and selected timing/height comparisons).
As a side effect of converting count parameters such as NumberOfActivePlanes to unsigned, normalized equivalent loop forms from:
for (i = 0; i <= NumberOfActivePlanes - 1; i++)
into the normalized form:
for (i = 0; i < NumberOfActivePlanes; i++)
to keep bound style coherent and avoid avoidable mismatch patterns.
No functional behavior changes are intended; this is a warning-resolution and type-alignment cleanup.
Assisted-by Copilot
--- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 9 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +++-- .../dc/dml/dcn20/display_mode_vba_20.c | 36 ++--- .../dc/dml/dcn20/display_mode_vba_20v2.c | 36 ++--- .../dc/dml/dcn21/display_mode_vba_21.c | 36 ++--- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 14 +- .../dc/dml/dcn30/display_mode_vba_30.c | 83 +++++------ .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 5 +- .../amd/display/dc/dml/dcn302/dcn302_fpu.c | 2 +- .../amd/display/dc/dml/dcn303/dcn303_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 15 +- .../dc/dml/dcn31/display_mode_vba_31.c | 121 ++++++++-------- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +- .../dc/dml/dcn314/display_mode_vba_314.c | 129 ++++++++++-------- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 75 +++++----- .../dc/dml/dcn32/display_mode_vba_32.c | 21 +-- .../dc/dml/dcn32/display_mode_vba_util_32.c | 2 +- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 46 +++---- .../drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 5 +- .../amd/display/dc/dml/dcn351/dcn351_fpu.c | 5 +- .../drm/amd/display/dc/dml/display_mode_vba.c | 4 +- 21 files changed, 366 insertions(+), 319 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c +5 -4
@@ -760,7 +760,8 @@ bool dcn_validate_bandwidth(const struct resource_pool *pool = dc->res_pool;struct dcn_bw_internal_vars *v = &context->dcn_bw_vars; -int i, input_idx, k; +unsigned int i; +int input_idx, k;int vesa_sync_start, asic_blank_end, asic_blank_start;bool bw_limit_pass;float bw_limit;
@@ -1169,9 +1170,9 @@ bool dcn_validate_bandwidth( context->bw_ctx.bw.dcn.clk.dispclk_khz = (int )(dc->dcn_soc->max_dispclk_vmax0p9 *1000 );if (context->bw_ctx.bw.dcn.clk.dispclk_khz < - dc->debug.min_disp_clk_khz) { + (int )dc->debug.min_disp_clk_khz) { context->bw_ctx.bw.dcn.clk.dispclk_khz = - dc->debug.min_disp_clk_khz; + (int )dc->debug.min_disp_clk_khz; } context->bw_ctx.bw.dcn.clk.dppclk_khz = context->bw_ctx.bw.dcn.clk.dispclk_khz /
@@ -1308,7 +1309,7 @@ bool dcn_validate_bandwidth(PERFORMANCE_TRACE_END ();BW_VAL_TRACE_FINISH (); -if (bw_limit_pass && v->voltage_level <=get_highest_allowed_voltage_level (dc->config.is_vmin_only_asic)) +if (bw_limit_pass && v->voltage_level <= (int )get_highest_allowed_voltage_level (dc->config.is_vmin_only_asic))return true;else return false;
drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +20 -14
@@ -990,7 +990,8 @@ void dcn20_populate_dml_writeback_from_context(struct dc *dc,struct resource_context *res_ctx, display_e2e_pipe_params_st *pipes) { - int pipe_cnt, i; + unsigned int i; +int pipe_cnt;dc_assert_fp_enabled ();
@@ -1044,7 +1045,7 @@ void dcn20_fpu_set_wb_arb_params(struct mcif_arb_params *wb_arb_params,static bool is_dtbclk_required (struct dc *dc,struct dc_state *context) { -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) {if (!context->res_ctx.pipe_ctx[i].stream)continue ;
@@ -1134,7 +1135,7 @@ static void dcn20_adjust_freesync_v_startup(/* The newVStartUp is 1 line before vsync point */ newVstartup = asic_blank_end +1 ; - *vstartup_start = ((newVstartup > *vstartup_start) ? newVstartup : *vstartup_start); + *vstartup_start = (((int )newVstartup > *vstartup_start) ? (int )newVstartup : *vstartup_start); } void dcn20_calculate_dlg_params(struct dc *dc,
@@ -1143,7 +1144,8 @@ void dcn20_calculate_dlg_params(struct dc *dc,int pipe_cnt, int vlevel) { - int i, pipe_idx, active_hubp_count = 0; + int pipe_idx, active_hubp_count = 0; +unsigned int i;dc_assert_fp_enabled ();
@@ -1155,7 +1157,7 @@ void dcn20_calculate_dlg_params(struct dc *dc, context->bw_ctx.bw.dcn.clk.socclk_khz = (int )(context->bw_ctx.dml.vba.SOCCLK *1000.0 ); context->bw_ctx.bw.dcn.clk.dramclk_khz = (int )(context->bw_ctx.dml.vba.DRAMSpeed *1000.0 /16.0 ); -if (dc->debug.min_dram_clk_khz > context->bw_ctx.bw.dcn.clk.dramclk_khz) +if ((int )dc->debug.min_dram_clk_khz > context->bw_ctx.bw.dcn.clk.dramclk_khz) context->bw_ctx.bw.dcn.clk.dramclk_khz = dc->debug.min_dram_clk_khz; context->bw_ctx.bw.dcn.clk.dcfclk_deep_sleep_khz = (int )(context->bw_ctx.dml.vba.DCFCLKDeepSleep *1000.0 );
@@ -1173,8 +1175,8 @@ void dcn20_calculate_dlg_params(struct dc *dc, context->bw_ctx.bw.dcn.clk.dtbclk_en =is_dtbclk_required (dc, context); -if (context->bw_ctx.bw.dcn.clk.dispclk_khz < dc->debug.min_disp_clk_khz) - context->bw_ctx.bw.dcn.clk.dispclk_khz = dc->debug.min_disp_clk_khz; +if ((unsigned int )context->bw_ctx.bw.dcn.clk.dispclk_khz < dc->debug.min_disp_clk_khz) + context->bw_ctx.bw.dcn.clk.dispclk_khz = (int )dc->debug.min_disp_clk_khz;for (i =0 , pipe_idx =0 ; i < dc->res_pool->pipe_count; i++) {if (!context->res_ctx.pipe_ctx[i].stream)
@@ -1317,7 +1319,8 @@ int dcn20_populate_dml_pipes_from_context(struct dc *dc, enum dc_validate_mode validate_mode) { (void )validate_mode; -int pipe_cnt, i; +int pipe_cnt; +unsigned int i;bool synchronized_vblank = true;struct resource_context *res_ctx = &context->res_ctx;
@@ -1736,7 +1739,8 @@ void dcn20_calculate_wm(struct dc *dc, struct dc_state *context,int vlevel, enum dc_validate_mode validate_mode) { - int pipe_cnt, i, pipe_idx; + int pipe_cnt, pipe_idx; +unsigned int i;dc_assert_fp_enabled ();
@@ -1854,7 +1858,7 @@ void dcn20_update_bounding_box(struct dc *dc, {int num_calculated_states =0 ;int min_dcfclk =0 ; -int i; +unsigned int i;dc_assert_fp_enabled ();
@@ -1915,7 +1919,7 @@ void dcn20_update_bounding_box(struct dc *dc,void dcn20_cap_soc_clocks (struct _vcs_dpi_soc_bounding_box_st *bb,struct pp_smu_nv_clock_table max_clocks) { -int i; +unsigned int i;dc_assert_fp_enabled ();
@@ -2159,7 +2163,7 @@ int dcn21_populate_dml_pipes_from_context(struct dc *dc, enum dc_validate_mode validate_mode) {uint32_t pipe_cnt; -int i; +unsigned int i;dc_assert_fp_enabled ();
@@ -2241,7 +2245,8 @@ static void dcn21_calculate_wm(struct dc *dc, struct dc_state *context,int vlevel_req, enum dc_validate_mode validate_mode) { - int pipe_cnt, i, pipe_idx; + int pipe_cnt, pipe_idx; +unsigned int i;int vlevel, vlevel_max;struct wm_range_table_entry *table_entry;struct clk_bw_params *bw_params = dc->clk_mgr->bw_params;
@@ -2477,7 +2482,8 @@ void dcn201_populate_dml_writeback_from_context_fpu(struct dc *dc,struct resource_context *res_ctx, display_e2e_pipe_params_st *pipes) { - int pipe_cnt, i, j; + int pipe_cnt; +unsigned int i, j;double max_calc_writeback_dispclk;double writeback_dispclk;struct writeback_st dout_wb = {0 };
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20.c +18 -18
@@ -3286,8 +3286,8 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l {struct vba_vars_st *locals = &mode_lib->vba; -int i; -unsigned int j, k, m; +int idx; +unsigned int i, j, k, m;/*MODE SUPPORT, VOLTAGE STATE AND SOC CONFIGURATION*/
@@ -5016,7 +5016,7 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }/*Mode Support, Voltage State and SOC Configuration*/ -for (i = mode_lib->vba.soc.num_states; i >=0 ; i--) { +for (idx = mode_lib->vba.soc.num_states; idx >=0 ; idx--) {for (j =0 ; j <2 ; j++) {enum dm_validation_status status =DML_VALIDATION_OK ;
@@ -5024,21 +5024,21 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l status =DML_FAIL_SCALE_RATIO_TAP ; }else if (mode_lib->vba.SourceFormatPixelAndScanSupport != true) { status =DML_FAIL_SOURCE_PIXEL_FORMAT ; - }else if (locals->ViewportSizeSupport[i][0 ] != true) { + }else if (locals->ViewportSizeSupport[idx][0 ] != true) { status =DML_FAIL_VIEWPORT_SIZE ; - }else if (locals->DIOSupport[i] != true) { + }else if (locals->DIOSupport[idx] != true) { status =DML_FAIL_DIO_SUPPORT ; - }else if (locals->NotEnoughDSCUnits[i] != false) { + }else if (locals->NotEnoughDSCUnits[idx] != false) { status =DML_FAIL_NOT_ENOUGH_DSC ; - }else if (locals->DSCCLKRequiredMoreThanSupported[i] != false) { + }else if (locals->DSCCLKRequiredMoreThanSupported[idx] != false) { status =DML_FAIL_DSC_CLK_REQUIRED ; - }else if (locals->UrgentLatencySupport[i][j] != true) { + }else if (locals->UrgentLatencySupport[idx][j] != true) { status =DML_FAIL_URGENT_LATENCY ; - }else if (locals->ROBSupport[i][0 ] != true) { + }else if (locals->ROBSupport[idx][0 ] != true) { status =DML_FAIL_REORDERING_BUFFER ; - }else if (locals->DISPCLK_DPPCLK_Support[i][j] != true) { + }else if (locals->DISPCLK_DPPCLK_Support[idx][j] != true) { status =DML_FAIL_DISPCLK_DPPCLK ; - }else if (locals->TotalAvailablePipesSupport[i][j] != true) { + }else if (locals->TotalAvailablePipesSupport[idx][j] != true) { status =DML_FAIL_TOTAL_AVAILABLE_PIPES ; }else if (mode_lib->vba.NumberOfOTGSupport != true) { status =DML_FAIL_NUM_OTG ;
@@ -5052,24 +5052,24 @@ void dml20_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l status =DML_FAIL_CURSOR_SUPPORT ; }else if (mode_lib->vba.PitchSupport != true) { status =DML_FAIL_PITCH_SUPPORT ; - }else if (locals->PrefetchSupported[i][j] != true) { + }else if (locals->PrefetchSupported[idx][j] != true) { status =DML_FAIL_PREFETCH_SUPPORT ; - }else if (locals->TotalVerticalActiveBandwidthSupport[i][0 ] != true) { + }else if (locals->TotalVerticalActiveBandwidthSupport[idx][0 ] != true) { status =DML_FAIL_TOTAL_V_ACTIVE_BW ; - }else if (locals->VRatioInPrefetchSupported[i][j] != true) { + }else if (locals->VRatioInPrefetchSupported[idx][j] != true) { status =DML_FAIL_V_RATIO_PREFETCH ; - }else if (locals->PTEBufferSizeNotExceeded[i][j] != true) { + }else if (locals->PTEBufferSizeNotExceeded[idx][j] != true) { status =DML_FAIL_PTE_BUFFER_SIZE ; }else if (mode_lib->vba.NonsupportedDSCInputBPC != false) { status =DML_FAIL_DSC_INPUT_BPC ; }if (status ==DML_VALIDATION_OK ) { - locals->ModeSupport[i][j] = true; + locals->ModeSupport[idx][j] = true; }else { - locals->ModeSupport[i][j] = false; + locals->ModeSupport[idx][j] = false; } - locals->ValidationStatus[i] = status; + locals->ValidationStatus[idx] = status; } } {
drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c +18 -18
@@ -3394,8 +3394,8 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode {struct vba_vars_st *locals = &mode_lib->vba; -int i; -unsigned int j, k, m; +int idx; +unsigned int i, j, k, m;/*MODE SUPPORT, VOLTAGE STATE AND SOC CONFIGURATION*/
@@ -5133,7 +5133,7 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode }/*Mode Support, Voltage State and SOC Configuration*/ -for (i = mode_lib->vba.soc.num_states; i >=0 ; i--) { +for (idx = mode_lib->vba.soc.num_states; idx >=0 ; idx--) {for (j =0 ; j <2 ; j++) {enum dm_validation_status status =DML_VALIDATION_OK ;
@@ -5141,21 +5141,21 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode status =DML_FAIL_SCALE_RATIO_TAP ; }else if (mode_lib->vba.SourceFormatPixelAndScanSupport != true) { status =DML_FAIL_SOURCE_PIXEL_FORMAT ; - }else if (locals->ViewportSizeSupport[i][0 ] != true) { + }else if (locals->ViewportSizeSupport[idx][0 ] != true) { status =DML_FAIL_VIEWPORT_SIZE ; - }else if (locals->DIOSupport[i] != true) { + }else if (locals->DIOSupport[idx] != true) { status =DML_FAIL_DIO_SUPPORT ; - }else if (locals->NotEnoughDSCUnits[i] != false) { + }else if (locals->NotEnoughDSCUnits[idx] != false) { status =DML_FAIL_NOT_ENOUGH_DSC ; - }else if (locals->DSCCLKRequiredMoreThanSupported[i] != false) { + }else if (locals->DSCCLKRequiredMoreThanSupported[idx] != false) { status =DML_FAIL_DSC_CLK_REQUIRED ; - }else if (locals->UrgentLatencySupport[i][j] != true) { + }else if (locals->UrgentLatencySupport[idx][j] != true) { status =DML_FAIL_URGENT_LATENCY ; - }else if (locals->ROBSupport[i][0 ] != true) { + }else if (locals->ROBSupport[idx][0 ] != true) { status =DML_FAIL_REORDERING_BUFFER ; - }else if (locals->DISPCLK_DPPCLK_Support[i][j] != true) { + }else if (locals->DISPCLK_DPPCLK_Support[idx][j] != true) { status =DML_FAIL_DISPCLK_DPPCLK ; - }else if (locals->TotalAvailablePipesSupport[i][j] != true) { + }else if (locals->TotalAvailablePipesSupport[idx][j] != true) { status =DML_FAIL_TOTAL_AVAILABLE_PIPES ; }else if (mode_lib->vba.NumberOfOTGSupport != true) { status =DML_FAIL_NUM_OTG ;
@@ -5169,24 +5169,24 @@ void dml20v2_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode status =DML_FAIL_CURSOR_SUPPORT ; }else if (mode_lib->vba.PitchSupport != true) { status =DML_FAIL_PITCH_SUPPORT ; - }else if (locals->PrefetchSupported[i][j] != true) { + }else if (locals->PrefetchSupported[idx][j] != true) { status =DML_FAIL_PREFETCH_SUPPORT ; - }else if (locals->TotalVerticalActiveBandwidthSupport[i][0 ] != true) { + }else if (locals->TotalVerticalActiveBandwidthSupport[idx][0 ] != true) { status =DML_FAIL_TOTAL_V_ACTIVE_BW ; - }else if (locals->VRatioInPrefetchSupported[i][j] != true) { + }else if (locals->VRatioInPrefetchSupported[idx][j] != true) { status =DML_FAIL_V_RATIO_PREFETCH ; - }else if (locals->PTEBufferSizeNotExceeded[i][j] != true) { + }else if (locals->PTEBufferSizeNotExceeded[idx][j] != true) { status =DML_FAIL_PTE_BUFFER_SIZE ; }else if (mode_lib->vba.NonsupportedDSCInputBPC != false) { status =DML_FAIL_DSC_INPUT_BPC ; }if (status ==DML_VALIDATION_OK ) { - locals->ModeSupport[i][j] = true; + locals->ModeSupport[idx][j] = true; }else { - locals->ModeSupport[i][j] = false; + locals->ModeSupport[idx][j] = false; } - locals->ValidationStatus[i] = status; + locals->ValidationStatus[idx] = status; } } {
drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c +18 -18
@@ -3525,8 +3525,8 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l {struct vba_vars_st *locals = &mode_lib->vba; -int i; -unsigned int j, k, m; +int idx; +unsigned int i, j, k, m;/*MODE SUPPORT, VOLTAGE STATE AND SOC CONFIGURATION*/
@@ -5138,7 +5138,7 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }/*Mode Support, Voltage State and SOC Configuration*/ -for (i = mode_lib->vba.soc.num_states; i >=0 ; i--) { +for (idx = mode_lib->vba.soc.num_states; idx >=0 ; idx--) {for (j =0 ; j <2 ; j++) {enum dm_validation_status status =DML_VALIDATION_OK ;
@@ -5146,19 +5146,19 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l status =DML_FAIL_SCALE_RATIO_TAP ; }else if (!mode_lib->vba.SourceFormatPixelAndScanSupport) { status =DML_FAIL_SOURCE_PIXEL_FORMAT ; - }else if (!locals->ViewportSizeSupport[i][0 ]) { + }else if (!locals->ViewportSizeSupport[idx][0 ]) { status =DML_FAIL_VIEWPORT_SIZE ; - }else if (!locals->DIOSupport[i]) { + }else if (!locals->DIOSupport[idx]) { status =DML_FAIL_DIO_SUPPORT ; - }else if (locals->NotEnoughDSCUnits[i]) { + }else if (locals->NotEnoughDSCUnits[idx]) { status =DML_FAIL_NOT_ENOUGH_DSC ; - }else if (locals->DSCCLKRequiredMoreThanSupported[i]) { + }else if (locals->DSCCLKRequiredMoreThanSupported[idx]) { status =DML_FAIL_DSC_CLK_REQUIRED ; - }else if (!locals->ROBSupport[i][0 ]) { + }else if (!locals->ROBSupport[idx][0 ]) { status =DML_FAIL_REORDERING_BUFFER ; - }else if (!locals->DISPCLK_DPPCLK_Support[i][j]) { + }else if (!locals->DISPCLK_DPPCLK_Support[idx][j]) { status =DML_FAIL_DISPCLK_DPPCLK ; - }else if (!locals->TotalAvailablePipesSupport[i][j]) { + }else if (!locals->TotalAvailablePipesSupport[idx][j]) { status =DML_FAIL_TOTAL_AVAILABLE_PIPES ; }else if (!mode_lib->vba.NumberOfOTGSupport) { status =DML_FAIL_NUM_OTG ;
@@ -5172,27 +5172,27 @@ void dml21_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l status =DML_FAIL_CURSOR_SUPPORT ; }else if (!mode_lib->vba.PitchSupport) { status =DML_FAIL_PITCH_SUPPORT ; - }else if (!locals->TotalVerticalActiveBandwidthSupport[i][0 ]) { + }else if (!locals->TotalVerticalActiveBandwidthSupport[idx][0 ]) { status =DML_FAIL_TOTAL_V_ACTIVE_BW ; - }else if (!locals->PTEBufferSizeNotExceeded[i][j]) { + }else if (!locals->PTEBufferSizeNotExceeded[idx][j]) { status =DML_FAIL_PTE_BUFFER_SIZE ; }else if (mode_lib->vba.NonsupportedDSCInputBPC) { status =DML_FAIL_DSC_INPUT_BPC ; }else if ((mode_lib->vba.HostVMEnable - && !locals->ImmediateFlipSupportedForState[i][j])) { + && !locals->ImmediateFlipSupportedForState[idx][j])) { status =DML_FAIL_HOST_VM_IMMEDIATE_FLIP ; - }else if (!locals->PrefetchSupported[i][j]) { + }else if (!locals->PrefetchSupported[idx][j]) { status =DML_FAIL_PREFETCH_SUPPORT ; - }else if (!locals->VRatioInPrefetchSupported[i][j]) { + }else if (!locals->VRatioInPrefetchSupported[idx][j]) { status =DML_FAIL_V_RATIO_PREFETCH ; }if (status ==DML_VALIDATION_OK ) { - locals->ModeSupport[i][j] = true; + locals->ModeSupport[idx][j] = true; }else { - locals->ModeSupport[i][j] = false; + locals->ModeSupport[idx][j] = false; } - locals->ValidationStatus[i] = status; + locals->ValidationStatus[idx] = status; } } {
drivers/gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c +8 -6
@@ -181,7 +181,8 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_0_soc = {void dcn30_fpu_populate_dml_writeback_from_context (struct dc *dc,struct resource_context *res_ctx,display_e2e_pipe_params_st *pipes) { -int pipe_cnt, i, j; +int pipe_cnt; +unsigned int i, j;double max_calc_writeback_dispclk;double writeback_dispclk;struct writeback_st dout_wb = {0 };
@@ -308,6 +309,7 @@ void dcn30_fpu_calculate_wm_and_dlg( {int maxMpcComb = context->bw_ctx.dml.vba.maxMpcComb;int i, pipe_idx; +unsigned int pipe_i, state_i;double dcfclk = context->bw_ctx.dml.vba.DCFCLKState[vlevel][maxMpcComb];bool pstate_en = context->bw_ctx.dml.vba.DRAMClockChangeSupport[vlevel][maxMpcComb] != dm_dram_clock_change_unsupported;unsigned int dummy_latency_index =0 ;
@@ -475,8 +477,8 @@ void dcn30_fpu_calculate_wm_and_dlg(/* Make set D = set A until set D is enabled */ context->bw_ctx.bw.dcn.watermarks.d = context->bw_ctx.bw.dcn.watermarks.a; -for (i =0 , pipe_idx =0 ; i < dc->res_pool->pipe_count; i++) { -if (!context->res_ctx.pipe_ctx[i].stream) +for (pipe_i =0 , pipe_idx =0 ; pipe_i < dc->res_pool->pipe_count; pipe_i++) { +if (!context->res_ctx.pipe_ctx[pipe_i].stream)continue ; pipes[pipe_idx].clks_cfg.dispclk_mhz =get_dispclk_calculated (&context->bw_ctx.dml, pipes, pipe_cnt);
@@ -500,9 +502,9 @@ void dcn30_fpu_calculate_wm_and_dlg( context->bw_ctx.dml.vba.DRAMSpeed <= 1700 && context->bw_ctx.dml.vba.DRAMSpeed >= 1500) { -for (i =0 ; i < dc->dml.soc.num_states; i++) { -if (dc->dml.soc.clock_limits[i].dram_speed_mts >1700 ) { - context->bw_ctx.dml.vba.DRAMSpeed = dc->dml.soc.clock_limits[i].dram_speed_mts; +for (state_i =0 ; state_i < dc->dml.soc.num_states; state_i++) { +if (dc->dml.soc.clock_limits[state_i].dram_speed_mts >1700 ) { + context->bw_ctx.dml.vba.DRAMSpeed = dc->dml.soc.clock_limits[state_i].dram_speed_mts;break ; } }
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c +45 -38
202 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c +3 -2
@@ -326,7 +326,8 @@ void dcn301_fpu_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_pstruct dcn301_resource_pool *pool =TO_DCN301_RES_POOL (dc->res_pool);struct clk_limit_table *clk_table = &bw_params->clk_table;unsigned int i, closest_clk_lvl; -int j =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +int j =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;dc_assert_fp_enabled ();
@@ -429,7 +430,7 @@ void dcn301_fpu_calculate_wm_and_dlg(struct dc *dc, int pipe_cnt, int vlevel_req) { - int i, pipe_idx; +unsigned int i, pipe_idx;int vlevel, vlevel_max;struct wm_range_table_entry *table_entry;struct clk_bw_params *bw_params = dc->clk_mgr->bw_params;
drivers/gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c +1 -1
@@ -218,7 +218,7 @@ void dcn302_fpu_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_p dc->dml.soc.dispclk_dppclk_vco_speed_mhz = dc->clk_mgr->dentist_vco_freq_khz /1000.0 ;if (bw_params->clk_table.entries[0 ].memclk_mhz) { -int max_dcfclk_mhz =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 , max_phyclk_mhz =0 ; +unsigned int max_dcfclk_mhz =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 , max_phyclk_mhz =0 ;for (i =0 ; i <MAX_NUM_DPM_LVL ; i++) {if (bw_params->clk_table.entries[i].dcfclk_mhz > max_dcfclk_mhz)
drivers/gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c +1 -1
@@ -214,7 +214,7 @@ void dcn303_fpu_update_bw_bounding_box(struct dc *dc, struct clk_bw_params *bw_p dc->dml.soc.dispclk_dppclk_vco_speed_mhz = dc->clk_mgr->dentist_vco_freq_khz /1000.0 ;if (bw_params->clk_table.entries[0 ].memclk_mhz) { -int max_dcfclk_mhz =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 , max_phyclk_mhz =0 ; +unsigned int max_dcfclk_mhz =0 , max_dispclk_mhz =0 , max_dppclk_mhz =0 , max_phyclk_mhz =0 ;for (i =0 ; i <MAX_NUM_DPM_LVL ; i++) {if (bw_params->clk_table.entries[i].dcfclk_mhz > max_dcfclk_mhz)
drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +9 -6
@@ -485,9 +485,12 @@ void dcn31_calculate_wm_and_dlg_fp(int pipe_cnt, int vlevel) { - int i, pipe_idx, total_det = 0, active_hubp_count = 0; + int total_det = 0, active_hubp_count = 0; +unsigned int i, pipe_idx;double dcfclk = context->bw_ctx.dml.vba.DCFCLKState[vlevel][context->bw_ctx.dml.vba.maxMpcComb];uint32_t cstate_enter_plus_exit_z8_ns; +uint32_t minimum_z8_residency_time_ns = + (uint32_t )dc->debug.minimum_z8_residency_time *1000U ;dc_assert_fp_enabled ();
@@ -511,8 +514,8 @@ void dcn31_calculate_wm_and_dlg_fp( (uint32_t )(get_wm_z8_stutter_enter_exit (&context->bw_ctx.dml, pipes, pipe_cnt) *1000 );if (get_stutter_period (&context->bw_ctx.dml, pipes, pipe_cnt) < dc->debug.minimum_z8_residency_time && - cstate_enter_plus_exit_z8_ns < dc->debug.minimum_z8_residency_time *1000 ) - cstate_enter_plus_exit_z8_ns = dc->debug.minimum_z8_residency_time *1000 ; + cstate_enter_plus_exit_z8_ns < minimum_z8_residency_time_ns) + cstate_enter_plus_exit_z8_ns = minimum_z8_residency_time_ns;/* Set A: * All clocks min required
@@ -592,7 +595,7 @@ void dcn31_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_pastruct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct clk_limit_table *clk_table = &bw_params->clk_table;unsigned int i, closest_clk_lvl; -int max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;int j;dc_assert_fp_enabled ();
@@ -668,7 +671,7 @@ void dcn31_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_pavoid 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 ; +unsigned int i, max_dispclk_mhz =0 , max_dppclk_mhz =0 ;dc_assert_fp_enabled ();
@@ -731,7 +734,7 @@ void dcn316_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_pstruct _vcs_dpi_voltage_scaling_st *s = dc->scratch.update_bw_bounding_box.clock_limits;struct clk_limit_table *clk_table = &bw_params->clk_table;unsigned int i, closest_clk_lvl; -int max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;int j;dc_assert_fp_enabled ();
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +65 -56
240 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +3 -2
@@ -185,7 +185,7 @@ void dcn314_update_bw_bounding_box_fpu(struct dc *dc, struct clk_bw_params *bw_pstruct _vcs_dpi_voltage_scaling_st *clock_limits = dcn3_14_soc.clock_limits;unsigned int i, closest_clk_lvl; -int max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;int j;dc_assert_fp_enabled ();
@@ -308,7 +308,8 @@ int dcn314_populate_dml_pipes_from_context_fpu(struct dc *dc, struct dc_state *cdisplay_e2e_pipe_params_st *pipes, enum dc_validate_mode validate_mode) { - int i, pipe_cnt; + int pipe_cnt; +unsigned int i;struct resource_context *res_ctx = &context->res_ctx;struct pipe_ctx *pipe =0 ;bool upscaled = false;
drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c +69 -60
267 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c +40 -35
240 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c +11 -10
@@ -1724,7 +1724,8 @@ static void mode_support_configuration(struct vba_vars_st *v,void dml32_ModeSupportAndSystemConfigurationFull (struct display_mode_lib *mode_lib) {struct vba_vars_st *v = &mode_lib->vba; -int i, j, start_state; +int i, start_state; +unsigned int j;unsigned int k, m;unsigned int MaximumMPCCombine;unsigned int NumberOfNonCombinedSurfaceOfMaximumBandwidth;
@@ -2030,7 +2031,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.MPCCombineMethodIncompatible = v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.MPCCombineMethodAsNeededForPStateChangeAndVoltage && v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.MPCCombineMethodAsPossible; -for (i = start_state; i < v->soc.num_states; i++) { +for (i = start_state; i < (int )v->soc.num_states; i++) {for (j =0 ; j <2 ; j++) { mode_lib->vba.TotalNumberOfActiveDPP[i][j] =0 ; mode_lib->vba.TotalAvailablePipesSupport[i][j] = true;
@@ -2307,7 +2308,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (i = start_state; i < v->soc.num_states; ++i) { +for (i = start_state; i < (int )v->soc.num_states; ++i) { mode_lib->vba.ExceededMultistreamSlots[i] = false;for (k =0 ; k < mode_lib->vba.NumberOfActiveSurfaces; ++k) {if (mode_lib->vba.OutputMultistreamEn[k] == true && mode_lib->vba.OutputMultistreamId[k] == k) {
@@ -2410,7 +2411,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (i = start_state; i < v->soc.num_states; ++i) { +for (i = start_state; i < (int )v->soc.num_states; ++i) { mode_lib->vba.DTBCLKRequiredMoreThanSupported[i] = false;for (k =0 ; k < mode_lib->vba.NumberOfActiveSurfaces; ++k) { if (mode_lib->vba.BlendingAndTiming[k] == k
@@ -2427,7 +2428,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (i = start_state; i < v->soc.num_states; ++i) { +for (i = start_state; i < (int )v->soc.num_states; ++i) { mode_lib->vba.ODMCombine2To1SupportCheckOK[i] = true; mode_lib->vba.ODMCombine4To1SupportCheckOK[i] = true;for (k =0 ; k < mode_lib->vba.NumberOfActiveSurfaces; ++k) {
@@ -2445,7 +2446,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l } } -for (i = start_state; i < v->soc.num_states; i++) { +for (i = start_state; i < (int )v->soc.num_states; i++) { mode_lib->vba.DSCCLKRequiredMoreThanSupported[i] = false;for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) {if (mode_lib->vba.BlendingAndTiming[k] == k) {
@@ -2482,7 +2483,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l/* Check DSC Unit and Slices Support */ v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.TotalDSCUnitsRequired =0 ; -for (i = start_state; i < v->soc.num_states; ++i) { +for (i = start_state; i < (int )v->soc.num_states; ++i) { mode_lib->vba.NotEnoughDSCUnits[i] = false; mode_lib->vba.NotEnoughDSCSlices[i] = false; v->dummy_vars.dml32_ModeSupportAndSystemConfigurationFull.TotalDSCUnitsRequired =0 ;
@@ -2517,7 +2518,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l }/*DSC Delay per state*/ -for (i = start_state; i < v->soc.num_states; ++i) { +for (i = start_state; i < (int )v->soc.num_states; ++i) {for (k =0 ; k < mode_lib->vba.NumberOfActiveSurfaces; ++k) { mode_lib->vba.DSCDelayPerState[i][k] = dml32_DSCDelayRequirement( mode_lib->vba.RequiresDSC[i][k], mode_lib->vba.ODMCombineEnablePerState[i][k],
@@ -2531,7 +2532,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_lfor (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) {for (m =0 ; m <= mode_lib->vba.NumberOfActiveSurfaces -1 ; m++) { -for (j =0 ; j <= mode_lib->vba.NumberOfActiveSurfaces -1 ; j++) { +for (j =0 ; j < mode_lib->vba.NumberOfActiveSurfaces; j++) {if (mode_lib->vba.BlendingAndTiming[k] == m && mode_lib->vba.RequiresDSC[i][m] == true) { mode_lib->vba.DSCDelayPerState[i][k] =
@@ -2682,7 +2683,7 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l mode_lib->vba.SurfaceSizeInMALL, &mode_lib->vba.ExceededMALLSize); -for (i = start_state; i < v->soc.num_states; i++) { +for (i = start_state; i < (int )v->soc.num_states; i++) {for (j =0 ; j <2 ; j++) {for (k =0 ; k <= mode_lib->vba.NumberOfActiveSurfaces -1 ; k++) { mode_lib->vba.swath_width_luma_ub_this_state[k] =
drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c +1 -1
@@ -6318,7 +6318,7 @@ bool dml32_CalculateDETSwathFillLatencyHiding(unsigned int NumberOfActiveSurfaceenum dm_use_mall_for_pstate_change_mode UsesMALLForPStateChange[], enum unbounded_requesting_policy UseUnboundedRequesting) { - int k; + unsigned int k;double SwathSizeAllSurfaces =0 ;double SwathSizeAllSurfacesInFetchTimeUs;double DETSwathLatencyHidingUs;
drivers/gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c +23 -23
149 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +3 -2
@@ -233,7 +233,7 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc,struct clk_limit_table *clk_table = &bw_params->clk_table;struct _vcs_dpi_voltage_scaling_st *clock_limits = dc->scratch.update_bw_bounding_box.clock_limits; -int max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;dc_assert_fp_enabled ();
@@ -440,7 +440,8 @@ int dcn35_populate_dml_pipes_from_context_fpu(struct dc *dc,display_e2e_pipe_params_st *pipes, enum dc_validate_mode validate_mode) { - int i, pipe_cnt; + unsigned int i; +int pipe_cnt;struct resource_context *res_ctx = &context->res_ctx;struct pipe_ctx *pipe =0 ;bool upscaled = false;
drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c +3 -2
@@ -266,7 +266,7 @@ void dcn351_update_bw_bounding_box_fpu(struct dc *dc,struct clk_limit_table *clk_table = &bw_params->clk_table;struct _vcs_dpi_voltage_scaling_st *clock_limits = dc->scratch.update_bw_bounding_box.clock_limits; -int max_dispclk_mhz =0 , max_dppclk_mhz =0 ; +unsigned int max_dispclk_mhz =0 , max_dppclk_mhz =0 ;dc_assert_fp_enabled ();
@@ -472,7 +472,8 @@ int dcn351_populate_dml_pipes_from_context_fpu(struct dc *dc,display_e2e_pipe_params_st *pipes, enum dc_validate_mode validate_mode) { - int i, pipe_cnt; + int pipe_cnt; +unsigned int i;struct resource_context *res_ctx = &context->res_ctx;struct pipe_ctx *pipe =0 ;bool upscaled = false;
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c +2 -2
@@ -304,7 +304,7 @@ bool get_is_phantom_pipe(struct display_mode_lib *mode_lib, const display_e2e_pistatic void fetch_socbb_params (struct display_mode_lib *mode_lib) {soc_bounding_box_st *soc = &mode_lib->vba.soc; -int i; +unsigned int i;// SOC Bounding Box Parameters mode_lib->vba.ReturnBusWidth = soc->return_bus_width_bytes;
@@ -946,7 +946,7 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib)*/ static void cache_debug_params (struct display_mode_lib *mode_lib) { -int k =0 ; +unsigned int k =0 ;for (k =0 ; k < mode_lib->vba.NumberOfActivePlanes; k++) mode_lib->vba.CachedActiveDRAMClockChangeLatencyMargin[k] = mode_lib->vba.ActiveDRAMClockChangeLatencyMargin[k];
Signature · 1 line
2.43.0
PATCH 4/17 drm/amd/display: Do DML float narrowing explicit
In reply to James LinFrom: Gaghik Khachatrian <[email protected]>
[Why]
Shared DML wrapper helpers in [dc/dml/dml_inline_defs.h](dc/dml/dml_inline_defs.h) pass double and int values to float-based dcn_bw_* helpers. Make these intentional narrowing boundaries explicit to reduce warning noise without changing behavior.
[How]
Add explicit C-style casts at the float API boundary in the shared DML inline wrappers used by the DCN DML paths.
--- .../drm/amd/display/dc/dml/dml_inline_defs.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/display/dc/dml/dml_inline_defs.h +9 -9
@@ -31,7 +31,7 @@static inline double dml_min (double a,double b) { -return (double )dcn_bw_min2 (a, b); +return (double )dcn_bw_min2 ((float )a, (float )b); }static inline double dml_min3 (double a,double b,double c)
@@ -46,7 +46,7 @@ static inline double dml_min4(double a, double b, double c, double d)static inline double dml_max (double a,double b) { -return (double )dcn_bw_max2 (a, b); +return (double )dcn_bw_max2 ((float )a, (float )b); }static inline double dml_max3 (double a,double b,double c)
@@ -68,14 +68,14 @@ static inline double dml_ceil(double a, double granularity) {if (granularity ==0 )return 0 ; -return (double )dcn_bw_ceil2 (a, granularity); +return (double )dcn_bw_ceil2 ((float )a, (float )granularity); }static inline double dml_floor (double a,double granularity) {if (granularity ==0 )return 0 ; -return (double )dcn_bw_floor2 (a, granularity); +return (double )dcn_bw_floor2 ((float )a, (float )granularity); }static inline double dml_round (double a)
@@ -103,31 +103,31 @@ static inline int dml_log2(double x)static inline double dml_pow (double a,int exp) { -return (double )dcn_bw_pow (a, exp); +return (double )dcn_bw_pow ((float )a, (float )exp); }static inline double dml_fmod (double f,int val) { -return (double )dcn_bw_mod (f, val); +return (double )dcn_bw_mod ((float )f, (float )val); }static inline double dml_ceil_2 (double f) { -return (double )dcn_bw_ceil2 (f,2 ); +return (double )dcn_bw_ceil2 ((float )f,2.0f ); }static inline double dml_ceil_ex (double x,double granularity) {if (granularity ==0 )return 0 ; -return (double )dcn_bw_ceil2 (x, granularity); +return (double )dcn_bw_ceil2 ((float )x, (float )granularity); }static inline double dml_floor_ex (double x,double granularity) {if (granularity ==0 )return 0 ; -return (double )dcn_bw_floor2 (x, granularity); +return (double )dcn_bw_floor2 ((float )x, (float )granularity); } static inline unsigned int dml_round_to_multiple(unsigned int num,
Signature · 1 line
2.43.0
PATCH 5/17 drm/amd/display: Implement block sequencing infrastructure for modular hardware operations.
In reply to James LinFrom: Bhuvanachandra Pinninti <[email protected]>
[why]
Hardware sequencer operations need better modularity and testability. Current monolithic functions make it difficult to unit test individual operations and create maintainable workflows.
[how]
Implement new hwss_add_* helper functions with standardized parameter structures. Add block_sequence_state framework for execution context management. Create cursor, info frame, DSC, and stream encoder sequence functions with comprehensive unit test support.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 421 +++++++++++++ .../drm/amd/display/dc/core/dc_hw_sequencer.c | 586 ++++++++++++++++-- .../drm/amd/display/dc/hwss/hw_sequencer.h | 345 +++++++++-- 3 files changed, 1268 insertions(+), 84 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +421 -0
@@ -32,6 +32,7 @@#include "core_types.h" #include "hw_sequencer.h" #include "dce/dce_hwseq.h" +#include "hw/dccg.h" #include "resource.h" #include "dc_state.h"
@@ -61,6 +62,7 @@#include "link_enc_cfg.h" #include "link_service.h" +#include "link/protocols/link_dp_capability.h" #include "dm_helpers.h" #include "mem_input.h"
@@ -3831,6 +3833,409 @@ static bool update_planes_and_stream_state(struct dc *dc, } +static void program_cursor_attributes_sequence ( +struct dc *dc, +struct dc_stream_state *stream, +struct dc_state *context, +struct block_sequence_state *seq_state) +{ +int k; +struct pipe_ctx *pipe_to_program =NULL ; +bool enable_cursor_offload =dc_dmub_srv_is_cursor_offload_enabled (dc); + +for (k =0 ; k < dc->res_pool->pipe_count; k++) { +struct pipe_ctx *tmp_pipe = &context->res_ctx.pipe_ctx[k]; + +if (tmp_pipe->stream != stream) +continue ; + +if (!pipe_to_program) { + pipe_to_program = tmp_pipe; + +if (enable_cursor_offload && dc->hwss.begin_cursor_offload_update) { +hwss_add_begin_cursor_offload_update (seq_state, dc, tmp_pipe); + }else { +hwss_add_cursor_lock (seq_state, dc, pipe_to_program, true); +if (pipe_to_program->next_odm_pipe) +hwss_add_cursor_lock (seq_state, dc, pipe_to_program->next_odm_pipe, true); + } + } + +hwss_add_set_cursor_attribute (seq_state, dc, tmp_pipe); +if (dc->ctx->dmub_srv) +hwss_add_send_update_cursor_info_to_dmu (seq_state, tmp_pipe, k); +if (dc->hwss.set_cursor_sdr_white_level) +hwss_add_set_cursor_sdr_white_level (seq_state, dc, tmp_pipe); +if (enable_cursor_offload && dc->hwss.update_cursor_offload_pipe) +hwss_add_update_cursor_offload_pipe (seq_state, dc, tmp_pipe); + } + +if (pipe_to_program) { +if (enable_cursor_offload && dc->hwss.commit_cursor_offload_update) { +hwss_add_commit_cursor_offload_update (seq_state, dc, pipe_to_program); + }else { +hwss_add_cursor_lock (seq_state, dc, pipe_to_program, false); +if (pipe_to_program->next_odm_pipe) +hwss_add_cursor_lock (seq_state, dc, pipe_to_program->next_odm_pipe, false); + } + } +} + +static void program_cursor_position_sequence ( +struct dc *dc, +struct dc_stream_state *stream, +struct dc_state *context, +struct block_sequence_state *seq_state) +{ +int k; +struct pipe_ctx *pipe_to_program =NULL ; +bool enable_cursor_offload =dc_dmub_srv_is_cursor_offload_enabled (dc); + +for (k =0 ; k < dc->res_pool->pipe_count; k++) { +struct pipe_ctx *tmp_pipe = &context->res_ctx.pipe_ctx[k]; + +if (tmp_pipe->stream != stream || + (!tmp_pipe->plane_res.mi && !tmp_pipe->plane_res.hubp) || + !tmp_pipe->plane_state || + (!tmp_pipe->plane_res.xfm && !tmp_pipe->plane_res.dpp) || + (!tmp_pipe->plane_res.ipp && !tmp_pipe->plane_res.dpp)) +continue ; + +if (!pipe_to_program) { + pipe_to_program = tmp_pipe; + +if (enable_cursor_offload && dc->hwss.begin_cursor_offload_update) +hwss_add_begin_cursor_offload_update (seq_state, dc, tmp_pipe); +else +hwss_add_cursor_lock (seq_state, dc, pipe_to_program, true); + } + +hwss_add_set_cursor_position (seq_state, dc, tmp_pipe); +if (enable_cursor_offload && dc->hwss.update_cursor_offload_pipe) +hwss_add_update_cursor_offload_pipe (seq_state, dc, tmp_pipe); + +if (dc->ctx->dmub_srv) +hwss_add_send_update_cursor_info_to_dmu (seq_state, tmp_pipe, k); + } + +if (pipe_to_program) { +if (enable_cursor_offload && dc->hwss.commit_cursor_offload_update) +hwss_add_commit_cursor_offload_update (seq_state, dc, pipe_to_program); +else +hwss_add_cursor_lock (seq_state, dc, pipe_to_program, false); + } +} + +static void add_update_info_frame_sequence ( +struct block_sequence_state *seq_state, +struct pipe_ctx *pipe_ctx) +{ +bool is_hdmi_tmds; +bool is_dp; + +if (!pipe_ctx || !pipe_ctx->stream) +return ; + +if (pipe_ctx->stream_res.stream_enc ==NULL ) +return ; + + is_hdmi_tmds =dc_is_hdmi_tmds_signal (pipe_ctx->stream->signal); + is_dp =dc_is_dp_signal (pipe_ctx->stream->signal); + +if (!is_hdmi_tmds && !is_dp) +return ; + +if (is_hdmi_tmds) { +hwss_add_stream_enc_update_hdmi_info_packets (seq_state, pipe_ctx); +return ; + } + +if (is_dp) { +if (dp_is_128b_132b_signal (pipe_ctx)) { +hwss_add_hpo_dp_stream_enc_update_dp_info_packets_sdp_line_num (seq_state, pipe_ctx); +hwss_add_hpo_dp_stream_enc_update_dp_info_packets (seq_state, pipe_ctx); + }else { +hwss_add_stream_enc_update_dp_info_packets_sdp_line_num (seq_state, pipe_ctx); +hwss_add_stream_enc_update_dp_info_packets (seq_state, pipe_ctx); + } + } +} + +static void add_link_update_dsc_config_sequence ( +struct block_sequence_state *seq_state, +struct pipe_ctx *pipe_ctx, +struct dsc_config *dsc_cfg, +struct dsc_optc_config *dsc_optc_cfg) +{ +struct display_stream_compressor *dsc = pipe_ctx->stream_res.dsc; +struct dc_stream_state *stream = pipe_ctx->stream; +struct dc *dc = stream->ctx->dc; +struct dccg *dccg = dc->res_pool->dccg; +struct pipe_ctx *top_pipe = pipe_ctx; +struct pipe_ctx *odm_pipe =NULL ; +int opp_cnt =1 ; +bool should_use_dto_dscclk = false; +struct dsc_config dsc_pps_cfg; +uint8_t *dsc_packed_pps = stream->dsc_packed_pps; +int last_dsc_set_config_step =0 ; + +if (!stream->timing.flags.DSC || !dsc) +return ; + +while (top_pipe->prev_odm_pipe) + top_pipe = top_pipe->prev_odm_pipe; + +for (odm_pipe = top_pipe->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) + opp_cnt++; + +memset (dsc_cfg,0 ,sizeof (*dsc_cfg)); +memset (dsc_optc_cfg,0 ,sizeof (*dsc_optc_cfg)); + + dsc_cfg->pic_width = (stream->timing.h_addressable + + top_pipe->dsc_padding_params.dsc_hactive_padding + + stream->timing.h_border_left + + stream->timing.h_border_right) / opp_cnt; + dsc_cfg->pic_height = stream->timing.v_addressable + + stream->timing.v_border_top + + stream->timing.v_border_bottom; + dsc_cfg->pixel_encoding = stream->timing.pixel_encoding; + dsc_cfg->color_depth = stream->timing.display_color_depth; + dsc_cfg->is_odm = top_pipe->next_odm_pipe ? true : false; + dsc_cfg->dc_dsc_cfg = stream->timing.dsc_cfg; +ASSERT (dsc_cfg->dc_dsc_cfg.num_slices_h % opp_cnt ==0 ); + dsc_cfg->dc_dsc_cfg.num_slices_h /= opp_cnt; + dsc_cfg->dsc_padding =0 ; + +if (dccg && dccg->funcs->set_dto_dscclk && + stream->timing.pix_clk_100hz >480000 ) + should_use_dto_dscclk = true; + +if (should_use_dto_dscclk) +hwss_add_dccg_set_dto_dscclk (seq_state, dccg, dsc->inst, + dsc_cfg->dc_dsc_cfg.num_slices_h); + + last_dsc_set_config_step = *seq_state->num_steps; +hwss_add_dsc_set_config (seq_state, dsc, dsc_cfg, dsc_optc_cfg); +hwss_add_dsc_enable_with_opp (seq_state, top_pipe); + +for (odm_pipe = top_pipe->next_odm_pipe; odm_pipe; odm_pipe = odm_pipe->next_odm_pipe) { +struct display_stream_compressor *odm_dsc = odm_pipe->stream_res.dsc; + +if (should_use_dto_dscclk) +hwss_add_dccg_set_dto_dscclk (seq_state, dccg, odm_dsc->inst, + dsc_cfg->dc_dsc_cfg.num_slices_h); + + last_dsc_set_config_step = *seq_state->num_steps; +hwss_add_dsc_set_config (seq_state, odm_dsc, dsc_cfg, dsc_optc_cfg); +hwss_add_dsc_enable_with_opp (seq_state, odm_pipe); + } + +if (dc_is_dp_signal (stream->signal) && !dp_is_128b_132b_signal (pipe_ctx)) +hwss_add_stream_enc_dp_set_dsc_config (seq_state, + pipe_ctx->stream_res.stream_enc, + &seq_state->steps[last_dsc_set_config_step].params.dsc_set_config_simple_params.dsc_optc_cfg); + +hwss_add_tg_set_dsc_config (seq_state, top_pipe->stream_res.tg, + &seq_state->steps[last_dsc_set_config_step].params.dsc_set_config_simple_params.dsc_optc_cfg, true); + +memset (&dsc_pps_cfg,0 ,sizeof (dsc_pps_cfg)); + dsc_pps_cfg.pic_width = stream->timing.h_addressable + + stream->timing.h_border_left + stream->timing.h_border_right; + dsc_pps_cfg.pic_height = stream->timing.v_addressable + + stream->timing.v_border_top + stream->timing.v_border_bottom; + dsc_pps_cfg.pixel_encoding = stream->timing.pixel_encoding; + dsc_pps_cfg.color_depth = stream->timing.display_color_depth; + dsc_pps_cfg.is_odm = top_pipe->next_odm_pipe ? true : false; + dsc_pps_cfg.dc_dsc_cfg = stream->timing.dsc_cfg; + dsc_pps_cfg.dsc_padding = top_pipe->dsc_padding_params.dsc_hactive_padding; + +if (dsc->funcs->dsc_get_packed_pps) { + dsc->funcs->dsc_get_packed_pps (dsc, &dsc_pps_cfg, dsc_packed_pps); + +if (dc_is_dp_signal (stream->signal)) { +if (dp_is_128b_132b_signal (pipe_ctx)) +hwss_add_hpo_dp_stream_enc_dp_set_dsc_pps_info_packet (seq_state, + pipe_ctx->stream_res.hpo_dp_stream_enc, + true, dsc_packed_pps, false); +else +hwss_add_stream_enc_dp_set_dsc_pps_info_packet (seq_state, + pipe_ctx->stream_res.stream_enc, + true, dsc_packed_pps, false); + } + } +} + +static void commit_planes_do_stream_update_sequence (struct dc *dc, +struct dc_stream_state *stream, +struct dc_stream_update *stream_update, +enum surface_update_type update_type, +struct dc_state *context, +struct block_sequence block_sequence[MAX_HWSS_BLOCK_SEQUENCE_SIZE ], +unsigned int *num_steps) +{ +int j; +struct block_sequence_state seq_state = { .steps = block_sequence, .num_steps = num_steps }; +struct dsc_config dsc_cfgs[MAX_PIPES ]; +struct dsc_optc_config dsc_optc_cfgs[MAX_PIPES ]; +unsigned int dsc_cfg_index =0 ; + *num_steps =0 ;// Initialize to 0 + +// Stream updates +for (j =0 ; j < dc->res_pool->pipe_count; j++) { +struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j]; + +if (resource_is_pipe_type (pipe_ctx,OTG_MASTER ) && pipe_ctx->stream == stream) { + +if (stream_update->periodic_interrupt && dc->hwss.setup_periodic_interrupt) +hwss_add_setup_periodic_interrupt (&seq_state, dc, pipe_ctx); + +if ((stream_update->hdr_static_metadata && !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) { +resource_build_info_frame (pipe_ctx); +add_update_info_frame_sequence (&seq_state, pipe_ctx); + +if (dc_is_dp_signal (pipe_ctx->stream->signal)) +hwss_add_dp_trace_source_sequence (&seq_state, + pipe_ctx->stream->link, +DPCD_SOURCE_SEQ_AFTER_UPDATE_INFO_FRAME ); + } + +if (stream_update->hdr_static_metadata && + stream->use_dynamic_meta && + dc->hwss.set_dmdata_attributes && + pipe_ctx->stream->dmdata_address.quad_part !=0 ) +hwss_add_set_dmdata_attributes (&seq_state, pipe_ctx); + +if (stream_update->gamut_remap) +hwss_add_dpp_program_gamut_remap (&seq_state, pipe_ctx); + +if (stream_update->output_csc_transform) +hwss_add_program_output_csc (&seq_state, dc, pipe_ctx, + stream->output_color_space, + stream->csc_color_matrix.matrix, + pipe_ctx->stream_res.opp->inst); + +if (stream_update->dither_option) { +struct pipe_ctx *odm_pipe = pipe_ctx->next_odm_pipe; +resource_build_bit_depth_reduction_params (pipe_ctx->stream, + &pipe_ctx->stream->bit_depth_params); +hwss_add_opp_program_fmt (&seq_state, pipe_ctx->stream_res.opp, + &stream->bit_depth_params, + &stream->clamping); +while (odm_pipe) { +hwss_add_opp_program_fmt (&seq_state, odm_pipe->stream_res.opp, + &stream->bit_depth_params, + &stream->clamping); + odm_pipe = odm_pipe->next_odm_pipe; + } + } + +if (stream_update->cursor_attributes) +program_cursor_attributes_sequence (dc, stream, context, &seq_state); + +if (stream_update->cursor_position) +program_cursor_position_sequence (dc, stream, context, &seq_state); + +/* Full fe update*/ +if (update_type ==UPDATE_TYPE_FAST ) +continue ; + +if (stream_update->dsc_config) +if (dsc_cfg_index <MAX_PIPES ) { +add_link_update_dsc_config_sequence (&seq_state, + pipe_ctx, + &dsc_cfgs[dsc_cfg_index], + &dsc_optc_cfgs[dsc_cfg_index]); + dsc_cfg_index++; + } + +if (stream_update->mst_bw_update) { +if (stream_update->mst_bw_update->is_increase) +hwss_add_link_increase_mst_payload (&seq_state, + pipe_ctx, + stream_update->mst_bw_update->mst_stream_bw); +else +hwss_add_link_reduce_mst_payload (&seq_state, + pipe_ctx, + stream_update->mst_bw_update->mst_stream_bw); + } + +if (stream_update->pending_test_pattern) { +/* +* test pattern params depends on ODM topology +* changes that we could be applying to front +* end. Since at the current stage front end +* changes are not yet applied. We can only +* apply test pattern in hw based on current +* state and populate the final test pattern +* params in new state. If current and new test +* pattern params are different as result of +* different ODM topology being used, it will be +* detected and handle during front end +* programming update. +*/ +hwss_add_dp_set_test_pattern (&seq_state, + stream->link, + stream->test_pattern.type, + stream->test_pattern.color_space, + stream->test_pattern.p_link_settings, + stream->test_pattern.p_custom_pattern, + stream->test_pattern.cust_pattern_size); +resource_build_test_pattern_params (&context->res_ctx, pipe_ctx); + } + +if (stream_update->dpms_off) { +// 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) { +hwss_add_link_set_dpms_off (&seq_state, dpms_pipe_ctx); +/* for dpms, keep acquired resources*/ +if (dpms_pipe_ctx->stream_res.audio && !dc->debug.az_endpoint_mute_only) +hwss_add_disable_audio_stream (&seq_state, dpms_pipe_ctx); + +hwss_add_dc_set_optimized_required (&seq_state, dc, true); + + }else { +if (get_seamless_boot_stream_count (context) ==0 ) +hwss_add_prepare_bandwidth (&seq_state, dc, dc->current_state); +hwss_add_link_set_dpms_on (&seq_state, 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)) { +/* +* Workaround for firmware issue in some receivers where they don't pick up +* correct output color space unless DP link is disabled/re-enabled +*/ +hwss_add_link_set_dpms_on (&seq_state, dc->current_state, pipe_ctx); + } + +if (stream_update->abm_level && pipe_ctx->stream_res.abm) { +bool should_program_abm = true; + +// if otg funcs defined check if blanked before programming +if (pipe_ctx->stream_res.tg->funcs->is_blanked) +if (pipe_ctx->stream_res.tg->funcs->is_blanked (pipe_ctx->stream_res.tg)) + should_program_abm = false; + +if (should_program_abm) { +if (*stream_update->abm_level ==ABM_LEVEL_IMMEDIATE_DISABLE ) { +hwss_add_abm_set_immediate_disable (&seq_state, dc, pipe_ctx); + }else { +hwss_add_abm_set_level (&seq_state, pipe_ctx->stream_res.abm, stream->abm_level); + } + } + } + } + } +} + static void commit_planes_do_stream_update(struct dc *dc, struct dc_stream_state *stream, struct dc_stream_update *stream_update,
@@ -3839,6 +4244,22 @@ static void commit_planes_do_stream_update(struct dc *dc, {int j; +// Check if block sequence programming is enabled +if (dc->debug.enable_block_sequence_programming) { +unsigned int num_steps =0 ; + +// Build the block sequence using context's pre-allocated array +commit_planes_do_stream_update_sequence (dc, stream, stream_update, + update_type, context, context->block_sequence, &num_steps); + +// Execute the block sequence +if (num_steps >0 ) +hwss_execute_sequence (dc, context->block_sequence, num_steps); + +return ; + } + +// Legacy path (existing implementation) // Stream updates for (j =0 ; j < dc->res_pool->pipe_count; j++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[j];
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +551 -35
629 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h +296 -49
435 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 6/17 drm/amd/display: Clean Up Legacy DML Content
In reply to James LinFrom: "Zheng, Austin" <[email protected]>
[Why & How]
Legacy files were used for the transition period between DML1 and DML2. Fully transitioned away from DML1 so these legacy files can be removed since they are not actively being used.
--- .../dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h deleted +0 -9
@@ -1,9 +0,0 @@ -// SPDX-License-Identifier: MIT -// -// Copyright 2024 Advanced Micro Devices, Inc. - -#ifndef __DML2_TOP_LEGACY_H__ -#define __DML2_TOP_LEGACY_H__ -#include "dml2_internal_shared_types.h" -bool dml2_top_legacy_initialize_instance (struct dml2_initialize_instance_in_out *in_out); -#endif /* __DML2_TOP_LEGACY_H__ */
Signature · 1 line
2.43.0
PATCH 7/17 drm/amd/display: remove watermark range notify
In reply to James LinFrom: Charlene Liu <[email protected]>
[Why & How]
dcn42 only use one set of watermark A,
driver always update set A runtime.
no need to notify pmfw the clock range.
--- drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +1 -1
@@ -1020,7 +1020,7 @@ static struct clk_mgr_funcs dcn42_funcs = { .init_clocks = dcn42_init_clocks, .enable_pme_wa = dcn42_enable_pme_wa, .are_clock_states_equal = dcn42_are_clock_states_equal, - .notify_wm_ranges = dcn42_notify_wm_ranges, + .notify_wm_ranges = NULL, .set_low_power_state = dcn42_set_low_power_state, .exit_low_power_state = dcn42_exit_low_power_state, .get_max_clock_khz = dcn42_get_max_clock_khz,
Signature · 1 line
2.43.0
PATCH 8/17 drm/amd/display: Rename backlight_properties to pwr_backlight_properties
In reply to James LinFrom: Ray Wu <[email protected]>
[Why]
'struct backlight_properties' in power.c has the same name as the kernel's struct defined in <linux/backlight.h>. In out-of-tree backport build environments, the header is forcefully injected via command-line includes, causing a redefinition error.
[How]
Rename the file-local 'struct backlight_properties' to 'pwr_backlight_properties' to avoid the name collision. No functional change.
--- drivers/gpu/drm/amd/display/modules/power/power.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/modules/power/power.c +3 -3
@@ -70,7 +70,7 @@ struct power_entity {unsigned int replay_events; }; -struct backlight_properties { +struct pwr_backlight_properties {bool use_nits_based_brightness;bool disable_fractional_pwm;
@@ -118,7 +118,7 @@ struct core_power {struct dc *dc;struct power_entity *map;struct dmcu_varibright_cached_properties varibright_prop; -struct backlight_properties bl_prop[MAX_NUM_EDP ]; +struct pwr_backlight_properties bl_prop[MAX_NUM_EDP ];struct backlight_state bl_state[MAX_NUM_EDP ];unsigned int edp_num;
@@ -1103,7 +1103,7 @@ static void fill_backlight_level_params(struct core_power *core_power, unsigned int backlight_millinit, unsigned int transition_time_millisec, bool is_hdr) { - struct backlight_properties *bl_prop = &core_power->bl_prop[panel_inst]; + struct pwr_backlight_properties *bl_prop = &core_power->bl_prop[panel_inst]; backlight_level_params->aux_inst = aux_inst; backlight_level_params->backlight_pwm_u16_16 = backlight_pwm;
Signature · 1 line
2.43.0
PATCH 9/17 drm/amd/display: Skip HDR metadata update when Smart Power OLED enabled
In reply to James LinFrom: Ian Chen <[email protected]>
[Why & How]
While smart power oled is enabled,
the infopacket contents are tied to the frame histogram, so it does not need driver side to update the hdr metadata.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 4 ++++ drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + .../drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c | 6 +++++- .../amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 6 ++++++ drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + 6 files changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +4 -0
@@ -6534,6 +6534,10 @@ bool dc_smart_power_oled_enable(const struct dc_link *link, bool enable, uint16_// send cmd status =dc_wake_and_execute_dmub_cmd (dc->ctx, &cmd,DM_DMUB_WAIT_TYPE_WAIT ); +// Update firmware_controlled_hdr_info_packet state on successful command execution +if (status && pipe_ctx) + pipe_ctx->stream->firmware_controlled_hdr_info_packet = enable; +return status; }
drivers/gpu/drm/amd/display/dc/dc_stream.h +1 -0
@@ -304,6 +304,7 @@ struct dc_stream_state {enum dc_drr_trigger_mode drr_trigger_mode;struct dc_update_scratch_space *update_scratch; +bool firmware_controlled_hdr_info_packet; };#define ABM_LEVEL_IMMEDIATE_DISABLE 255
drivers/gpu/drm/amd/display/dc/dio/dcn30/dcn30_dio_stream_encoder.c +5 -1
@@ -470,7 +470,11 @@ void enc3_stream_encoder_update_dp_info_packets( &info_frame->spd, true); } -if (info_frame->hdrsmd.valid) { +/* While smart power oled is enabled DMUB is scanning the contents of each frame +* and updating the HDR infopacket contents. Therefore we transition the infopacket +* programming control to DMUB while Smart Power OLED is enabled. +*/ +if (info_frame->hdrsmd.valid && !info_frame->firmware_controlled_hdr_info_packet) { enc->vpg->funcs->update_generic_info_packet( enc->vpg, 3, /* packetIndex */
drivers/gpu/drm/amd/display/dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c +1 -1
@@ -468,7 +468,7 @@ static void dcn31_hpo_dp_stream_enc_update_dp_info_packets( &info_frame->spd, true); -if (info_frame->hdrsmd.valid) +if (info_frame->hdrsmd.valid && !info_frame->firmware_controlled_hdr_info_packet) enc->vpg->funcs->update_generic_info_packet( enc->vpg, 3, /* packetIndex */
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +6 -0
@@ -399,6 +399,9 @@ void dcn31_update_info_frame(struct pipe_ctx *pipe_ctx) pipe_ctx->stream_res.hpo_dp_stream_enc, &pipe_ctx->stream_res.encoder_info_frame); + pipe_ctx->stream_res.encoder_info_frame.firmware_controlled_hdr_info_packet + = pipe_ctx->stream->firmware_controlled_hdr_info_packet; + pipe_ctx->stream_res.hpo_dp_stream_enc->funcs->update_dp_info_packets ( pipe_ctx->stream_res.hpo_dp_stream_enc, &pipe_ctx->stream_res.encoder_info_frame);
@@ -409,6 +412,9 @@ void dcn31_update_info_frame(struct pipe_ctx *pipe_ctx) pipe_ctx->stream_res.stream_enc, &pipe_ctx->stream_res.encoder_info_frame); + pipe_ctx->stream_res.encoder_info_frame.firmware_controlled_hdr_info_packet + = pipe_ctx->stream->firmware_controlled_hdr_info_packet; + pipe_ctx->stream_res.stream_enc->funcs->update_dp_info_packets ( pipe_ctx->stream_res.stream_enc, &pipe_ctx->stream_res.encoder_info_frame);
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +1 -0
@@ -93,6 +93,7 @@ struct encoder_info_frame {/* Adaptive Sync SDP*/ struct dc_info_packet adaptive_sync;struct enc_sdp_line_num sdp_line_num; +bool firmware_controlled_hdr_info_packet; };struct encoder_unblank_param {
Signature · 1 line
2.43.0
PATCH 10/17 drm/amd/display: Fix type mismatches in DC and DMUB modules
In reply to James LinFrom: Gaghik Khachatrian <[email protected]>
[Why]
Address signed/unsigned comparison warnings across dc paths to keep builds warning-clean and improve type safety at comparison boundaries. Most warnings came from signed loop/index temporaries compared against unsigned counters and table sizes, plus a smaller number of mixed signed/unsigned clock, bandwidth, and geometry comparisons.
[How]
Aligned loop/index and bound types in the affected modules and DMUB sources, including color, freesync, power, stats, and vmid paths. Used unsigned iterators where bounds/counters are unsigned, preserved signed types where negative values are meaningful, and updated related format specifiers where type changes required it. Changes are limited to warning resolution and type alignment.
No functional behavior change is intended.
--- .../drm/amd/display/dmub/src/dmub_dcn401.c | 2 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 2 +- .../amd/display/modules/color/color_gamma.c | 12 +++++----- .../gpu/drm/amd/display/modules/power/power.c | 22 +++++++++---------- .../gpu/drm/amd/display/modules/vmid/vmid.c | 6 ++--- 5 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c +1 -1
@@ -535,7 +535,7 @@ void dmub_dcn401_send_reg_inbox0_cmd_msg(struct dmub_srv *dmub, union dmub_rb_cmd *cmd) {uint32_t *dwords = (uint32_t *)cmd; -int32_t payload_size_bytes = cmd->cmd_common.header.payload_bytes; +uint32_t payload_size_bytes = cmd->cmd_common.header.payload_bytes;uint32_t msg_index;static_assert (sizeof (*cmd) ==64 ,"DMUB command size mismatch" );
drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c +1 -1
@@ -429,7 +429,7 @@ void dmub_dcn42_send_reg_inbox0_cmd_msg(struct dmub_srv *dmub, union dmub_rb_cmd *cmd) {uint32_t *dwords = (uint32_t *)cmd; -int32_t payload_size_bytes = cmd->cmd_common.header.payload_bytes; +uint32_t payload_size_bytes = cmd->cmd_common.header.payload_bytes;uint32_t msg_index;static_assert (sizeof (*cmd) ==64 ,"DMUB command size mismatch" );
drivers/gpu/drm/amd/display/modules/color/color_gamma.c +6 -6
@@ -364,7 +364,7 @@ void precompute_pq(void)/* one-time pre-compute dePQ values - only for max pixel value 125 FP16 */ void precompute_de_pq (void ) { -int i; +uint32_t i;struct fixed31_32 y;uint32_t begin_index, end_index;
@@ -783,7 +783,7 @@ static struct fixed31_32 calculate_mapped_value(struct pwl_float_data *rgb, const struct pixel_gamma_point *coeff, enum channel_name channel, - uint32_t max_index) + int32_t max_index) { const struct gamma_point *point;
@@ -1425,7 +1425,7 @@ static void apply_lut_1d(uint32_t num_hw_points, struct dc_transfer_func_distributed_points *tf_pts) { - int i = 0; + uint32_t i = 0;int color =0 ;struct fixed31_32 *regamma_y;struct fixed31_32 norm_y;
@@ -1569,7 +1569,7 @@ static bool calculate_interpolated_hardware_curve( {const struct pixel_gamma_point *coeff = coeff128; -uint32_t max_entries =3 -1 ; +int32_t max_entries =3 -1 ;uint32_t i =0 ;
@@ -1581,7 +1581,7 @@ static bool calculate_interpolated_hardware_curve( } i =0 ; - max_entries += ramp->num_entries; + max_entries += (int32_t )ramp->num_entries;/* TODO: float point case */
@@ -1635,7 +1635,7 @@ static bool map_regamma_hw_to_x_user( {/* setup to spare calculated ideal regamma values */ -int i =0 ; +uint32_t i =0 ;struct hw_x_point *coords = coords_x;const struct pwl_float_data_ex *regamma = rgb_regamma;
drivers/gpu/drm/amd/display/modules/power/power.c +11 -11
@@ -125,7 +125,7 @@ struct core_power {bool psr_smu_optimizations_support;bool multi_disp_optimizations_support; -int num_entities; +unsigned int num_entities; };union dmcu_abm_set_bl_params {
@@ -628,7 +628,7 @@ bool mod_power_hw_init(struct mod_power *mod_power)struct dc *dc =NULL ;struct dmcu *dmcu =NULL ;struct dmcu_iram_parameters params; -int i; +unsigned int i;if (mod_power ==NULL )return false;
@@ -668,7 +668,7 @@ struct mod_power *mod_power_create(struct dc *dc, {struct core_power *core_power =NULL ;int i =0 ; -int abm_max_config =0 ; +unsigned int abm_max_config =0 ;unsigned int inst =0 ;bool is_brightness_range_valid = false;
@@ -854,7 +854,7 @@ struct mod_power *mod_power_create(struct dc *dc,void mod_power_destroy (struct mod_power *mod_power) {if (mod_power !=NULL ) { -int i; +unsigned int i;struct core_power *core_power =MOD_POWER_TO_CORE (mod_power);
@@ -903,7 +903,7 @@ bool mod_power_add_stream(struct mod_power *mod_power,DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , WPP_BIT_FLAG_Firmware_PsrState, -"mod_power: add_stream: ERROR: stream=%p num_entities=%d >= MOD_POWER_MAX_CONCURRENT_STREAMS" , +"mod_power: add_stream: ERROR: stream=%p num_entities=%u >= MOD_POWER_MAX_CONCURRENT_STREAMS" , stream, core_power->num_entities);
@@ -913,7 +913,7 @@ bool mod_power_add_stream(struct mod_power *mod_power,bool mod_power_remove_stream (struct mod_power *mod_power,const struct dc_stream_state *stream) { -int i =0 ; +unsigned int i =0 ;struct core_power *core_power =NULL ;unsigned int index =0 ;
@@ -938,7 +938,7 @@ bool mod_power_remove_stream(struct mod_power *mod_power,BREAK_TO_DEBUGGER ();DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , WPP_BIT_FLAG_Firmware_PsrState, -"mod_power: remove_stream: ERROR: index=%u >= num_entities=%d stream=%p" , +"mod_power: remove_stream: ERROR: index=%u >= num_entities=%u stream=%p" , index, core_power->num_entities, stream);
@@ -1004,7 +1004,7 @@ bool mod_power_replace_stream(struct mod_power *mod_power,BREAK_TO_DEBUGGER ();DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , WPP_BIT_FLAG_Firmware_PsrState, -"mod_power: replace_stream: ERROR: index=%u >= num_entities=%d stream=%p" , +"mod_power: replace_stream: ERROR: index=%u >= num_entities=%u stream=%p" , index, core_power->num_entities, current_stream);
@@ -1432,7 +1432,7 @@ bool mod_power_get_hw_backlight_aux_nits(struct mod_power *mod_power, {struct core_power *core_power =NULL ;struct dc_link *link =NULL ; -unsigned int stream_index; +int stream_index;if (mod_power ==NULL )return false;
@@ -1910,7 +1910,7 @@ static bool set_psr_enable(struct mod_power *mod_power,if (core_power->num_entities ==0 ) {DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , WPP_BIT_FLAG_Firmware_PsrState, -"set psr enable: ERROR: stream=%p num_entities=%d" , +"set psr enable: ERROR: stream=%p num_entities=%u" , stream, core_power->num_entities);return false;
@@ -2043,7 +2043,7 @@ bool mod_power_set_psr_event(struct mod_power *mod_power,if (core_power->num_entities ==0 ) {DC_TRACE_LEVEL_MESSAGE (DAL_TRACE_LEVEL_ERROR , WPP_BIT_FLAG_Firmware_PsrState, -"mod_power set_psr_event: ERROR: stream=%p event=%d num_entities=%d" , +"mod_power set_psr_event: ERROR: stream=%p event=%d num_entities=%u" , stream, (int )event, core_power->num_entities);
drivers/gpu/drm/amd/display/modules/vmid/vmid.c +3 -3
@@ -56,7 +56,7 @@ static void clear_entry_from_vmid_table(struct core_vmid *core_vmid, unsigned instatic void evict_vmids (struct core_vmid *core_vmid) { -int i; +unsigned int i;int ord_int =dc_get_vmid_use_vector (core_vmid->dc);ASSERT (ord_int >=0 && ord_int <=0xFFFF );
@@ -72,7 +72,7 @@ static void evict_vmids(struct core_vmid *core_vmid)// Return value of -1 indicates vmid table uninitialized or ptb dne in the table static int get_existing_vmid_for_ptb (struct core_vmid *core_vmid,uint64_t ptb) { -int i; +unsigned int i;for (i =0 ; i < core_vmid->num_vmid; i++) {if (core_vmid->ptb_assigned_to_vmid[i] == ptb)
@@ -85,7 +85,7 @@ static int get_existing_vmid_for_ptb(struct core_vmid *core_vmid, uint64_t ptb)// Expected to be called only when there's an available vmid static int get_next_available_vmid (struct core_vmid *core_vmid) { -int i; +unsigned int i;for (i =1 ; i < core_vmid->num_vmid; i++) {if (core_vmid->ptb_assigned_to_vmid[i] ==0 )
Signature · 1 line
2.43.0
PATCH 11/17 drm/amd/display: Fix type mismatches using guards and explicit casts
In reply to James LinFrom: Gaghik Khachatrian <[email protected]>
[Why]
Address signed/unsigned comparison warnings across dc paths to keep builds warning-clean and improve type safety at comparison boundaries. Most warnings came from signed loop/index temporaries compared against unsigned counters and table sizes, plus a smaller number of mixed signed/unsigned clock, bandwidth, and geometry comparisons.
[How]
Aligned iterator and temporary variable types with the semantic type of the compared bounds. Used unsigned indices for loops bounded by unsigned counters and table sizes, while retaining signed types where values are semantically signed or participate in arithmetic that may legitimately go negative. Where mixed signed/unsigned comparisons are intentional, applied explicit boundary casts or guarded comparisons instead of broad type changes.
No functional behavior changes are intended; this is a warning-resolution and type-alignment cleanup.
--- .../drm/amd/display/dc/basics/conversion.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 30 ++--- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 17 ++- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 30 ++--- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 41 +++---- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 55 ++++----- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 53 +++++---- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 43 +++---- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 21 ++-- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 111 +++++++++--------- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 19 +-- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 24 ++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 109 +++++++++-------- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 10 +- .../drm/amd/display/dc/core/dc_link_enc_cfg.c | 11 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 67 ++++++----- .../gpu/drm/amd/display/dc/core/dc_state.c | 4 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 12 +- .../gpu/drm/amd/display/dc/core/dc_surface.c | 6 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 +- drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 +- .../drm/amd/display/dc/dce/dce_link_encoder.c | 3 +- .../drm/amd/display/dc/dce/dce_transform.c | 4 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 12 +- .../dc/dcn10/dcn10_hw_sequencer_debug.c | 22 ++-- .../drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 2 +- .../amd/display/dc/dcn30/dcn30_cm_common.c | 8 +- .../display/dc/dio/dcn10/dcn10_link_encoder.c | 11 +- .../amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 2 +- .../amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c | 2 +- .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 13 +- .../amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 2 +- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 2 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 3 +- .../amd/display/dc/dsc/dcn401/dcn401_dsc.c | 3 +- .../display/dc/hubbub/dcn401/dcn401_hubbub.c | 7 +- .../display/dc/hubbub/dcn42/dcn42_hubbub.c | 5 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 2 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 26 ++-- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 55 ++++----- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 34 +++--- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 15 ++- .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 6 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 32 ++--- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 68 ++++++----- .../amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 43 ++++--- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 21 ++-- .../drm/amd/display/dc/link/link_detection.c | 6 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 4 +- .../drm/amd/display/dc/link/link_factory.c | 2 +- .../drm/amd/display/dc/link/link_validation.c | 4 +- .../dc/link/protocols/link_dp_capability.c | 4 +- .../dc/link/protocols/link_dp_dpia_bw.c | 2 +- .../dc/link/protocols/link_dp_irq_handler.c | 2 +- .../dc/link/protocols/link_dp_training.c | 4 +- .../drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 2 +- .../amd/display/dc/optc/dcn10/dcn10_optc.c | 2 +- .../amd/display/dc/pg/dcn35/dcn35_pg_cntl.c | 6 +- .../amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 4 +- .../dcn42/dcn42_soc_and_ip_translator.c | 6 +- 69 files changed, 631 insertions(+), 542 deletions(-)
drivers/gpu/drm/amd/display/dc/basics/conversion.c +1 -1
@@ -131,7 +131,7 @@ void convert_hw_matrix(struct fixed31_32 *matrix, uint16_t *reg, uint32_t buffer_size) { -for (int i =0 ; i < buffer_size; ++i) +for (uint32_t i =0 ; i < buffer_size; ++i) matrix[i] =int_frac_to_fixed_point (reg[i],2 ,13 ); }
drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c +2 -2
@@ -302,7 +302,7 @@ static void calculate_bandwidth( fbc_enabled = false; lpt_enabled = false;for (i =4 ; i <= maximum_number_of_surfaces -3 ; i++) { -if (i < data->number_of_displays +4 ) { +if (i < (int32_t )(data->number_of_displays +4 )) {if (i ==4 && data->d0_underlay_mode == bw_def_underlay_only) { data->enable[i] =0 ; data->use_alpha[i] =0 ;
@@ -2767,7 +2767,7 @@ static bool is_display_configuration_supported(const struct bw_calcs_vbios *vbios, const struct dce_bw_output *calcs_output) { - uint32_t int_max_clk; + int32_t int_max_clk; int_max_clk =bw_fixed_to_int (vbios->high_voltage_max_dispclk); int_max_clk *=1000 ;/* MHz to kHz */
drivers/gpu/drm/amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c +3 -3
@@ -63,11 +63,11 @@ static const struct state_dependent_clocks dce110_max_clks_by_state[] = {/*ClocksStatePerformance*/ { .display_clk_khz = 643000, .pixel_clk_khz = 400000 } }; -static int determine_sclk_from_bounding_box ( +static uint32_t determine_sclk_from_bounding_box (const struct dc *dc, -int required_sclk) +uint32_t required_sclk) { -int i; +uint32_t i;/* * Some asics do not give us sclk levels, so we just report the actual
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c +1 -1
@@ -88,7 +88,7 @@ static void ramp_up_dispclk_with_dpp(struct dc_clocks *new_clocks, bool safe_to_lower) { - int i; + uint32_t i;int dispclk_to_dpp_threshold =rv1_determine_dppclk_threshold (clk_mgr, new_clocks);bool request_dpp_div = new_clocks->dispclk_khz > new_clocks->dppclk_khz;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c +7 -4
@@ -104,7 +104,7 @@ uint32_t dentist_get_did_from_divider(int divider)void dcn20_update_clocks_update_dpp_dto (struct clk_mgr_internal *clk_mgr,struct dc_state *context,bool safe_to_lower) { -int i; +uint32_t i; clk_mgr->dccg->ref_dppclk = clk_mgr->base.clks.dppclk_khz;for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {
@@ -255,9 +255,12 @@ void dcn2_update_clocks(struct clk_mgr *clk_mgr_base, pp_smu->set_display_count (&pp_smu->pp_smu, display_count); } -if (dc->debug.force_min_dcfclk_mhz >0 ) - new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > (dc->debug.force_min_dcfclk_mhz *1000 )) ? - new_clocks->dcfclk_khz : (dc->debug.force_min_dcfclk_mhz *1000 ); +if (dc->debug.force_min_dcfclk_mhz >0 ) { +int force_min_dcfclk_khz = dc->debug.force_min_dcfclk_mhz *1000 ; + + new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > force_min_dcfclk_khz) ? + new_clocks->dcfclk_khz : force_min_dcfclk_khz; + }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;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c +16 -14
@@ -106,7 +106,7 @@ static void rn_set_low_power_state(struct clk_mgr *clk_mgr_base)static void rn_update_clocks_update_dpp_dto (struct clk_mgr_internal *clk_mgr,struct dc_state *context,int ref_dpp_clk,bool safe_to_lower) { -int i; +uint32_t i; clk_mgr->dccg->ref_dppclk = ref_dpp_clk;
@@ -644,6 +644,8 @@ static unsigned int find_dcfclk_for_voltage(struct dpm_clocks *clock_table, unsistatic void rn_clk_mgr_helper_populate_bw_params (struct clk_bw_params *bw_params,struct dpm_clocks *clock_table,struct integrated_info *bios_info) {int i, j =0 ; +unsigned int entry_idx; +unsigned int wm_idx; j =-1 ;
@@ -667,28 +669,28 @@ static void rn_clk_mgr_helper_populate_bw_params(struct clk_bw_params *bw_params bw_params->clk_table.num_entries = j +1 ; -for (i =0 ; i < bw_params->clk_table.num_entries; i++, j--) { - bw_params->clk_table.entries[i].fclk_mhz = clock_table->FClocks[j].Freq; - bw_params->clk_table.entries[i].memclk_mhz = clock_table->MemClocks[j].Freq; - bw_params->clk_table.entries[i].voltage = clock_table->FClocks[j].Vol; - bw_params->clk_table.entries[i].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->FClocks[j].Vol); - bw_params->clk_table.entries[i].socclk_mhz =find_socclk_for_voltage (clock_table, - bw_params->clk_table.entries[i].voltage); +for (entry_idx =0 ; entry_idx < bw_params->clk_table.num_entries; entry_idx++, j--) { + bw_params->clk_table.entries[entry_idx].fclk_mhz = clock_table->FClocks[j].Freq; + bw_params->clk_table.entries[entry_idx].memclk_mhz = clock_table->MemClocks[j].Freq; + bw_params->clk_table.entries[entry_idx].voltage = clock_table->FClocks[j].Vol; + bw_params->clk_table.entries[entry_idx].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->FClocks[j].Vol); + bw_params->clk_table.entries[entry_idx].socclk_mhz =find_socclk_for_voltage (clock_table, + bw_params->clk_table.entries[entry_idx].voltage); } bw_params->vram_type = bios_info->memory_type; bw_params->num_channels = bios_info->ma_channel_number; -for (i =0 ; i <WM_SET_COUNT ; i++) { - bw_params->wm_table.entries[i].wm_inst = i; +for (wm_idx =0 ; wm_idx < (unsigned int )WM_SET_COUNT ; wm_idx++) { + bw_params->wm_table.entries[wm_idx].wm_inst = wm_idx; -if (i >= bw_params->clk_table.num_entries) { - bw_params->wm_table.entries[i].valid = false; +if (wm_idx >= bw_params->clk_table.num_entries) { + bw_params->wm_table.entries[wm_idx].valid = false;continue ; } - bw_params->wm_table.entries[i].wm_type =WM_TYPE_PSTATE_CHG ; - bw_params->wm_table.entries[i].valid = true; + bw_params->wm_table.entries[wm_idx].wm_type =WM_TYPE_PSTATE_CHG ; + bw_params->wm_table.entries[wm_idx].valid = true; }if (bw_params->vram_type == LpDdr4MemType) {
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c +11 -6
@@ -228,9 +228,12 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,if (enter_display_off == safe_to_lower)dcn30_smu_set_num_of_displays (clk_mgr, display_count); -if (dc->debug.force_min_dcfclk_mhz >0 ) - new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > (dc->debug.force_min_dcfclk_mhz *1000 )) ? - new_clocks->dcfclk_khz : (dc->debug.force_min_dcfclk_mhz *1000 ); +if (dc->debug.force_min_dcfclk_mhz >0 ) { +int force_min_dcfclk_khz = dc->debug.force_min_dcfclk_mhz *1000 ; + + new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > force_min_dcfclk_khz) ? + new_clocks->dcfclk_khz : force_min_dcfclk_khz; + }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;
@@ -251,8 +254,10 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,// invalidate the current P-State forced min in certain dc_mode_softmax situations if (dc->clk_mgr->dc_mode_softmax_enabled && safe_to_lower && !p_state_change_support) { -if ((new_clocks->dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) != - (clk_mgr_base->clks.dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 )) +int softmax_memclk_khz = dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ; + +if ((new_clocks->dramclk_khz <= softmax_memclk_khz) != + (clk_mgr_base->clks.dramclk_khz <= softmax_memclk_khz)) update_pstate_unsupported_clk = true; }
@@ -263,7 +268,7 @@ static void dcn3_update_clocks(struct clk_mgr *clk_mgr_base,/* to disable P-State switching, set UCLK min = max */ if (!clk_mgr_base->clks.p_state_change_support) {if (dc->clk_mgr->dc_mode_softmax_enabled && - new_clocks->dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) + new_clocks->dramclk_khz <= (int )(dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ))dcn30_smu_set_hard_min_by_freq (clk_mgr,PPCLK_UCLK , (uint16_t )dc->clk_mgr->bw_params->dc_mode_softmax_memclk);else
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +16 -14
@@ -533,7 +533,7 @@ static struct clk_bw_params vg_bw_params = {static uint32_t find_max_clk_value (const uint32_t clocks[],uint32_t num_clocks) {uint32_t max =0 ; -int i; +uint32_t i;for (i =0 ; i < num_clocks; ++i) {if (clocks[i] > max)
@@ -565,6 +565,7 @@ static void vg_clk_mgr_helper_populate_bw_params( const struct vg_dpm_clocks *clock_table) {int i, j; +unsigned int entry_idx;struct clk_bw_params *bw_params = clk_mgr->base.bw_params;uint32_t max_dispclk =0 , max_dppclk =0 ;
@@ -599,16 +600,17 @@ static void vg_clk_mgr_helper_populate_bw_params( bw_params->clk_table.num_entries = j +1 ; -for (i =0 ; i < bw_params->clk_table.num_entries -1 ; i++, j--) { - bw_params->clk_table.entries[i].fclk_mhz = clock_table->DfPstateTable[j].fclk; - bw_params->clk_table.entries[i].memclk_mhz = clock_table->DfPstateTable[j].memclk; - bw_params->clk_table.entries[i].voltage = clock_table->DfPstateTable[j].voltage; - bw_params->clk_table.entries[i].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->DfPstateTable[j].voltage); +for (entry_idx =0 ; entry_idx < bw_params->clk_table.num_entries -1 ; entry_idx++, j--) { + bw_params->clk_table.entries[entry_idx].fclk_mhz = clock_table->DfPstateTable[j].fclk; + bw_params->clk_table.entries[entry_idx].memclk_mhz = clock_table->DfPstateTable[j].memclk; + bw_params->clk_table.entries[entry_idx].voltage = clock_table->DfPstateTable[j].voltage; + bw_params->clk_table.entries[entry_idx].dcfclk_mhz =find_dcfclk_for_voltage (clock_table, clock_table->DfPstateTable[j].voltage);/* Now update clocks we do read */ - bw_params->clk_table.entries[i].dispclk_mhz = max_dispclk; - bw_params->clk_table.entries[i].dppclk_mhz = max_dppclk; + bw_params->clk_table.entries[entry_idx].dispclk_mhz = max_dispclk; + bw_params->clk_table.entries[entry_idx].dppclk_mhz = max_dppclk; } + i = (int )entry_idx; bw_params->clk_table.entries[i].fclk_mhz = clock_table->DfPstateTable[j].fclk; bw_params->clk_table.entries[i].memclk_mhz = clock_table->DfPstateTable[j].memclk; bw_params->clk_table.entries[i].voltage = clock_table->DfPstateTable[j].voltage;
@@ -619,16 +621,16 @@ static void vg_clk_mgr_helper_populate_bw_params( bw_params->vram_type = bios_info->memory_type; bw_params->num_channels = bios_info->ma_channel_number; -for (i =0 ; i <WM_SET_COUNT ; i++) { - bw_params->wm_table.entries[i].wm_inst = i; +for (entry_idx =0 ; entry_idx < (unsigned int )WM_SET_COUNT ; entry_idx++) { + bw_params->wm_table.entries[entry_idx].wm_inst = entry_idx; -if (i >= bw_params->clk_table.num_entries) { - bw_params->wm_table.entries[i].valid = false; +if (entry_idx >= bw_params->clk_table.num_entries) { + bw_params->wm_table.entries[entry_idx].valid = false;continue ; } - bw_params->wm_table.entries[i].wm_type =WM_TYPE_PSTATE_CHG ; - bw_params->wm_table.entries[i].valid = true; + bw_params->wm_table.entries[entry_idx].wm_type =WM_TYPE_PSTATE_CHG ; + bw_params->wm_table.entries[entry_idx].valid = true; }if (bw_params->vram_type == LpDdr4MemType) {
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +21 -20
82 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c +28 -27
90 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c +27 -26
82 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c +22 -21
96 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +12 -9
@@ -236,9 +236,9 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base)if (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz) {for (i =0 ; i < num_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz - <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz)) + < (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz)) clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz - =khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz); + = (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz); }for (i =0 ; i < num_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz >1950 )
@@ -247,9 +247,9 @@ void dcn32_init_clocks(struct clk_mgr *clk_mgr_base)if (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz) {for (i =0 ; i < num_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz - <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz)) + < (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz)) clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz - =khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz); + = (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz); }for (i =0 ; i < num_levels; i++)
@@ -269,7 +269,7 @@ static void dcn32_update_clocks_update_dtb_dto(struct clk_mgr_internal *clk_mgr, {struct dccg *dccg = clk_mgr->dccg;uint32_t tg_mask =0 ; -int i; +uint32_t i;for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
@@ -314,7 +314,7 @@ static void dcn32_update_dppclk_dispclk_freq(struct clk_mgr_internal *clk_mgr, svoid dcn32_update_clocks_update_dpp_dto (struct clk_mgr_internal *clk_mgr,struct dc_state *context,bool safe_to_lower) { -int i; +uint32_t i; clk_mgr->dccg->ref_dppclk = clk_mgr->base.clks.dppclk_khz;for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {
@@ -673,9 +673,12 @@ static void dcn32_update_clocks(struct clk_mgr *clk_mgr_base, } } -if (dc->debug.force_min_dcfclk_mhz >0 ) - new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > (dc->debug.force_min_dcfclk_mhz *1000 )) ? - new_clocks->dcfclk_khz : (dc->debug.force_min_dcfclk_mhz *1000 ); +if (dc->debug.force_min_dcfclk_mhz >0 ) { +int force_min_dcfclk_khz = dc->debug.force_min_dcfclk_mhz *1000 ; + + new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > force_min_dcfclk_khz) ? + new_clocks->dcfclk_khz : force_min_dcfclk_khz; + }if (should_set_clock (safe_to_lower, new_clocks->dcfclk_khz, clk_mgr_base->clks.dcfclk_khz) && !dc->work_arounds.clock_update_disable_mask.dcfclk) {
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +58 -53
198 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c +11 -8
@@ -291,17 +291,17 @@ void dcn401_init_clocks(struct clk_mgr *clk_mgr_base)if (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz) {for (i =0 ; i < num_entries_per_clk->num_dispclk_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz - <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz)) + < (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz)) clk_mgr_base->bw_params->clk_table.entries[i].dispclk_mhz - =khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz); + = (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_disp_clk_khz); }if (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz) {for (i =0 ; i < num_entries_per_clk->num_dppclk_levels; i++)if (clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz - <khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz)) + < (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz)) clk_mgr_base->bw_params->clk_table.entries[i].dppclk_mhz - =khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz); + = (unsigned int )khz_to_mhz_ceil (clk_mgr_base->ctx->dc->debug.min_dpp_clk_khz); }/* Get UCLK, update bounding box */
@@ -558,7 +558,7 @@ static void dcn401_update_clocks_update_dtb_dto(struct clk_mgr_internal *clk_mgrstatic void dcn401_update_clocks_update_dpp_dto (struct clk_mgr_internal *clk_mgr,struct dc_state *context,bool safe_to_lower,int ref_dppclk_khz) { -int i; +uint32_t i; clk_mgr->dccg->ref_dppclk = ref_dppclk_khz;for (i =0 ; i < clk_mgr->base.ctx->dc->res_pool->pipe_count; i++) {
@@ -841,9 +841,12 @@ static unsigned int dcn401_build_update_bandwidth_clocks_sequence( }/* UPDATE DCFCLK */ -if (dc->debug.force_min_dcfclk_mhz >0 ) - new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > (dc->debug.force_min_dcfclk_mhz *1000 )) ? - new_clocks->dcfclk_khz : (dc->debug.force_min_dcfclk_mhz *1000 ); +if (dc->debug.force_min_dcfclk_mhz >0 ) { +int force_min_dcfclk_khz = dc->debug.force_min_dcfclk_mhz *1000 ; + + new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > force_min_dcfclk_khz) ? + new_clocks->dcfclk_khz : force_min_dcfclk_khz; + }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;
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c +14 -10
@@ -167,7 +167,7 @@ void dcn42_update_clocks_update_dtb_dto(struct clk_mgr_internal *clk_mgr,void dcn42_update_clocks_update_dpp_dto (struct clk_mgr_internal *clk_mgr,struct dc_state *context,bool safe_to_lower) { -int i; +uint32_t i;bool dppclk_active[MAX_PIPES ] = {0 };
@@ -282,9 +282,12 @@ void dcn42_update_clocks(struct clk_mgr *clk_mgr_base, clk_mgr_base->clks.pwr_state =DCN_PWR_STATE_MISSION_MODE ; } } -if (dc->debug.force_min_dcfclk_mhz >0 ) - new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > (dc->debug.force_min_dcfclk_mhz *1000 )) ? - new_clocks->dcfclk_khz : (dc->debug.force_min_dcfclk_mhz *1000 ); +if (dc->debug.force_min_dcfclk_mhz >0 ) { +int force_min_dcfclk_khz = dc->debug.force_min_dcfclk_mhz *1000 ; + + new_clocks->dcfclk_khz = (new_clocks->dcfclk_khz > force_min_dcfclk_khz) ? + new_clocks->dcfclk_khz : force_min_dcfclk_khz; + }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;
@@ -298,8 +301,9 @@ void dcn42_update_clocks(struct clk_mgr *clk_mgr_base, clk_mgr_base->clks.dcfclk_deep_sleep_khz = new_clocks->dcfclk_deep_sleep_khz;/* Clamp the requested clock to PMFW based on DCN limit. */ -if (dc->debug.min_deep_sleep_dcfclk_khz >0 && clk_mgr_base->clks.dcfclk_deep_sleep_khz < dc->debug.min_deep_sleep_dcfclk_khz) - clk_mgr_base->clks.dcfclk_deep_sleep_khz = dc->debug.min_deep_sleep_dcfclk_khz; +if (dc->debug.min_deep_sleep_dcfclk_khz >0 && + clk_mgr_base->clks.dcfclk_deep_sleep_khz < (int )dc->debug.min_deep_sleep_dcfclk_khz) + clk_mgr_base->clks.dcfclk_deep_sleep_khz = (int )dc->debug.min_deep_sleep_dcfclk_khz;dcn42_smu_set_min_deep_sleep_dcfclk (clk_mgr, clk_mgr_base->clks.dcfclk_deep_sleep_khz); }
@@ -315,13 +319,13 @@ void dcn42_update_clocks(struct clk_mgr *clk_mgr_base,if (should_set_clock (safe_to_lower, new_clocks->dispclk_khz, clk_mgr_base->clks.dispclk_khz) && (new_clocks->dispclk_khz >0 || (safe_to_lower && has_active_display == false))) { -int requested_dispclk_khz = new_clocks->dispclk_khz; +uint32_t requested_dispclk_khz = new_clocks->dispclk_khz;dcn35_disable_otg_wa (clk_mgr_base, context, safe_to_lower, true);/* Clamp the requested clock to PMFW based on their limit. */ -if (dc->debug.min_disp_clk_khz >0 && requested_dispclk_khz < dc->debug.min_disp_clk_khz) - requested_dispclk_khz = dc->debug.min_disp_clk_khz; +if (dc->debug.min_disp_clk_khz >0 && requested_dispclk_khz < (uint32_t )dc->debug.min_disp_clk_khz) + requested_dispclk_khz = (uint32_t )dc->debug.min_disp_clk_khz;dcn42_smu_set_dispclk (clk_mgr, requested_dispclk_khz); clk_mgr_base->clks.dispclk_khz = new_clocks->dispclk_khz;
@@ -692,7 +696,7 @@ void dcn42_build_watermark_ranges(struct clk_bw_params *bw_params, struct dcn42_void dcn42_notify_wm_ranges (struct clk_mgr *clk_mgr_base) { -int i =0 ; +unsigned int i =0 ;struct dcn42_watermarks *table =NULL ;struct clk_mgr_internal *clk_mgr =TO_CLK_MGR_INTERNAL (clk_mgr_base);struct clk_mgr_dcn42 *clk_mgr_dcn42 =TO_CLK_MGR_DCN42 (clk_mgr);
drivers/gpu/drm/amd/display/dc/core/dc.c +59 -50
372 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +5 -5
@@ -666,7 +666,7 @@ void set_p_state_switch_method(/* SubVP */ enable_subvp = false; -for (int i =0 ; i < dc->res_pool->pipe_count; i++) { +for (unsigned int i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i]; if (pipe->stream && dc_state_get_paired_subvp_stream(context, pipe->stream) &&
@@ -1211,7 +1211,7 @@ void hwss_execute_sequence(struct dc *dc,struct block_sequence block_sequence[MAX_HWSS_BLOCK_SEQUENCE_SIZE ], int num_steps) { -unsigned int i; + int i;union block_sequence_params *params;struct dce_hwseq *hws = dc->hwseq;
@@ -2550,7 +2550,7 @@ void hwss_wait_for_outstanding_hw_updates(struct dc *dc, struct dc_state *dc_con* operations to complete. It should be invoked as a pre-amble prior * to full update programming before asserting any HW locks. */ -int pipe_idx; +unsigned int pipe_idx;int opp_inst;int opp_count = dc->res_pool->res_cap->num_opp;struct hubp *hubp;
@@ -3019,7 +3019,7 @@ void hwss_hubp_wait_flip_pending(union block_sequence_params *params)struct hubp *hubp = params->hubp_wait_flip_pending_params.hubp;unsigned int timeout_us = params->hubp_wait_flip_pending_params.timeout_us;unsigned int polling_interval_us = params->hubp_wait_flip_pending_params.polling_interval_us; -int j =0 ; +unsigned int j =0 ;for (j =0 ; j < timeout_us / polling_interval_us && hubp->funcs->hubp_is_flip_pending (hubp); j++)
@@ -3031,7 +3031,7 @@ void hwss_tg_wait_double_buffer_pending(union block_sequence_params *params)struct timing_generator *tg = params->tg_wait_double_buffer_pending_params.tg;unsigned int timeout_us = params->tg_wait_double_buffer_pending_params.timeout_us;unsigned int polling_interval_us = params->tg_wait_double_buffer_pending_params.polling_interval_us; -int j =0 ; +unsigned int j =0 ;if (tg->funcs->get_optc_double_buffer_pending) { for (j = 0; j < timeout_us / polling_interval_us
drivers/gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c +6 -5
@@ -33,7 +33,7 @@ static bool is_dig_link_enc_stream(struct dc_stream_state *stream) {bool is_dig_stream = false;struct link_encoder *link_enc =NULL ; -int i; +unsigned int i;/* Loop over created link encoder objects. */ if (stream) {
@@ -161,7 +161,7 @@ static enum engine_id find_first_avail_link_enc( enum engine_id eng_id_requested) {enum engine_id eng_id =ENGINE_ID_UNKNOWN ; -int i; +unsigned int i;if (eng_id_requested !=ENGINE_ID_UNKNOWN ) {
@@ -248,7 +248,7 @@ static struct link_encoder *get_link_enc_used_by_link(/* Clear all link encoder assignments. */ static void clear_enc_assignments (const struct dc *dc,struct dc_state *state) { -int i; +unsigned int i;for (i =0 ; i <MAX_PIPES ; i++) { state->res_ctx.link_enc_cfg_ctx.link_enc_assignments[i].valid = false;
@@ -523,7 +523,7 @@ struct link_encoder *link_enc_cfg_get_next_avail_link_enc(struct dc *dc) {struct link_encoder *link_enc =NULL ;enum engine_id encs_assigned[MAX_LINK_ENCODERS ]; -int i; +unsigned int i;for (i =0 ; i <MAX_LINK_ENCODERS ; i++) encs_assigned[i] =ENGINE_ID_UNKNOWN ;
@@ -624,7 +624,8 @@ bool link_enc_cfg_validate(struct dc *dc, struct dc_state *state)bool valid_uniqueness = true;bool valid_avail = true;bool valid_streams = true; -int i, j; +int i; +unsigned int j;uint8_t valid_count =0 ;uint8_t dig_stream_count =0 ;int eng_ids_per_ep_id[MAX_PIPES ] = {0 };
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +35 -32
251 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/core/dc_state.c +2 -2
@@ -954,7 +954,7 @@ bool dc_state_remove_phantom_streams_and_planes(const struct dc *dc, struct dc_state *state) { - int i; + unsigned int i;bool removed_phantom = false;struct dc_stream_state *phantom_stream =NULL ;
@@ -979,7 +979,7 @@ void dc_state_release_phantom_streams_and_planes(unsigned int phantom_count;struct dc_stream_state *phantom_streams[MAX_PHANTOM_PIPES ];struct dc_plane_state *phantom_planes[MAX_PHANTOM_PIPES ]; -int i; +unsigned int i; phantom_count = state->phantom_stream_count;memcpy (phantom_streams, state->phantom_streams,sizeof (struct dc_stream_state *) *MAX_PHANTOM_PIPES );
drivers/gpu/drm/amd/display/dc/core/dc_stream.c +6 -6
@@ -514,7 +514,7 @@ bool dc_stream_program_cursor_position(/* apply/update visual confirm */ if (dc->debug.visual_confirm ==VISUAL_CONFIRM_HW_CURSOR ) {/* update software state */ -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -533,7 +533,7 @@ bool dc_stream_program_cursor_position(if (stream->drr_trigger_mode ==DRR_TRIGGER_ON_FLIP_AND_CURSOR ) {/* apply manual trigger */ -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &dc->current_state->res_ctx.pipe_ctx[i];
@@ -559,7 +559,7 @@ bool dc_stream_add_writeback(struct dc *dc, struct dc_writeback_info *wb_info) {bool isDrc = false; -int i =0 ; +unsigned int i =0 ;struct dwbc *dwb;if (stream ==NULL ) {
@@ -968,7 +968,7 @@ struct dc_rmcm_3dlut *dc_stream_get_3dlut_for_stream(unsigned int num_rmcm = dc->caps.color.mpc.num_rmcm_3dluts;// see if one is allocated for this stream -for (int i =0 ; i < num_rmcm; i++) { +for (unsigned int i =0 ; i < num_rmcm; i++) {if (dc->res_pool->rmcm_3dlut[i].isInUse && dc->res_pool->rmcm_3dlut[i].stream == stream)return &dc->res_pool->rmcm_3dlut[i];
@@ -979,7 +979,7 @@ struct dc_rmcm_3dlut *dc_stream_get_3dlut_for_stream(return NULL ;//see if there is an unused 3dlut, allocate -for (int i =0 ; i < num_rmcm; i++) { +for (unsigned int i =0 ; i < num_rmcm; i++) {if (!dc->res_pool->rmcm_3dlut[i].isInUse) { dc->res_pool->rmcm_3dlut[i].isInUse = true; dc->res_pool->rmcm_3dlut[i].stream = stream;
@@ -1011,7 +1011,7 @@ void dc_stream_init_rmcm_3dlut(struct dc *dc) {unsigned int num_rmcm = dc->caps.color.mpc.num_rmcm_3dluts; -for (int i =0 ; i < num_rmcm; i++) { +for (unsigned int i =0 ; i < num_rmcm; i++) { dc->res_pool->rmcm_3dlut[i].isInUse = false; dc->res_pool->rmcm_3dlut[i].stream =NULL ; dc->res_pool->rmcm_3dlut[i].protection_bits =0 ;
drivers/gpu/drm/amd/display/dc/core/dc_surface.c +3 -3
@@ -69,7 +69,7 @@ void dc_plane_destruct(struct dc_plane_state *plane_state)uint8_t dc_plane_get_pipe_mask (struct dc_state *dc_state,const struct dc_plane_state *plane_state) {uint8_t pipe_mask =0 ; -int i; +unsigned int i;for (i =0 ; i < plane_state->ctx->dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &dc_state->res_ctx.pipe_ctx[i];
@@ -115,7 +115,7 @@ const struct dc_plane_status *dc_plane_get_status( {const struct dc_plane_status *plane_status;struct dc *dc; -int i; +unsigned int i; if (!plane_state || !plane_state->ctx ||
@@ -286,7 +286,7 @@ void dc_plane_force_dcc_and_tiling_disable(struct dc_plane_state *plane_state, bool clear_tiling) {struct dc *dc; -int i; +unsigned int i;if (!plane_state)return ;
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +5 -4
@@ -151,7 +151,7 @@ static bool dc_dmub_srv_reg_cmd_list_queue_execute(struct dc_dmub_srv *dc_dmub_sstruct dc_context *dc_ctx;struct dmub_srv *dmub;enum dmub_status status =DMUB_STATUS_OK ; -int i; +unsigned int i;if (!dc_dmub_srv || !dc_dmub_srv->dmub)return false;
@@ -193,7 +193,7 @@ static bool dc_dmub_srv_fb_cmd_list_queue_execute(struct dc_dmub_srv *dc_dmub_srstruct dc_context *dc_ctx;struct dmub_srv *dmub;enum dmub_status status; -int i; +unsigned int i;if (!dc_dmub_srv || !dc_dmub_srv->dmub)return false;
@@ -430,7 +430,7 @@ static void dc_dmub_srv_populate_fams_pipe_info(struct dc *dc, struct dc_state *struct pipe_ctx *head_pipe, struct dmub_cmd_fw_assisted_mclk_switch_pipe_data *fams_pipe_data) { - int j; + unsigned int j;int pipe_idx =0 ; fams_pipe_data->pipe_index[pipe_idx++] = (uint8_t )head_pipe->plane_res.hubp->inst;
@@ -448,7 +448,8 @@ bool dc_dmub_srv_p_state_delegate(struct dc *dc, bool should_manage_pstate, stru {union dmub_rb_cmd cmd = {0 };struct dmub_cmd_fw_assisted_mclk_switch_config *config_data = &cmd.fw_assisted_mclk_switch.config_data; -int i =0 , k =0 ; +unsigned int i =0 ; +int k =0 ;int ramp_up_num_steps =1 ;// TODO: Ramp is currently disabled. Reenable it. uint8_t visual_confirm_enabled;struct dc_stream_status *stream_status =NULL ;
drivers/gpu/drm/amd/display/dc/dc_helper.c +2 -2
@@ -432,7 +432,7 @@ void generic_reg_wait(const struct dc_context *ctx, {uint32_t field_value;uint32_t reg_val; -int i; +unsigned int i;if (ctx->dmub_srv && ctx->dmub_srv->reg_helper_offload.gather_in_progress) {
@@ -447,7 +447,7 @@ void generic_reg_wait(const struct dc_context *ctx,* This value comes from experiments. * */ -ASSERT (delay_between_poll_us * time_out_num_tries <=3000000 ); +ASSERT (delay_between_poll_us * time_out_num_tries <=3000000u );for (i =0 ; i <= time_out_num_tries; i++) {if (i) {
drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c +1 -1
@@ -171,7 +171,7 @@ static void dce_ipp_program_input_lut(struct input_pixel_processor *ipp, const struct dc_gamma *gamma) { - int i; + unsigned int i;struct dce_ipp *ipp_dce =TO_DCE_IPP (ipp);/* power on LUT memory */
drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c +2 -1
@@ -815,6 +815,7 @@ static bool dce110_link_encoder_validate_hdmi_output( {enum dc_color_depth max_deep_color = enc110->base.features.max_hdmi_deep_color; +int max_hdmi_pixel_clock_khz = (int )enc110->base.features.max_hdmi_pixel_clock;if (max_deep_color < crtc_timing->display_color_depth)return false;
@@ -825,7 +826,7 @@ static bool dce110_link_encoder_validate_hdmi_output(return false;if ((adjusted_pix_clk_khz ==0 ) || - (adjusted_pix_clk_khz > enc110->base.features.max_hdmi_pixel_clock)) + (adjusted_pix_clk_khz > max_hdmi_pixel_clock_khz))return false;/* DCE11 HW does not support 420 */
drivers/gpu/drm/amd/display/dc/dce/dce_transform.c +2 -2
@@ -1173,13 +1173,13 @@ bool dce_transform_get_optimal_number_of_taps( {struct dce_transform *xfm_dce =TO_DCE_TRANSFORM (xfm);int pixel_width = scl_data->viewport.width; -int max_num_of_lines; +uint32_t max_num_of_lines;if (xfm_dce->prescaler_on && (scl_data->viewport.width > scl_data->recout.width)) pixel_width = scl_data->recout.width; - max_num_of_lines =dce_transform_get_max_num_of_supported_lines ( + max_num_of_lines = (uint32_t )dce_transform_get_max_num_of_supported_lines ( xfm_dce, scl_data->lb_params.depth, pixel_width);
drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c +1 -1
@@ -58,7 +58,7 @@ static void dmub_abm_enable_fractional_pwm(struct dc_context *dc)union dmub_rb_cmd cmd;uint32_t fractional_pwm = (dc->dc->config.disable_fractional_pwm == false) ?1 :0 ;uint32_t edp_id_count = dc->dc_edp_id_count; -int i; +unsigned int i;uint8_t panel_mask =0 ;for (i =0 ; i < edp_id_count; i++)
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c +6 -6
@@ -342,8 +342,8 @@ bool cm_helper_translate_curve_to_hw_format(struct dc_context *ctx,struct pwl_result_data *rgb_minus_1;int32_t region_start, region_end; -int32_t i; -uint32_t j, k, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points; +int32_t k; +uint32_t i, j, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points;if (output_tf ==NULL || lut_params ==NULL || output_tf->type ==TF_TYPE_BYPASS )return false;
@@ -398,8 +398,8 @@ bool cm_helper_translate_curve_to_hw_format(struct dc_context *ctx,if (j == hw_points -1 )break ;if (i >=TRANSFER_FUNC_POINTS ) { -DC_LOG_ERROR ("Index out of bounds: i=%d, TRANSFER_FUNC_POINTS=%d\n" , - i,TRANSFER_FUNC_POINTS ); +DC_LOG_ERROR ("Index out of bounds: i=%u, TRANSFER_FUNC_POINTS=%u\n" , + i, (uint32_t )TRANSFER_FUNC_POINTS );return false; } rgb_resulted[j].red = output_tf->tf_pts.red[i];
@@ -547,8 +547,8 @@ bool cm_helper_translate_curve_to_degamma_hw_format(struct pwl_result_data *rgb_plus_1;int32_t region_start, region_end; -int32_t i; -uint32_t j, k, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points; +int32_t k; +uint32_t i, j, seg_distr[MAX_REGIONS_NUMBER ], increment, start_index, hw_points;if (output_tf ==NULL || lut_params ==NULL || output_tf->type ==TF_TYPE_BYPASS )return false;
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer_debug.c +11 -11
@@ -59,7 +59,7 @@ unsigned int snprintf_count(char *pbuf, unsigned int bufsize, const char *fmt, .va_end (args);if (ret_vsnprintf >0 ) { -if (ret_vsnprintf < bufsize) +if ((unsigned int )ret_vsnprintf < bufsize) chars_printed = ret_vsnprintf;else chars_printed = bufsize -1 ;
@@ -73,7 +73,7 @@ static unsigned int dcn10_get_hubbub_state(struct dc *dc, char *pBuf, unsigned i {struct dc_context *dc_ctx = dc->ctx;struct dcn_hubbub_wm wm; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -111,7 +111,7 @@ static unsigned int dcn10_get_hubp_states(struct dc *dc, char *pBuf, unsigned in {struct dc_context *dc_ctx = dc->ctx;struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -189,7 +189,7 @@ static unsigned int dcn10_get_hubp_states(struct dc *dc, char *pBuf, unsigned instatic unsigned int dcn10_get_rq_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -231,7 +231,7 @@ static unsigned int dcn10_get_rq_states(struct dc *dc, char *pBuf, unsigned intstatic unsigned int dcn10_get_dlg_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -288,7 +288,7 @@ static unsigned int dcn10_get_dlg_states(struct dc *dc, char *pBuf, unsigned intstatic unsigned int dcn10_get_ttu_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -328,7 +328,7 @@ static unsigned int dcn10_get_ttu_states(struct dc *dc, char *pBuf, unsigned intstatic unsigned int dcn10_get_cm_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -383,7 +383,7 @@ static unsigned int dcn10_get_cm_states(struct dc *dc, char *pBuf, unsigned intstatic unsigned int dcn10_get_mpcc_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -414,7 +414,7 @@ static unsigned int dcn10_get_mpcc_states(struct dc *dc, char *pBuf, unsigned instatic unsigned int dcn10_get_otg_states (struct dc *dc,char *pBuf,unsigned int bufSize) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;unsigned int chars_printed =0 ;unsigned int remaining_buffer = bufSize;
@@ -491,7 +491,7 @@ static unsigned int dcn10_get_clock_states(struct dc *dc, char *pBuf, unsigned istatic void dcn10_clear_otpc_underflow (struct dc *dc) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;for (i =0 ; i < pool->timing_generator_count; i++) {struct timing_generator *tg = pool->timing_generators[i];
@@ -508,7 +508,7 @@ static void dcn10_clear_otpc_underflow(struct dc *dc)static void dcn10_clear_hubp_underflow (struct dc *dc) {struct resource_pool *pool = dc->res_pool; -int i; +unsigned int i;for (i =0 ; i < pool->pipe_count; i++) {struct hubp *hubp = pool->hubps[i];
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c +1 -1
@@ -696,7 +696,7 @@ static void wbscl_set_scaler_filter(for (phase =0 ; phase < (NUM_PHASES /2 +1 ); phase++) {for (pair =0 ; pair < tap_pairs; pair++) { even_coef = filter[phase * taps +2 * pair]; -if ((pair *2 +1 ) < taps) +if ((uint32_t )(pair *2 +1 ) < taps) odd_coef = filter[phase * taps +2 * pair +1 ];else odd_coef =0 ;
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c +5 -3
@@ -172,11 +172,13 @@ bool cm3_helper_translate_curve_to_hw_format(struct dc_context *ctx, hw_points = fixpoint ? (hw_points -1 ) : hw_points; j =0 ; -for (k =0 ; k < (region_end - region_start); k++) { +uint32_t region_span = (uint32_t )(region_end - region_start); +for (k =0 ; k < region_span; k++) { increment =NUMBER_SW_SEGMENTS / (1 << seg_distr[k]); start_index = (region_start + k +MAX_LOW_POINT ) *NUMBER_SW_SEGMENTS ; -for (i = start_index; i < start_index +NUMBER_SW_SEGMENTS ; +int32_t index_end = (int32_t )(start_index +NUMBER_SW_SEGMENTS ); +for (i = start_index; i < index_end; i += increment) {if (j == hw_points)break ;
@@ -258,7 +260,7 @@ bool cm3_helper_translate_curve_to_hw_format(struct dc_context *ctx,uint32_t green_clamp;uint32_t blue_clamp; -if (i >= hw_points) { +if ((uint32_t )i >= hw_points) {if (dc_fixpt_lt (rgb_plus_1->red, rgb->red)) rgb_plus_1->red =dc_fixpt_add (rgb->red, rgb_minus_1->delta_red);
drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_link_encoder.c +6 -5
@@ -622,10 +622,11 @@ static bool dcn10_link_encoder_validate_hdmi_output( {enum dc_color_depth max_deep_color = enc10->base.features.max_hdmi_deep_color; +uint32_t pix_clk_100hz = (uint32_t )adjusted_pix_clk_100hz;// check pixel clock against edid specified max TMDS clk if (edid_caps->max_tmds_clk_mhz !=0 && - adjusted_pix_clk_100hz > edid_caps->max_tmds_clk_mhz *10000 ) + pix_clk_100hz > edid_caps->max_tmds_clk_mhz *10000 )return false;if (max_deep_color < crtc_timing->display_color_depth)
@@ -633,11 +634,11 @@ static bool dcn10_link_encoder_validate_hdmi_output(if (crtc_timing->display_color_depth <COLOR_DEPTH_888 )return false; -if (adjusted_pix_clk_100hz < (TMDS_MIN_PIXEL_CLOCK *10 )) +if (pix_clk_100hz < (TMDS_MIN_PIXEL_CLOCK *10 ))return false; -if ((adjusted_pix_clk_100hz ==0 ) || - (adjusted_pix_clk_100hz > (enc10->base.features.max_hdmi_pixel_clock *10 ))) +if ((pix_clk_100hz ==0 ) || + (pix_clk_100hz > (enc10->base.features.max_hdmi_pixel_clock *10 )))return false;/* DCE11 HW does not support 420 */
@@ -647,7 +648,7 @@ static bool dcn10_link_encoder_validate_hdmi_output(if ((!enc10->base.features.flags.bits.HDMI_6GB_EN || enc10->base.ctx->dc->debug.hdmi20_disable) && - adjusted_pix_clk_100hz >=3000000 ) + pix_clk_100hz >=3000000 )return false;if (enc10->base.ctx->dc->debug.hdmi20_disable && crtc_timing->pixel_encoding ==PIXEL_ENCODING_YCBCR420 )
drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c +1 -1
@@ -824,7 +824,7 @@ void dpp1_program_input_lut(struct dpp *dpp_base, const struct dc_gamma *gamma) { - int i; + unsigned int i;struct dcn10_dpp *dpp =TO_DCN10_DPP (dpp_base);bool rama_occupied = false;uint32_t ram_num;
drivers/gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c +1 -1
@@ -256,7 +256,7 @@ static void dpp1_dscl_set_scaler_filter(for (phase =0 ; phase < (NUM_PHASES /2 +1 ); phase++) {for (pair =0 ; pair < tap_pairs; pair++) { even_coef = filter[phase * taps +2 * pair]; -if ((pair *2 +1 ) < taps) +if ((uint32_t )(pair *2 +1 ) < taps) odd_coef = filter[phase * taps +2 * pair +1 ];else odd_coef =0 ;
drivers/gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c +9 -4
@@ -517,11 +517,16 @@ bool dpp3_get_optimal_number_of_taps(else if (max_taps_c < min_taps_c)return false; -if (scl_data->taps.v_taps > max_taps_y) - scl_data->taps.v_taps = max_taps_y; + { +uint32_t max_supported_taps_y = (uint32_t )max_taps_y; +uint32_t max_supported_taps_c = (uint32_t )max_taps_c; -if (scl_data->taps.v_taps_c > max_taps_c) - scl_data->taps.v_taps_c = max_taps_c; +if (scl_data->taps.v_taps > max_supported_taps_y) + scl_data->taps.v_taps = max_supported_taps_y; + +if (scl_data->taps.v_taps_c > max_supported_taps_c) + scl_data->taps.v_taps_c = max_supported_taps_c; + }if (!dpp->ctx->dc->debug.always_scale) {if (IDENTITY_RATIO (scl_data->ratios.horz)) {
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c +1 -1
@@ -176,7 +176,7 @@ static void dpp401_program_cursor_csc(struct color_matrices_reg cur_matrix_regs;unsigned int i;const uint16_t *regval =NULL ; -int arr_size =sizeof (dpp_input_csc_matrix) /sizeof (struct dpp_input_csc_matrix ); +unsigned int arr_size =sizeof (dpp_input_csc_matrix) /sizeof (struct dpp_input_csc_matrix );if (color_space <COLOR_SPACE_YCBCR601 ) {REG_SET (CUR0_MATRIX_MODE ,0 ,CUR0_MATRIX_MODE ,CUR_MATRIX_BYPASS );
drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c +1 -1
@@ -253,7 +253,7 @@ static void dpp401_dscl_set_scaler_filter(for (phase =0 ; phase < (NUM_PHASES /2 +1 ); phase++) {for (pair =0 ; pair < tap_pairs; pair++) { even_coef = filter[phase * taps +2 * pair]; -if ((pair *2 +1 ) < taps) +if ((uint32_t )(pair *2 +1 ) < taps) odd_coef = filter[phase * taps +2 * pair +1 ];else odd_coef =0 ;
drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c +8 -5
@@ -858,19 +858,20 @@ static bool decide_dsc_target_bpp_x16( int *target_bpp_x16) {struct dc_dsc_bw_range range; +uint32_t target_bandwidth_kbps_u = (uint32_t )target_bandwidth_kbps; *target_bpp_x16 =0 ;if (decide_dsc_bandwidth_range (policy->min_target_bpp *16 , policy->max_target_bpp *16 , num_slices_h, dsc_common_caps, timing, link_encoding, &range)) { -if (target_bandwidth_kbps >= range.stream_kbps) { +if (target_bandwidth_kbps_u >= range.stream_kbps) {if (policy->enable_dsc_when_not_needed || options->force_dsc_when_not_needed)/* enable max bpp even dsc is not needed */ *target_bpp_x16 = range.max_target_bpp_x16; - }else if (target_bandwidth_kbps >= range.max_kbps) { + }else if (target_bandwidth_kbps_u >= range.max_kbps) {/* use max target bpp allowed */ *target_bpp_x16 = range.max_target_bpp_x16; - }else if (target_bandwidth_kbps >= range.min_kbps) { + }else if (target_bandwidth_kbps_u >= range.min_kbps) {/* use target bpp that can take entire target bandwidth */ *target_bpp_x16 = compute_bpp_x16_from_target_bandwidth( target_bandwidth_kbps, timing, num_slices_h,
@@ -1053,10 +1054,11 @@ static bool setup_dsc_config(int max_slices_h =0 ;int num_slices_h =0 ;int pic_width; +uint32_t pic_width_u;int slice_width;int target_bpp;int sink_per_slice_throughput_mps; -int branch_max_throughput_mps =0 ; +uint32_t branch_max_throughput_mps =0 ;bool is_dsc_possible = false;int pic_height;int slice_height;
@@ -1066,12 +1068,13 @@ static bool setup_dsc_config(dc_dsc_get_policy_for_timing (timing, options->max_target_bpp_limit_override_x16, &policy, link_encoding); pic_width = timing->h_addressable + timing->h_border_left + timing->h_border_right; + pic_width_u = (uint32_t )pic_width; pic_height = timing->v_addressable + timing->v_border_top + timing->v_border_bottom;if (!dsc_sink_caps->is_dsc_supported) goto done; -if (dsc_sink_caps->branch_max_line_width && dsc_sink_caps->branch_max_line_width < pic_width) +if (dsc_sink_caps->branch_max_line_width && dsc_sink_caps->branch_max_line_width < pic_width_u) goto done;// Intersect decoder with encoder DSC caps and validate DSC settings
drivers/gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c +2 -1
@@ -168,8 +168,9 @@ bool dsc2_validate_stream(struct display_stream_compressor *dsc, const struct ds {struct dsc_optc_config dsc_optc_cfg;struct dcn20_dsc *dsc20 =TO_DCN20_DSC (dsc); +uint32_t max_image_width = (uint32_t )dsc20->max_image_width; -if (dsc_cfg->pic_width > dsc20->max_image_width) +if (dsc_cfg->pic_width > max_image_width)return false;return dsc_prepare_config (dsc_cfg, &dsc20->reg_vals, &dsc_optc_cfg);
drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c +2 -1
@@ -119,8 +119,9 @@ bool dsc401_validate_stream(struct display_stream_compressor *dsc, const struct {struct dsc_optc_config dsc_optc_cfg;struct dcn401_dsc *dsc401 =TO_DCN401_DSC (dsc); +uint32_t max_image_width = (uint32_t )dsc401->max_image_width; -if (dsc_cfg->pic_width > dsc401->max_image_width) +if (dsc_cfg->pic_width > max_image_width)return false;return dsc_prepare_config (dsc_cfg, &dsc401->reg_vals, &dsc_optc_cfg);
drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c +4 -3
@@ -833,7 +833,7 @@ bool hubbub401_get_dcc_compression_cap(struct hubbub *hubbub, struct dc_surface_dcc_cap *output) {struct dc *dc = hubbub->ctx->dc; -const unsigned int max_dcc_plane_width = dc->caps.dcc_plane_width_limit; +const int max_dcc_plane_width = (int )dc->caps.dcc_plane_width_limit;/* DCN4_Programming_Guide_DCHUB.docx, Section 5.11.2.2 */ enum dcc_control dcc_control;unsigned int plane0_bpe, plane1_bpe;
@@ -1198,6 +1198,7 @@ bool dcn401_program_arbiter(struct hubbub *hubbub, struct dml2_display_arb_regsbool wm_pending = false;uint32_t temp; +bool allow_sdpif_rate_limit_when_cstate_req = arb_regs->allow_sdpif_rate_limit_when_cstate_req !=0 ;/* request backpressure and outstanding return threshold (unused)*/ //REG_UPDATE(DCHUBBUB_TIMEOUT_DETECTION_CTRL1, DCHUBBUB_TIMEOUT_REQ_STALL_THRESHOLD, arb_regs->req_stall_threshold);
@@ -1205,8 +1206,8 @@ bool dcn401_program_arbiter(struct hubbub *hubbub, struct dml2_display_arb_regs/* P-State stall threshold */ REG_UPDATE (DCHUBBUB_TIMEOUT_DETECTION_CTRL2 ,DCHUBBUB_TIMEOUT_PSTATE_STALL_THRESHOLD , arb_regs->pstate_stall_threshold); -if (safe_to_lower || arb_regs->allow_sdpif_rate_limit_when_cstate_req > hubbub2->allow_sdpif_rate_limit_when_cstate_req) { - hubbub2->allow_sdpif_rate_limit_when_cstate_req = arb_regs->allow_sdpif_rate_limit_when_cstate_req; +if (safe_to_lower || allow_sdpif_rate_limit_when_cstate_req > hubbub2->allow_sdpif_rate_limit_when_cstate_req) { + hubbub2->allow_sdpif_rate_limit_when_cstate_req = allow_sdpif_rate_limit_when_cstate_req;/* only update the required bits */ REG_GET (DCHUBBUB_CTRL_STATUS ,DCHUBBUB_HW_DEBUG , &temp);
drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c +3 -2
@@ -503,6 +503,7 @@ static bool dcn42_program_arbiter(struct hubbub *hubbub, struct dml2_display_arbbool wm_pending = false;uint32_t temp; +bool allow_sdpif_rate_limit_when_cstate_req = arb_regs->allow_sdpif_rate_limit_when_cstate_req !=0 ;/* request backpressure and outstanding return threshold (unused)*/ //REG_UPDATE(DCHUBBUB_TIMEOUT_DETECTION_CTRL1, DCHUBBUB_TIMEOUT_REQ_STALL_THRESHOLD, arb_regs->req_stall_threshold);
@@ -510,8 +511,8 @@ static bool dcn42_program_arbiter(struct hubbub *hubbub, struct dml2_display_arb/* 401 delta: do not update P-State stall threshold (handled by fw) */ // REG_UPDATE(DCHUBBUB_TIMEOUT_DETECTION_CTRL2, DCHUBBUB_TIMEOUT_PSTATE_STALL_THRESHOLD, arb_regs->pstate_stall_threshold); -if (safe_to_lower || arb_regs->allow_sdpif_rate_limit_when_cstate_req > hubbub2->allow_sdpif_rate_limit_when_cstate_req) { - hubbub2->allow_sdpif_rate_limit_when_cstate_req = arb_regs->allow_sdpif_rate_limit_when_cstate_req; +if (safe_to_lower || allow_sdpif_rate_limit_when_cstate_req > hubbub2->allow_sdpif_rate_limit_when_cstate_req) { + hubbub2->allow_sdpif_rate_limit_when_cstate_req = allow_sdpif_rate_limit_when_cstate_req;/* only update the required bits */ REG_GET (DCHUBBUB_CTRL_STATUS ,DCHUBBUB_HW_DEBUG , &temp);
drivers/gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c +1 -1
@@ -710,7 +710,7 @@ void hubp2_dmdata_load(uint32_t dmdata_sw_size, const uint32_t *dmdata_sw_data) { - int i; + unsigned int i;struct dcn20_hubp *hubp2 =TO_DCN20_HUBP (hubp);/* load dmdata into HUBP buffer in SW mode */
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +13 -13
@@ -504,7 +504,7 @@ dce110_translate_regamma_to_hw_format(const struct dc_transfer_func *output_tf, } j =0 ; -for (k =0 ; k < (region_end - region_start); k++) { +for (k =0 ; k < (uint32_t )(region_end - region_start); k++) { increment =NUMBER_SW_SEGMENTS / (1 << seg_distr[k]); start_index = (region_start + k +MAX_LOW_POINT ) *NUMBER_SW_SEGMENTS ;
@@ -1810,7 +1810,7 @@ static void power_down_encoders(struct dc *dc)static void power_down_controllers (struct dc *dc) { -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->timing_generator_count; i++) { dc->res_pool->timing_generators[i]->funcs->disable_crtc(
@@ -1820,7 +1820,7 @@ static void power_down_controllers(struct dc *dc)static void power_down_clock_sources (struct dc *dc) { -int i; +unsigned int i;if (dc->res_pool->dp_clock_source->funcs->cs_power_down ( dc->res_pool->dp_clock_source) == false)
@@ -1829,7 +1829,7 @@ static void power_down_clock_sources(struct dc *dc)for (i =0 ; i < dc->res_pool->clk_src_count; i++) {if (dc->res_pool->clock_sources[i]->funcs->cs_power_down ( dc->res_pool->clock_sources[i]) == false) -dm_error ("Failed to power down pll! (clk src index=%d)\n" , i); +dm_error ("Failed to power down pll! (clk src index=%u)\n" , i); } }
@@ -1916,13 +1916,13 @@ static void clean_up_dsc_blocks(struct dc *dc)struct stream_encoder *se =NULL ;struct dccg *dccg = dc->res_pool->dccg;struct pg_cntl *pg_cntl = dc->res_pool->pg_cntl; -int i; +unsigned int i;if (!dc->caps.is_apu || dc->ctx->dce_version <DCN_VERSION_3_15 )return ;/*VBIOS supports dsc starts from dcn315*/ -for (i =0 ; i < dc->res_pool->res_cap->num_dsc; i++) { +for (i =0 ; i < (unsigned int )dc->res_pool->res_cap->num_dsc; i++) {struct dcn_dsc_state s = {0 }; dsc = dc->res_pool->dscs[i];
@@ -2000,7 +2000,7 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)struct pipe_ctx *pipe_ctx =NULL ;struct dce_hwseq *hws = dc->hwseq;int edp_with_sink_num; -unsigned int edp_num; +unsigned int j, edp_num;int edp_stream_num;int i;bool can_apply_edp_fast_boot = false;
@@ -2020,8 +2020,8 @@ void dce110_enable_accelerated_mode(struct dc *dc, struct dc_state *context)/* Check fastboot support, disable on DCE 6-8-10 because of blank screens */ if (edp_num && edp_stream_num && dc->ctx->dce_version >DCE_VERSION_10_0 ) { -for (i =0 ; i < edp_num; i++) { - edp_link = edp_links[i]; +for (j =0 ; j < edp_num; j++) { + edp_link = edp_links[j];if (edp_link != edp_streams[0 ]->link)continue ;// enable fastboot if backend is enabled on eDP
@@ -2262,7 +2262,7 @@ static void get_position(struct pipe_ctx **pipe_ctx,static void set_static_screen_control (struct pipe_ctx **pipe_ctx,int num_pipes,const struct dc_static_screen_params *params) { -unsigned int i; +int i;unsigned int triggers =0 ;if (params->triggers.overlay_update)
@@ -2549,7 +2549,7 @@ enum dc_status dce110_apply_ctx_to_hw(struct dce_hwseq *hws = dc->hwseq;struct dc_bios *dcb = dc->ctx->dc_bios;enum dc_status status; -int i; +unsigned int i;bool was_hpo_acquired =resource_is_hpo_acquired (dc->current_state);bool is_hpo_acquired =resource_is_hpo_acquired (context);
@@ -2915,7 +2915,7 @@ static void dce110_init_pipes(struct dc *dc, struct dc_state *context)static void dce110_init_hw (struct dc *dc) { -int i; +unsigned int i;struct dc_bios *bp;struct transform *xfm;struct abm *abm;
@@ -3137,7 +3137,7 @@ static void dce110_apply_ctx_for_surface(int num_planes, struct dc_state *context) { - int i; + unsigned int i;if (num_planes ==0 )return ;
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +28 -27
184 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +19 -15
@@ -79,7 +79,7 @@ void dcn20_log_color_state(struct dc *dc,struct dc_context *dc_ctx = dc->ctx;struct resource_pool *pool = dc->res_pool;bool is_gamut_remap_available = false; -int i; +unsigned int i;DTN_INFO ("DPP: DGAM mode SHAPER mode 3DLUT mode 3DLUT bit depth" " 3DLUT size RGAM mode GAMUT adjust "
@@ -400,6 +400,7 @@ void dcn20_init_blank(struct output_pixel_processor *bottom_opp =NULL ;uint32_t num_opps, opp_id_src0, opp_id_src1;uint32_t otg_active_width =0 , otg_active_height =0 ; +unsigned int num_opp_cap = (unsigned int )dc->res_pool->res_cap->num_opp;/* program opp dpg blank color */ color_space =COLOR_SPACE_SRGB ;
@@ -413,7 +414,7 @@ void dcn20_init_blank(/* get the OPTC source */ tg->funcs->get_optc_source (tg, &num_opps, &opp_id_src0, &opp_id_src1); -if (opp_id_src0 >= dc->res_pool->res_cap->num_opp) { +if (opp_id_src0 >= num_opp_cap) {ASSERT (false);return ; }
@@ -426,7 +427,7 @@ void dcn20_init_blank(if (num_opps ==2 ) { otg_active_width = otg_active_width /2 ; -if (opp_id_src1 >= dc->res_pool->res_cap->num_opp) { +if (opp_id_src1 >= num_opp_cap) {ASSERT (false);return ; }
@@ -1405,9 +1406,9 @@ void dcn20_pipe_control_lock( }if (flip_immediate && lock) { -const int TIMEOUT_FOR_FLIP_PENDING_US =100000 ; +const unsigned int TIMEOUT_FOR_FLIP_PENDING_US =100000U ;unsigned int polling_interval_us =1 ; -int i; +unsigned int i; temp_pipe = pipe;while (temp_pipe) {
@@ -1870,7 +1871,7 @@ void dcn20_update_dchubp_dpp(static int dcn20_calculate_vready_offset_for_group (struct pipe_ctx *pipe) {struct pipe_ctx *other_pipe; -int vready_offset = pipe->pipe_dlg_param.vready_offset; +unsigned int vready_offset = pipe->pipe_dlg_param.vready_offset;/* Always use the largest vready_offset of all connected pipes */ for (other_pipe = pipe->bottom_pipe; other_pipe !=NULL ; other_pipe = other_pipe->bottom_pipe) {
@@ -2038,7 +2039,7 @@ void dcn20_program_front_end_for_ctx(struct dc *dc, struct dc_state *context) { - int i; + unsigned int i;unsigned int prev_hubp_count =0 ;unsigned int hubp_count =0 ;struct dce_hwseq *hws = dc->hwseq;
@@ -2242,7 +2243,7 @@ void dcn20_post_unlock_program_front_end(unsigned int timeout_us =100000 ;unsigned int polling_interval_us =1 ;struct dce_hwseq *hwseq = dc->hwseq; -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) if (resource_is_pipe_type(&dc->current_state->res_ctx.pipe_ctx[i], OPP_HEAD) &&
@@ -2266,7 +2267,7 @@ void dcn20_post_unlock_program_front_end(if (pipe->plane_state && !pipe->top_pipe && pipe->update_flags.bits.enable &&dc_state_get_pipe_subvp_type (context, pipe) !=SUBVP_PHANTOM ) {struct hubp *hubp = pipe->plane_res.hubp; -int j =0 ; +unsigned int j =0 ;for (j =0 ; j < timeout_us / polling_interval_us && hubp->funcs->hubp_is_flip_pending (hubp); j++)
@@ -2285,7 +2286,7 @@ void dcn20_post_unlock_program_front_end(if (resource_is_pipe_type (old_pipe,OTG_MASTER ) &&resource_is_pipe_type (pipe,OTG_MASTER ) &&resource_get_odm_slice_count (old_pipe) <resource_get_odm_slice_count (pipe) &&dc_state_get_pipe_subvp_type (context, pipe) !=SUBVP_PHANTOM ) { -int j =0 ; +unsigned int j =0 ;struct timing_generator *tg = pipe->stream_res.tg;if (tg->funcs->get_optc_double_buffer_pending) {
@@ -2420,7 +2421,7 @@ void dcn20_optimize_bandwidth( struct dc_state *context) {struct hubbub *hubbub = dc->res_pool->hubbub; -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
@@ -2438,10 +2439,13 @@ void dcn20_optimize_bandwidth( dc->res_pool->ref_clocks.dchub_ref_clock_inKhz /1000 , true); -if (dc->clk_mgr->dc_mode_softmax_enabled) -if (dc->clk_mgr->clks.dramclk_khz > dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 && - context->bw_ctx.bw.dcn.clk.dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) +if (dc->clk_mgr->dc_mode_softmax_enabled) { +int softmax_memclk_khz = dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ; + +if (dc->clk_mgr->clks.dramclk_khz > softmax_memclk_khz && + context->bw_ctx.bw.dcn.clk.dramclk_khz <= softmax_memclk_khz) dc->clk_mgr->funcs->set_max_memclk (dc->clk_mgr, dc->clk_mgr->bw_params->dc_mode_softmax_memclk); + }/* increase compbuf size */ if (hubbub->funcs->program_compbuf_size)
@@ -2478,7 +2482,7 @@ bool dcn20_update_bandwidth(struct dc *dc, struct dc_state *context) { - int i; + unsigned int i;struct dce_hwseq *hws = dc->hwseq;/* recalculate DML parameters */
drivers/gpu/drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c +1 -1
@@ -287,7 +287,7 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx,bool dcn21_is_abm_supported (struct dc *dc,struct dc_state *context,struct dc_stream_state *stream) { -int i; +unsigned int i;for (i =0 ; i < dc->res_pool->pipe_count; i++) {struct pipe_ctx *pipe_ctx = &context->res_ctx.pipe_ctx[i];
drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c +9 -6
@@ -79,7 +79,7 @@ void dcn30_log_color_state(struct dc *dc,struct dc_context *dc_ctx = dc->ctx;struct resource_pool *pool = dc->res_pool;bool is_gamut_remap_available = false; -int i; +unsigned int i;DTN_INFO ("DPP: DGAM ROM DGAM ROM type DGAM LUT SHAPER mode" " 3DLUT mode 3DLUT bit depth 3DLUT size RGAM mode"
@@ -581,7 +581,7 @@ void dcn30_program_all_writeback_pipes_in_tree(struct dc_writeback_info wb_info;struct dwbc *dwb;struct dc_stream_status *stream_status =NULL ; -int i_wb, i_pipe, i_stream; +unsigned int i_wb, i_pipe, i_stream;DC_LOG_DWB ("%s" , __func__);ASSERT (stream);
@@ -645,7 +645,7 @@ void dcn30_init_hw(struct dc *dc)struct dce_hwseq *hws = dc->hwseq;struct dc_bios *dcb = dc->ctx->dc_bios;struct resource_pool *res_pool = dc->res_pool; -int i; +unsigned int i;unsigned int edp_num;uint32_t backlight =MAX_BACKLIGHT_LEVEL ;uint32_t user_level =MAX_BACKLIGHT_LEVEL ;
@@ -1197,10 +1197,13 @@ void dcn30_prepare_bandwidth(struct dc *dc, context->bw_ctx.bw.dcn.clk.p_state_change_support = false; } -if (dc->clk_mgr->dc_mode_softmax_enabled) -if (dc->clk_mgr->clks.dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 && - context->bw_ctx.bw.dcn.clk.dramclk_khz > dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) +if (dc->clk_mgr->dc_mode_softmax_enabled) { +int softmax_memclk_khz = dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ; + +if (dc->clk_mgr->clks.dramclk_khz <= softmax_memclk_khz && + context->bw_ctx.bw.dcn.clk.dramclk_khz > softmax_memclk_khz) dc->clk_mgr->funcs->set_max_memclk (dc->clk_mgr, dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz); + }dcn20_prepare_bandwidth (dc, context);
drivers/gpu/drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c +3 -3
@@ -72,7 +72,7 @@static void enable_memory_low_power (struct dc *dc) {struct dce_hwseq *hws = dc->hwseq; -int i; +unsigned int i;if (dc->debug.enable_mem_low_power.bits.dmcu) {// Force ERAM to shutdown if DMCU is not enabled
@@ -116,7 +116,7 @@ void dcn31_init_hw(struct dc *dc)struct resource_pool *res_pool = dc->res_pool;uint32_t backlight =MAX_BACKLIGHT_LEVEL ;uint32_t user_level =MAX_BACKLIGHT_LEVEL ; -int i; +unsigned int i;if (dc->clk_mgr && dc->clk_mgr->funcs->init_clocks) dc->clk_mgr->funcs->init_clocks (dc->clk_mgr);
@@ -671,7 +671,7 @@ void dcn31_setup_hpo_hw_control(const struct dce_hwseq *hws, bool enable)void dcn31_set_static_screen_control (struct pipe_ctx **pipe_ctx,int num_pipes,const struct dc_static_screen_params *params) { -unsigned int i; +int i;unsigned int triggers =0 ;if (params->triggers.surface_update)
drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +18 -14
@@ -226,7 +226,7 @@ static bool dcn32_check_no_memory_request_for_cab(struct dc *dc)*/ static uint32_t dcn32_calculate_cab_allocation (struct dc *dc,struct dc_state *ctx) { -int i; +unsigned int i;uint32_t num_ways =0 ;uint32_t mall_ss_size_bytes =0 ;
@@ -351,7 +351,7 @@ bool dcn32_apply_idle_power_optimizations(struct dc *dc, bool enable)*/ void dcn32_commit_subvp_config (struct dc *dc,struct dc_state *context) { -int i; +unsigned int i;bool enable_subvp = false;if (!dc->ctx || !dc->ctx->dmub_srv)
@@ -607,7 +607,7 @@ bool dcn32_set_output_transfer_func(struct dc *dc,*/ void dcn32_update_force_pstate (struct dc *dc,struct dc_state *context) { -int i; +unsigned int i;/* Unforce p-state for each pipe if it is not FPO or SubVP. * For FPO and SubVP, if it's already forced disallow, leave
@@ -674,7 +674,7 @@ void dcn32_update_force_pstate(struct dc *dc, struct dc_state *context)*/ void dcn32_update_mall_sel (struct dc *dc,struct dc_state *context) { -int i; +unsigned int i;unsigned int num_ways =dcn32_calculate_cab_allocation (dc, context);bool cache_cursor = false;
@@ -728,7 +728,7 @@ void dcn32_update_mall_sel(struct dc *dc, struct dc_state *context)*/ void dcn32_program_mall_pipe_config (struct dc *dc,struct dc_state *context) { -int i; +unsigned int i;struct dce_hwseq *hws = dc->hwseq;// Don't force p-state disallow -- can't block dummy p-state
@@ -793,7 +793,7 @@ void dcn32_init_hw(struct dc *dc)struct dce_hwseq *hws = dc->hwseq;struct dc_bios *dcb = dc->ctx->dc_bios;struct resource_pool *res_pool = dc->res_pool; -int i; +unsigned int i;unsigned int edp_num;uint32_t backlight =MAX_BACKLIGHT_LEVEL ;uint32_t user_level =MAX_BACKLIGHT_LEVEL ;
@@ -1655,6 +1655,7 @@ void dcn32_init_blank(uint32_t num_opps, opp_id_src0, opp_id_src1;uint32_t otg_active_width =0 , otg_active_height =0 ;uint32_t i; +unsigned int num_opp_cap = (unsigned int )dc->res_pool->res_cap->num_opp;/* program opp dpg blank color */ color_space =COLOR_SPACE_SRGB ;
@@ -1668,12 +1669,12 @@ void dcn32_init_blank(/* get the OPTC source */ tg->funcs->get_optc_source (tg, &num_opps, &opp_id_src0, &opp_id_src1); -if (opp_id_src0 >= dc->res_pool->res_cap->num_opp) { +if (opp_id_src0 >= num_opp_cap) {ASSERT (false);return ; } -for (i =0 ; i < dc->res_pool->res_cap->num_opp; i++) { +for (i =0 ; i < num_opp_cap; i++) {if (dc->res_pool->opps[i] !=NULL && dc->res_pool->opps[i]->inst == opp_id_src0) { opp = dc->res_pool->opps[i];break ;
@@ -1683,11 +1684,11 @@ void dcn32_init_blank(if (num_opps ==2 ) { otg_active_width = otg_active_width /2 ; -if (opp_id_src1 >= dc->res_pool->res_cap->num_opp) { +if (opp_id_src1 >= num_opp_cap) {ASSERT (false);return ; } -for (i =0 ; i < dc->res_pool->res_cap->num_opp; i++) { +for (i =0 ; i < num_opp_cap; i++) {if (dc->res_pool->opps[i] !=NULL && dc->res_pool->opps[i]->inst == opp_id_src1) { bottom_opp = dc->res_pool->opps[i];break ;
@@ -1751,7 +1752,7 @@ bool dcn32_is_pipe_topology_transition_seamless(struct dc *dc,const struct dc_state *cur_ctx, const struct dc_state *new_ctx) { - int i; + unsigned int i;const struct pipe_ctx *cur_pipe, *new_pipe;bool is_seamless = true;
@@ -1812,10 +1813,13 @@ void dcn32_prepare_bandwidth(struct dc *dc, context->bw_ctx.bw.dcn.clk.p_state_change_support = false; } -if (dc->clk_mgr->dc_mode_softmax_enabled) -if (dc->clk_mgr->clks.dramclk_khz <= dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 && - context->bw_ctx.bw.dcn.clk.dramclk_khz > dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ) +if (dc->clk_mgr->dc_mode_softmax_enabled) { +int softmax_memclk_khz = dc->clk_mgr->bw_params->dc_mode_softmax_memclk *1000 ; + +if (dc->clk_mgr->clks.dramclk_khz <= softmax_memclk_khz && + context->bw_ctx.bw.dcn.clk.dramclk_khz > softmax_memclk_khz) dc->clk_mgr->funcs->set_max_memclk (dc->clk_mgr, dc->clk_mgr->bw_params->clk_table.entries[dc->clk_mgr->bw_params->clk_table.num_entries -1 ].memclk_mhz); + }dcn20_prepare_bandwidth (dc, context);
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +36 -32
182 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c +1 -1
@@ -152,7 +152,7 @@ void dcn351_hw_block_power_down(struct dc *dc,void dcn351_hw_block_power_up (struct dc *dc,struct pg_block_update *update_state) { -int i =0 ; +unsigned int i =0 ;struct pg_cntl *pg_cntl = dc->res_pool->pg_cntl;if (!pg_cntl || dc->debug.ignore_pg)
drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c +25 -18
71 lines not on this page · raw message
drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c +12 -9
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_detection.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_dpms.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_factory.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/link_validation.c +3 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_training.c +2 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c +2 -2
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 +3 -3
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 12/17 drm/amd/display: Find link encoder for flexible DIG mapping cases
In reply to James LinFrom: Ovidiu Bunea <[email protected]>
[why & how]link->link_enc can only be used to identify the link's link encoder when the link is not permitted to use flexible link encoder assignments.
Use the correct function for identifying link encoder and add function pointer guards before calling them.
--- .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +7 -5
@@ -1787,20 +1787,22 @@ static void power_down_encoders(struct dc *dc)for (i =0 ; i < dc->link_count; i++) {struct dc_link *link = dc->links[i]; -struct link_encoder *link_enc = link->link_enc; +struct link_encoder *link_enc =link_enc_cfg_get_link_enc (link);enum signal_type signal = link->connector_signal; dc->link_srv->blank_dp_stream (link, false);if (signal !=SIGNAL_TYPE_EDP ) signal =SIGNAL_TYPE_NONE ; -if (link->ep_type ==DISPLAY_ENDPOINT_PHY ) +if (link->ep_type ==DISPLAY_ENDPOINT_PHY && link_enc) link_enc->funcs->disable_output (link_enc, signal);if (link->fec_state == dc_link_fec_enabled) { - link_enc->funcs->fec_set_enable (link_enc, false); - link_enc->funcs->fec_set_ready (link_enc, false); - link->fec_state = dc_link_fec_not_ready; +if (link_enc && link_enc->funcs->fec_set_enable && link_enc->funcs->fec_set_ready) { + link_enc->funcs->fec_set_enable (link_enc, false); + link_enc->funcs->fec_set_ready (link_enc, false); + link->fec_state = dc_link_fec_not_ready; + } } link->link_status.link_active = false;
Signature · 1 line
2.43.0
PATCH 13/17 drm/amd/display: add memory bandwidth override debug interface
In reply to James LinFrom: Wenjing Liu <[email protected]>
[Why & How]
Add override_memory_bandwidth_request to clk_mgr_funcs and get_utm_qos_model callback
to soc_and_ip_translator_funcs for future test use.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 11 +++++++++++ drivers/gpu/drm/amd/display/dc/dc.h | 13 +++++++++++++ .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 12 ++++++++++++ .../display/dc/inc/soc_and_ip_translator.h | 19 ++++++++++++++++++- 4 files changed, 54 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +11 -0
@@ -7625,6 +7625,17 @@ bool dc_get_qos_info(struct dc *dc, struct dc_qos_info *info)return true; } +unsigned int dc_override_memory_bandwidth_request ( +struct dc *dc, +unsigned int bw_mbps) +{ +if (!dc->clk_mgr || !dc->clk_mgr->funcs) +return 0 ; + +return dc->clk_mgr->funcs->override_memory_bandwidth_request ( + dc->clk_mgr, bw_mbps *1000 ) /1000 ; +} +enum update_v3_flow {UPDATE_V3_FLOW_INVALID ,UPDATE_V3_FLOW_NO_NEW_CONTEXT_CONTEXT_FAST ,
drivers/gpu/drm/amd/display/dc/dc.h +13 -0
@@ -3383,4 +3383,17 @@ bool dc_capture_register_software_state(struct dc *dc, struct dc_register_softwa*/ bool dc_get_qos_info (struct dc *dc,struct dc_qos_info *info); +/** +* dc_override_memory_bandwidth_request - Override the DCN nominal memory +* bandwidth request sent to PMFW, independent of the current display mode. +* For debug use only. +* @dc: DC instance +* @bw_mbps: requested bandwidth in MB/s; 0 clears the override +* +* Return: capped bandwidth value actually applied (MB/s) +*/ +unsigned int dc_override_memory_bandwidth_request ( +struct dc *dc, +unsigned int bw_mbps); +#endif /* DC_INTERFACE_H_ */
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +12 -0
@@ -362,6 +362,18 @@ struct clk_mgr_funcs {uint32_t (*set_smartmux_switch)(struct clk_mgr *clk_mgr,uint32_t pins_to_set);unsigned int (*get_max_clock_khz)(struct clk_mgr *clk_mgr_base,enum clk_type clk_type); +/** +* override_memory_bandwidth_request - Override the DCN nominal memory +* bandwidth request sent to PMFW, independent of the current display +* mode. For debug use only. +* @clk_mgr: clock manager instance +* @bw_kbps: requested bandwidth in kbps; 0 clears the override +* +* Return: capped bandwidth value actually applied (kbps) +*/ +unsigned int (*override_memory_bandwidth_request)( +struct clk_mgr *clk_mgr, +unsigned int bw_kbps); };struct clk_mgr {
drivers/gpu/drm/amd/display/dc/inc/soc_and_ip_translator.h +18 -1
@@ -8,9 +8,26 @@#include "dc.h" #include "dml_top_soc_parameter_types.h" +/* Forward declarations — callers that dereference these structs must include +* the full UTM model headers themselves. */ +struct utm_qos_model ; +struct utm_qos_model_dchub_v2 ; +struct soc_and_ip_translator_funcs { -void (*get_soc_bb)(struct dml2_soc_bb *soc_bb,const struct dc *dc,const struct dml2_configuration_options *config); +void (*get_soc_bb)( +struct dml2_soc_bb *soc_bb, +const struct dc *dc, +const struct dml2_configuration_options *config);void (*get_ip_caps)(struct dml2_ip_capabilities *dml_ip_caps); +/** +* get_utm_qos_model - Return the static UTM QoS model for this DCN +* generation. Caller provides storage for @qos_model and @dchub. +* @qos_model: output — populated with SoC bounding box and SOP table +* @dchub: output — populated with DCHUB client extension data +*/ +void (*get_utm_qos_model)( +struct utm_qos_model *qos_model, +struct utm_qos_model_dchub_v2 *dchub); };struct soc_and_ip_translator {
Signature · 1 line
2.43.0
PATCH 14/17 drm/amd/display: fix buffer overruns warnings
In reply to James LinFrom: Gaghik Khachatrian <[email protected]>
[Why & How]
Fixes a warning by adding bounds checks and index validation in dml2_0 sources to address static analysis warnings. Ensures safe array access and prevents out-of-bounds reads by validating indices before use, improving robustness and reliability in the affected files.
--- .../amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.c +1 -1
@@ -22,7 +22,7 @@ static bool build_min_clk_table_coarse_grained(const struct dml2_soc_bb *soc_bb, min_table->dram_bw_table.entries[i].pre_derate_dram_bw_kbps =uclk_to_dram_bw_kbps (soc_bb->clk_table.uclk.clk_values_khz[i], &soc_bb->clk_table.dram_config, soc_bb->clk_table.wck_ratio.clk_values_khz[i]); min_table->dram_bw_table.entries[i].min_uclk_khz = soc_bb->clk_table.uclk.clk_values_khz[i]; - }else { + }else if (soc_bb->clk_table.uclk.num_clk_values >0 ) { min_table->dram_bw_table.entries[i].pre_derate_dram_bw_kbps = min_table->dram_bw_table.entries[soc_bb->clk_table.uclk.num_clk_values -1 ].pre_derate_dram_bw_kbps; min_table->dram_bw_table.entries[i].min_uclk_khz = soc_bb->clk_table.uclk.clk_values_khz[soc_bb->clk_table.uclk.num_clk_values -1 ]; }
Signature · 1 line
2.43.0
PATCH 15/17 drm/amd/display: Update tmz field for LSDMA
In reply to James LinFrom: Alvin Lee <[email protected]>
[Why & How]
TMZ field should be 4-bits wide instead of 1. Also add missing src/dst_cache_policy fields to tiled copy struct.
--- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 2 ++ drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c +2 -0
@@ -2255,6 +2255,8 @@ bool dmub_lsdma_send_tiled_to_tiled_copy_command( lsdma_data->u.tiled_copy_data.data_format = params.data_format; lsdma_data->u.tiled_copy_data.max_com = params.max_com; lsdma_data->u.tiled_copy_data.max_uncom = params.max_uncom; + lsdma_data->u.tiled_copy_data.cache_policy_src = params.src_cache_policy; + lsdma_data->u.tiled_copy_data.cache_policy_dst = params.dst_cache_policy; result =dc_wake_and_execute_dmub_cmd (dc_ctx, &cmd, wait_type);
drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h +5 -4
@@ -240,11 +240,11 @@ struct lsdma_linear_sub_window_copy_params {uint32_t src_slice_pitch;uint32_t dst_slice_pitch; - uint32_t tmz : 1; + uint32_t tmz : 4; uint32_t element_size : 3; uint32_t src_cache_policy : 3; uint32_t dst_cache_policy : 3; - uint32_t padding : 22; + uint32_t padding : 19; }; bool dmub_lsdma_send_linear_sub_window_copy_command(
@@ -286,12 +286,13 @@ struct lsdma_send_tiled_to_tiled_copy_command_params { uint32_t swizzle_mode : 5; uint32_t element_size : 3; uint32_t dcc : 1; - uint32_t tmz : 1; + uint32_t tmz : 4; uint32_t read_compress : 2; uint32_t write_compress : 2; uint32_t max_com : 2; uint32_t max_uncom : 1; - uint32_t padding : 9; + uint32_t src_cache_policy : 3; + uint32_t dst_cache_policy : 3; }; bool dmub_lsdma_send_tiled_to_tiled_copy_command(
Signature · 1 line
2.43.0
PATCH 16/17 drm/amd/display: add max bandwidth budget to QoS interface
In reply to James LinFrom: Wenjing Liu <[email protected]>
[Why]
The QoS reporting interface lacked a field to expose the maximum active memory bandwidth budget. Adding this field allows callers to observe the effective bandwidth ceiling.
[How]
Rename struct memory_qos to dc_measured_memory_qos and introduce a new struct dc_requested_memory_qos holding bandwidth lower bound, calculated average bandwidth, latency upper bounds, and max bandwidth budget. Add a get_requested_memory_qos function pointer to clk_mgr_funcs. Update dc_get_qos_info to call through the new function pointer and populate all requested QoS fields including qos_max_bw_budget_in_mbps in dc_qos_info.
--- drivers/gpu/drm/amd/display/dc/core/dc.c | 28 ++++++++++++------- drivers/gpu/drm/amd/display/dc/dc.h | 1 + .../drm/amd/display/dc/hwss/hw_sequencer.h | 8 +++--- .../gpu/drm/amd/display/dc/inc/core_types.h | 10 ++++++- .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +++++++ 5 files changed, 42 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/display/dc/core/dc.c +18 -10
@@ -7602,7 +7602,8 @@ void dc_log_preos_dmcub_info(const struct dc *dc)bool dc_get_qos_info (struct dc *dc,struct dc_qos_info *info) {const struct dc_clocks *clk = &dc->current_state->bw_ctx.bw.dcn.clk; -struct memory_qos qos; +struct dc_measured_memory_qos measured = {}; +struct dc_requested_memory_qos requested = {};memset (info,0 ,sizeof (*info));
@@ -7611,16 +7612,23 @@ bool dc_get_qos_info(struct dc *dc, struct dc_qos_info *info)return false; } -// Call unified measurement function - dc->hwss.measure_memory_qos (dc, &qos); + dc->hwss.measure_memory_qos (dc, &measured); -// Populate info from measured qos - info->actual_peak_bw_in_mbps = qos.peak_bw_mbps; - info->actual_avg_bw_in_mbps = qos.avg_bw_mbps; - info->actual_min_latency_in_ns = qos.min_latency_ns; - info->actual_max_latency_in_ns = qos.max_latency_ns; - info->actual_avg_latency_in_ns = qos.avg_latency_ns; - info->dcn_bandwidth_ub_in_mbps = (uint32_t )(clk->fclk_khz /1000 *64 ); + info->actual_peak_bw_in_mbps = measured.peak_bw_mbps; + info->actual_avg_bw_in_mbps = measured.avg_bw_mbps; + info->actual_min_latency_in_ns = measured.min_latency_ns; + info->actual_max_latency_in_ns = measured.max_latency_ns; + info->actual_avg_latency_in_ns = measured.avg_latency_ns; + info->dcn_bandwidth_ub_in_mbps = (uint32_t )(clk->fclk_khz /1000 *64 ); + +if (dc->clk_mgr && dc->clk_mgr->funcs->get_requested_memory_qos) { + dc->clk_mgr->funcs->get_requested_memory_qos (dc->clk_mgr, &requested); + info->qos_bandwidth_lb_in_mbps = requested.bandwidth_lb_in_mbps; + info->calculated_avg_bw_in_mbps = requested.calculated_avg_bw_in_mbps; + info->qos_max_latency_ub_in_ns = requested.max_latency_ub_in_ns; + info->qos_avg_latency_ub_in_ns = requested.avg_latency_ub_in_ns; + info->qos_max_bw_budget_in_mbps = requested.max_bw_budget_in_mbps; + }return true; }
drivers/gpu/drm/amd/display/dc/dc.h +1 -0
@@ -971,6 +971,7 @@ struct dc_qos_info {uint32_t actual_avg_latency_in_ns;uint32_t qos_avg_latency_ub_in_ns;uint32_t dcn_bandwidth_ub_in_mbps; +uint32_t qos_max_bw_budget_in_mbps; };struct dc_state ;
drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h +4 -4
@@ -53,7 +53,7 @@ struct drr_params;struct dc_underflow_debug_data ;struct dsc_optc_config ;struct vm_system_aperture_param ; -struct memory_qos ; +struct dc_measured_memory_qos ;struct stream_encoder ;struct hpo_dp_stream_encoder ;struct hpo_frl_stream_encoder ;
@@ -1516,12 +1516,12 @@ struct hw_sequencer_funcs {/** * measure_memory_qos - Measure memory QoS metrics * @dc: DC structure -* @qos: Pointer to memory_qos struct to populate with measured values +* @qos: Pointer to dc_measured_memory_qos struct to populate with measured values * -* Populates the provided memory_qos struct with peak bandwidth, average bandwidth, +* Populates the provided dc_measured_memory_qos struct with peak bandwidth, average bandwidth, * max latency, min latency, and average latency from hardware performance counters. */ -void (*measure_memory_qos)(struct dc *dc,struct memory_qos *qos); +void (*measure_memory_qos)(struct dc *dc,struct dc_measured_memory_qos *qos); };
drivers/gpu/drm/amd/display/dc/inc/core_types.h +9 -1
@@ -707,7 +707,7 @@ struct dc_bounding_box_max_clk {int max_phyclk_mhz; }; -struct memory_qos { +struct dc_measured_memory_qos {uint32_t peak_bw_mbps;uint32_t avg_bw_mbps;uint32_t max_latency_ns;
@@ -715,4 +715,12 @@ struct memory_qos { uint32_t avg_latency_ns; }; +struct dc_requested_memory_qos { +uint32_t bandwidth_lb_in_mbps; +uint32_t calculated_avg_bw_in_mbps; +uint32_t max_latency_ub_in_ns; +uint32_t avg_latency_ub_in_ns; +uint32_t max_bw_budget_in_mbps; +}; +#endif /* _CORE_TYPES_H_ */
drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h +10 -0
@@ -28,6 +28,7 @@#define __DAL_CLK_MGR_H__#include "dc.h" +#include "core_types.h" #include "dm_pp_smu.h" /* Constants */
@@ -374,6 +375,15 @@ struct clk_mgr_funcs {unsigned int (*override_memory_bandwidth_request)(struct clk_mgr *clk_mgr,unsigned int bw_kbps); +/** +* get_requested_memory_qos - Retrieve current QoS request from the clock manager's +* current clock state, reflecting any active bandwidth overrides. +* @clk_mgr: clock manager instance +* @qos: pointer to dc_requested_memory_qos structure to populate +*/ +void (*get_requested_memory_qos)( +struct clk_mgr *clk_mgr, +struct dc_requested_memory_qos *qos); };struct clk_mgr {
Signature · 1 line
2.43.0
PATCH 17/17 drm/amd/display: Promote DC to 3.2.381
In reply to James LinFrom: Taimur Hassan <[email protected]>
This version brings along following update:
-add max bandwidth budget to QoS interface
-Update tmz field for LSDMA
-fix buffer overruns warnings
-add memory bandwidth override debug interface
-Find link encoder for flexible DIG mapping cases
-Fix type mismatches using guards and explicit casts
-Fix type mismatches in DC and DMUB modules
-Skip HDR metadata update when Smart Power OLED enabled
-Rename backlight_properties to pwr_backlight_properties -remove watermark range notify
-Clean Up Legacy DML Content
-Implement block sequencing infrastructure for modular hardware operations. -Do DML float narrowing explicit
-Fix type mismatches in DML and normalize loop bounds
-Remove unused state param from enable_link_analog
-Fix Color Manager (3DLUT, Shaper, Blend)
--- 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.380" +#define DC_VER "3.2.381"/** * MAX_SURFACES - representative of the upper bound of surfaces that can be piped to a single CRTC
Signature · 1 line
2.43.0
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 - 539967e4c9779aa65da1122fb24e7a777f4bc1c9 -> drm/amd/display: Promote DC to 3.2.380) with new patches added on top of it.
Tested on Ubuntu 24.04.4, 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
-----Original Message-----
From: James Lin <[email protected]>
Sent: Tuesday, April 28, 2026 9:19 PM
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]>; Lin, Ping Lei <[email protected]>; Chen, Chen-Yu <[email protected]>
Subject: [PATCH 00/17] DC Patches May 4 2026
Start from:3bba7c80f8576f0cf68753abe25c1ca2a0f17018
SWDEV-553782 - test/diags: tcd-tts mapping - keyword search (#28664)
Stopped at:6ee9f5160ad6e0bf672329f7680398e718fc56f5
SWDEV-114487 - modules: [BACKPORT] drm/amd/display: Fix divide by zero in calc_psr_num_static_frames
This version brings along following update:
-add max bandwidth budget to QoS interface -Update tmz field for LSDMA -fix buffer overruns warnings -add memory bandwidth override debug interface -Find link encoder for flexible DIG mapping cases -Fix type mismatches using guards and explicit casts -Fix type mismatches in DC and DMUB modules -Skip HDR metadata update when Smart Power OLED enabled -Rename backlight_properties to pwr_backlight_properties -remove watermark range notify -Clean Up Legacy DML Content -Implement block sequencing infrastructure for modular hardware operations. -Do DML float narrowing explicit -Fix type mismatches in DML and normalize loop bounds -Remove unused state param from enable_link_analog -Fix Color Manager (3DLUT, Shaper, Blend)
Alex Hung (1):
drm/amd/display: Remove unused state param from enable_link_analog
Alvin Lee (1):
drm/amd/display: Update tmz field for LSDMA
Bhuvanachandra Pinninti (1):
drm/amd/display: Implement block sequencing infrastructure for modular
hardware operations.
Charlene Liu (1):
drm/amd/display: remove watermark range notify
Dillon Varone (1):
drm/amd/display: Fix Color Manager (3DLUT, Shaper, Blend)
Gaghik Khachatrian (5):
drm/amd/display: Fix type mismatches in DML and normalize loop bounds drm/amd/display: Do DML float narrowing explicit drm/amd/display: Fix type mismatches in DC and DMUB modules drm/amd/display: Fix type mismatches using guards and explicit casts drm/amd/display: fix buffer overruns warnings
Ian Chen (1):
drm/amd/display: Skip HDR metadata update when Smart Power OLED
enabled
Ovidiu Bunea (1):
drm/amd/display: Find link encoder for flexible DIG mapping cases
Ray Wu (1):
drm/amd/display: Rename backlight_properties to
pwr_backlight_properties
Taimur Hassan (1):
drm/amd/display: Promote DC to 3.2.381
Wenjing Liu (2):
drm/amd/display: add memory bandwidth override debug interface drm/amd/display: add max bandwidth budget to QoS interface
Zheng, Austin (1):
drm/amd/display: Clean Up Legacy DML Content
.../drm/amd/display/dc/basics/conversion.c | 2 +- .../gpu/drm/amd/display/dc/basics/dce_calcs.c | 4 +- .../dc/clk_mgr/dce110/dce110_clk_mgr.c | 6 +- .../display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 +- .../display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +- .../amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 30 +- .../display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 17 +- .../display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 30 +- .../display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 41 +- .../dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 55 +- .../dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 53 +- .../dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 43 +- .../display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 21 +- .../display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 111 +-- .../dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 19 +- .../display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 26 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 643 +++++++++++++++--- .../drm/amd/display/dc/core/dc_hw_sequencer.c | 597 ++++++++++++++-- .../drm/amd/display/dc/core/dc_link_enc_cfg.c | 11 +- .../gpu/drm/amd/display/dc/core/dc_resource.c | 67 +- .../gpu/drm/amd/display/dc/core/dc_state.c | 4 +- .../gpu/drm/amd/display/dc/core/dc_stream.c | 14 +- .../gpu/drm/amd/display/dc/core/dc_surface.c | 6 +- drivers/gpu/drm/amd/display/dc/dc.h | 74 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 11 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 9 +- drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 +- drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 + drivers/gpu/drm/amd/display/dc/dc_types.h | 24 - drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 +- .../drm/amd/display/dc/dce/dce_link_encoder.c | 3 +- .../drm/amd/display/dc/dce/dce_transform.c | 4 +- .../gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 2 +- .../amd/display/dc/dcn10/dcn10_cm_common.c | 12 +- .../dc/dcn10/dcn10_hw_sequencer_debug.c | 22 +- .../drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 2 +- .../amd/display/dc/dcn30/dcn30_cm_common.c | 8 +- .../display/dc/dio/dcn10/dcn10_link_encoder.c | 11 +- .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 6 +- .../drm/amd/display/dc/dml/calcs/dcn_calcs.c | 9 +- .../drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 34 +- .../dc/dml/dcn20/display_mode_vba_20.c | 36 +- .../dc/dml/dcn20/display_mode_vba_20v2.c | 36 +- .../dc/dml/dcn21/display_mode_vba_21.c | 36 +- .../drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 14 +- .../dc/dml/dcn30/display_mode_vba_30.c | 83 +-- .../amd/display/dc/dml/dcn301/dcn301_fpu.c | 5 +- .../amd/display/dc/dml/dcn302/dcn302_fpu.c | 2 +- .../amd/display/dc/dml/dcn303/dcn303_fpu.c | 2 +- .../drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 15 +- .../dc/dml/dcn31/display_mode_vba_31.c | 121 ++-- .../amd/display/dc/dml/dcn314/dcn314_fpu.c | 5 +- .../dc/dml/dcn314/display_mode_vba_314.c | 129 ++-- .../drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 75 +- .../dc/dml/dcn32/display_mode_vba_32.c | 21 +- .../dc/dml/dcn32/display_mode_vba_util_32.c | 2 +- .../amd/display/dc/dml/dcn321/dcn321_fpu.c | 46 +- .../drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 5 +- .../amd/display/dc/dml/dcn351/dcn351_fpu.c | 5 +- .../drm/amd/display/dc/dml/display_mode_vba.c | 4 +- .../drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- .../dml21/src/dml2_mcg/dml2_mcg_dcn42.c | 2 +- .../dml21/src/dml2_top/dml2_top_legacy.h | 9 - .../amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 2 +- .../amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c | 2 +- .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 13 +- .../amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 2 +- .../display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 2 +- drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +- .../drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 3 +- .../amd/display/dc/dsc/dcn401/dcn401_dsc.c | 3 +- .../hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- .../display/dc/hubbub/dcn401/dcn401_hubbub.c | 7 +- .../display/dc/hubbub/dcn42/dcn42_hubbub.c | 5 +- .../amd/display/dc/hubp/dcn20/dcn20_hubp.c | 2 +- .../amd/display/dc/hubp/dcn401/dcn401_hubp.c | 201 ++---- .../amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- .../amd/display/dc/hubp/dcn42/dcn42_hubp.c | 78 +-- .../amd/display/dc/hubp/dcn42/dcn42_hubp.h | 10 +- .../amd/display/dc/hwss/dce110/dce110_hwseq.c | 38 +- .../amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 55 +- .../amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 34 +- .../amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 15 +- .../amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 12 +- .../amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 32 +- .../amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 68 +- .../amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 2 +- .../amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 432 ++++++++---- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 520 ++++++++++++-- .../amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 9 +- .../drm/amd/display/dc/hwss/hw_sequencer.h | 353 ++++++++-- .../gpu/drm/amd/display/dc/inc/core_types.h | 10 +- .../gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 22 + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 35 +- drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 79 +-- .../amd/display/dc/inc/hw/stream_encoder.h | 1 + .../display/dc/inc/soc_and_ip_translator.h | 19 +- .../drm/amd/display/dc/link/link_detection.c | 6 +- .../gpu/drm/amd/display/dc/link/link_dpms.c | 10 +- .../drm/amd/display/dc/link/link_factory.c | 2 +- .../drm/amd/display/dc/link/link_validation.c | 4 +- .../dc/link/protocols/link_dp_capability.c | 4 +- .../dc/link/protocols/link_dp_dpia_bw.c | 2 +- .../dc/link/protocols/link_dp_irq_handler.c | 2 +- .../dc/link/protocols/link_dp_training.c | 4 +- .../drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 2 +- .../amd/display/dc/mpc/dcn401/dcn401_mpc.c | 177 +++-- .../amd/display/dc/mpc/dcn401/dcn401_mpc.h | 25 +- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 388 ++++++++++- .../drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 49 +- .../amd/display/dc/optc/dcn10/dcn10_optc.c | 2 +- .../amd/display/dc/pg/dcn35/dcn35_pg_cntl.c | 6 +- .../amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 4 +- .../dc/resource/dcn42/dcn42_resource.c | 1 - .../dcn42/dcn42_soc_and_ip_translator.c | 6 +- .../drm/amd/display/dmub/src/dmub_dcn401.c | 2 +- .../gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 2 +- .../amd/display/modules/color/color_gamma.c | 12 +- .../gpu/drm/amd/display/modules/power/power.c | 28 +- .../gpu/drm/amd/display/modules/vmid/vmid.c | 6 +- 121 files changed, 3870 insertions(+), 1702 deletions(-) delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h
--
2.43.0