From: Dillon Varone <[email protected]> [WHY&HOW] DCN4+ use a new structure for MCIF arbiter registers.
Reviewed-by: Austin Zheng <[email protected]> Signed-off-by: Dillon Varone <[email protected]> Signed-off-by: Wayne Lin <[email protected]> --- .../gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h index 15cb782f129b..aae0ad7ae835 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h @@ -27,6 +27,7 @@ #include "dc_hw_types.h" +#include "dml2_0/dml21/inc/dml_top_dchub_registers.h" enum mmhubbub_wbif_mode { PACKED_444 = 0, @@ -36,14 +37,21 @@ enum mmhubbub_wbif_mode { }; struct mcif_arb_params { - - unsigned int time_per_pixel; - unsigned int cli_watermark[4]; - unsigned int pstate_watermark[4]; - unsigned int arbitration_slice; - unsigned int slice_lines; - unsigned int max_scaled_time; - unsigned int dram_speed_change_duration; + union { + struct { + unsigned int time_per_pixel; + unsigned int cli_watermark[4]; + unsigned int pstate_watermark[4]; + unsigned int arbitration_slice; + unsigned int slice_lines; + unsigned int max_scaled_time; + unsigned int dram_speed_change_duration; + }; + struct { + struct dml2_mcif_global_register_set global_regs; + struct dml2_mcif_per_pipe_register_set inst_regs; + } dcn4x; //dcn4+ + }; }; struct mcif_irq_params { -- 2.43.0
