drm/amd/display: update DCN dml calcs

DV have made updates to DCN dml which we need to pull in

Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Eric Bernstein <Eric.Bernstein@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
index cd88cec..446ee48 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
+++ b/drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c
@@ -290,41 +290,34 @@ static void pipe_ctx_to_e2e_pipe_params (
        switch (pipe->plane_state->tiling_info.gfx9.swizzle) {
        /* for 4/8/16 high tiles */
        case DC_SW_LINEAR:
-               input->src.is_display_sw = 1;
                input->src.macro_tile_size = dm_4k_tile;
                break;
        case DC_SW_4KB_S:
        case DC_SW_4KB_S_X:
-               input->src.is_display_sw = 0;
                input->src.macro_tile_size = dm_4k_tile;
                break;
        case DC_SW_64KB_S:
        case DC_SW_64KB_S_X:
        case DC_SW_64KB_S_T:
-               input->src.is_display_sw = 0;
                input->src.macro_tile_size = dm_64k_tile;
                break;
        case DC_SW_VAR_S:
        case DC_SW_VAR_S_X:
-               input->src.is_display_sw = 0;
                input->src.macro_tile_size = dm_256k_tile;
                break;
 
        /* For 64bpp 2 high tiles */
        case DC_SW_4KB_D:
        case DC_SW_4KB_D_X:
-               input->src.is_display_sw = 1;
                input->src.macro_tile_size = dm_4k_tile;
                break;
        case DC_SW_64KB_D:
        case DC_SW_64KB_D_X:
        case DC_SW_64KB_D_T:
-               input->src.is_display_sw = 1;
                input->src.macro_tile_size = dm_64k_tile;
                break;
        case DC_SW_VAR_D:
        case DC_SW_VAR_D_X:
-               input->src.is_display_sw = 1;
                input->src.macro_tile_size = dm_256k_tile;
                break;
 

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index 6ab1ca2..83447cd 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -70,7 +70,7 @@
 const struct _vcs_dpi_ip_params_st dcn1_0_ip = {
        .rob_buffer_size_kbytes = 64,
        .det_buffer_size_kbytes = 164,
-       .dpte_buffer_size_in_pte_reqs = 42,
+       .dpte_buffer_size_in_pte_reqs_luma = 42,
        .dpp_output_buffer_pixels = 2560,
        .opp_output_buffer_lines = 1,
        .pixel_chunk_size_kbytes = 8,

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
index 5dd0452..391183e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_structs.h
@@ -30,22 +30,15 @@ typedef struct _vcs_dpi_soc_bounding_box_st soc_bounding_box_st;
 typedef struct _vcs_dpi_ip_params_st ip_params_st;
 typedef struct _vcs_dpi_display_pipe_source_params_st display_pipe_source_params_st;
 typedef struct _vcs_dpi_display_output_params_st display_output_params_st;
-typedef struct _vcs_dpi_display_bandwidth_st display_bandwidth_st;
 typedef struct _vcs_dpi_scaler_ratio_depth_st scaler_ratio_depth_st;
 typedef struct _vcs_dpi_scaler_taps_st scaler_taps_st;
 typedef struct _vcs_dpi_display_pipe_dest_params_st display_pipe_dest_params_st;
 typedef struct _vcs_dpi_display_pipe_params_st display_pipe_params_st;
 typedef struct _vcs_dpi_display_clocks_and_cfg_st display_clocks_and_cfg_st;
 typedef struct _vcs_dpi_display_e2e_pipe_params_st display_e2e_pipe_params_st;
-typedef struct _vcs_dpi_dchub_buffer_sizing_st dchub_buffer_sizing_st;
-typedef struct _vcs_dpi_watermarks_perf_st watermarks_perf_st;
-typedef struct _vcs_dpi_cstate_pstate_watermarks_st cstate_pstate_watermarks_st;
-typedef struct _vcs_dpi_wm_calc_pipe_params_st wm_calc_pipe_params_st;
-typedef struct _vcs_dpi_vratio_pre_st vratio_pre_st;
 typedef struct _vcs_dpi_display_data_rq_misc_params_st display_data_rq_misc_params_st;
 typedef struct _vcs_dpi_display_data_rq_sizing_params_st display_data_rq_sizing_params_st;
 typedef struct _vcs_dpi_display_data_rq_dlg_params_st display_data_rq_dlg_params_st;
-typedef struct _vcs_dpi_display_cur_rq_dlg_params_st display_cur_rq_dlg_params_st;
 typedef struct _vcs_dpi_display_rq_dlg_params_st display_rq_dlg_params_st;
 typedef struct _vcs_dpi_display_rq_sizing_params_st display_rq_sizing_params_st;
 typedef struct _vcs_dpi_display_rq_misc_params_st display_rq_misc_params_st;
@@ -55,8 +48,6 @@ typedef struct _vcs_dpi_display_ttu_regs_st display_ttu_regs_st;
 typedef struct _vcs_dpi_display_data_rq_regs_st display_data_rq_regs_st;
 typedef struct _vcs_dpi_display_rq_regs_st display_rq_regs_st;
 typedef struct _vcs_dpi_display_dlg_sys_params_st display_dlg_sys_params_st;
-typedef struct _vcs_dpi_display_dlg_prefetch_param_st display_dlg_prefetch_param_st;
-typedef struct _vcs_dpi_display_pipe_clock_st display_pipe_clock_st;
 typedef struct _vcs_dpi_display_arb_params_st display_arb_params_st;
 
 struct _vcs_dpi_voltage_scaling_st {
@@ -111,8 +102,6 @@ struct _vcs_dpi_soc_bounding_box_st {
        double xfc_bus_transport_time_us;
        double xfc_xbuf_latency_tolerance_us;
        int use_urgent_burst_bw;
-       double max_hscl_ratio;
-       double max_vscl_ratio;
        unsigned int num_states;
        struct _vcs_dpi_voltage_scaling_st clock_limits[8];
 };
@@ -129,7 +118,8 @@ struct _vcs_dpi_ip_params_st {
        unsigned int odm_capable;
        unsigned int rob_buffer_size_kbytes;
        unsigned int det_buffer_size_kbytes;
-       unsigned int dpte_buffer_size_in_pte_reqs;
+       unsigned int dpte_buffer_size_in_pte_reqs_luma;
+       unsigned int dpte_buffer_size_in_pte_reqs_chroma;
        unsigned int pde_proc_buffer_size_64k_reqs;
        unsigned int dpp_output_buffer_pixels;
        unsigned int opp_output_buffer_lines;
@@ -192,7 +182,6 @@ struct _vcs_dpi_display_xfc_params_st {
 struct _vcs_dpi_display_pipe_source_params_st {
        int source_format;
        unsigned char dcc;
-       unsigned int dcc_override;
        unsigned int dcc_rate;
        unsigned char dcc_use_global;
        unsigned char vm;
@@ -205,7 +194,6 @@ struct _vcs_dpi_display_pipe_source_params_st {
        int source_scan;
        int sw_mode;
        int macro_tile_size;
-       unsigned char is_display_sw;
        unsigned int viewport_width;
        unsigned int viewport_height;
        unsigned int viewport_y_y;
@@ -252,16 +240,10 @@ struct _vcs_dpi_display_output_params_st {
        int output_bpc;
        int output_type;
        int output_format;
-       int output_standard;
        int dsc_slices;
        struct writeback_st wb;
 };
 
-struct _vcs_dpi_display_bandwidth_st {
-       double total_bw_consumed_gbps;
-       double guaranteed_urgent_return_bw_gbps;
-};
-
 struct _vcs_dpi_scaler_ratio_depth_st {
        double hscl_ratio;
        double vscl_ratio;
@@ -300,11 +282,9 @@ struct _vcs_dpi_display_pipe_dest_params_st {
        unsigned int vupdate_width;
        unsigned int vready_offset;
        unsigned char interlaced;
-       unsigned char underscan;
        double pixel_rate_mhz;
        unsigned char synchronized_vblank_all_planes;
        unsigned char otg_inst;
-       unsigned char odm_split_cnt;
        unsigned char odm_combine;
        unsigned char use_maximum_vstartup;
 };
@@ -331,65 +311,6 @@ struct _vcs_dpi_display_e2e_pipe_params_st {
        display_clocks_and_cfg_st clks_cfg;
 };
 
-struct _vcs_dpi_dchub_buffer_sizing_st {
-       unsigned int swath_width_y;
-       unsigned int swath_height_y;
-       unsigned int swath_height_c;
-       unsigned int detail_buffer_size_y;
-};
-
-struct _vcs_dpi_watermarks_perf_st {
-       double stutter_eff_in_active_region_percent;
-       double urgent_latency_supported_us;
-       double non_urgent_latency_supported_us;
-       double dram_clock_change_margin_us;
-       double dram_access_eff_percent;
-};
-
-struct _vcs_dpi_cstate_pstate_watermarks_st {
-       double cstate_exit_us;
-       double cstate_enter_plus_exit_us;
-       double pstate_change_us;
-};
-
-struct _vcs_dpi_wm_calc_pipe_params_st {
-       unsigned int num_dpp;
-       int voltage;
-       int output_type;
-       double dcfclk_mhz;
-       double socclk_mhz;
-       double dppclk_mhz;
-       double pixclk_mhz;
-       unsigned char interlace_en;
-       unsigned char pte_enable;
-       unsigned char dcc_enable;
-       double dcc_rate;
-       double bytes_per_pixel_c;
-       double bytes_per_pixel_y;
-       unsigned int swath_width_y;
-       unsigned int swath_height_y;
-       unsigned int swath_height_c;
-       unsigned int det_buffer_size_y;
-       double h_ratio;
-       double v_ratio;
-       unsigned int h_taps;
-       unsigned int h_total;
-       unsigned int v_total;
-       unsigned int v_active;
-       unsigned int e2e_index;
-       double display_pipe_line_delivery_time;
-       double read_bw;
-       unsigned int lines_in_det_y;
-       unsigned int lines_in_det_y_rounded_down_to_swath;
-       double full_det_buffering_time;
-       double dcfclk_deepsleep_mhz_per_plane;
-};
-
-struct _vcs_dpi_vratio_pre_st {
-       double vratio_pre_l;
-       double vratio_pre_c;
-};
-
 struct _vcs_dpi_display_data_rq_misc_params_st {
        unsigned int full_swath_bytes;
        unsigned int stored_swath_bytes;
@@ -423,16 +344,9 @@ struct _vcs_dpi_display_data_rq_dlg_params_st {
        unsigned int meta_bytes_per_row_ub;
 };
 
-struct _vcs_dpi_display_cur_rq_dlg_params_st {
-       unsigned char enable;
-       unsigned int swath_height;
-       unsigned int req_per_line;
-};
-
 struct _vcs_dpi_display_rq_dlg_params_st {
        display_data_rq_dlg_params_st rq_l;
        display_data_rq_dlg_params_st rq_c;
-       display_cur_rq_dlg_params_st rq_cur0;
 };
 
 struct _vcs_dpi_display_rq_sizing_params_st {
@@ -498,6 +412,10 @@ struct _vcs_dpi_display_dlg_regs_st {
        unsigned int xfc_reg_remote_surface_flip_latency;
        unsigned int xfc_reg_prefetch_margin;
        unsigned int dst_y_delta_drq_limit;
+       unsigned int refcyc_per_vm_group_vblank;
+       unsigned int refcyc_per_vm_group_flip;
+       unsigned int refcyc_per_vm_req_vblank;
+       unsigned int refcyc_per_vm_req_flip;
 };
 
 struct _vcs_dpi_display_ttu_regs_st {
@@ -556,19 +474,6 @@ struct _vcs_dpi_display_dlg_sys_params_st {
        unsigned int total_flip_bytes;
 };
 
-struct _vcs_dpi_display_dlg_prefetch_param_st {
-       double prefetch_bw;
-       unsigned int flip_bytes;
-};
-
-struct _vcs_dpi_display_pipe_clock_st {
-       double dcfclk_mhz;
-       double dispclk_mhz;
-       double socclk_mhz;
-       double dscclk_mhz[6];
-       double dppclk_mhz[6];
-};
-
 struct _vcs_dpi_display_arb_params_st {
        int max_req_outstanding;
        int min_req_outstanding;

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
index c2037da..a8b233e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
@@ -459,7 +459,7 @@ static void dml1_rq_dlg_get_row_heights(
        /* dpte   */
        /* ------ */
        log2_vmpg_bytes = dml_log2(mode_lib->soc.vmm_page_size_bytes);
-       dpte_buf_in_pte_reqs = mode_lib->ip.dpte_buffer_size_in_pte_reqs;
+       dpte_buf_in_pte_reqs = mode_lib->ip.dpte_buffer_size_in_pte_reqs_luma;
 
        log2_vmpg_height = 0;
        log2_vmpg_width = 0;
@@ -776,7 +776,7 @@ static void get_surf_rq_param(
        /* dpte   */
        /* ------ */
        log2_vmpg_bytes = dml_log2(mode_lib->soc.vmm_page_size_bytes);
-       dpte_buf_in_pte_reqs = mode_lib->ip.dpte_buffer_size_in_pte_reqs;
+       dpte_buf_in_pte_reqs = mode_lib->ip.dpte_buffer_size_in_pte_reqs_luma;
 
        log2_vmpg_height = 0;
        log2_vmpg_width = 0;

diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
index 06df02d..da89c2e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
+++ b/drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h
@@ -31,7 +31,7 @@
 #include "dml/display_mode_structs.h"
 
 struct dchub_init_data;
-struct cstate_pstate_watermarks_st1 {
+struct cstate_pstate_watermarks_st {
        uint32_t cstate_exit_ns;
        uint32_t cstate_enter_plus_exit_ns;
        uint32_t pstate_change_ns;
@@ -40,7 +40,7 @@ struct cstate_pstate_watermarks_st1 {
 struct dcn_watermarks {
        uint32_t pte_meta_urgent_ns;
        uint32_t urgent_ns;
-       struct cstate_pstate_watermarks_st1 cstate_pstate;
+       struct cstate_pstate_watermarks_st cstate_pstate;
 };
 
 struct dcn_watermark_set {