Commit 71e6bd2a authored by Dmytro Laktyushkin's avatar Dmytro Laktyushkin Committed by Alex Deucher

drm/amd/display: update dml related structs

In preparation for further changes
Signed-off-by: default avatarDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: default avatarChris Park <Chris.Park@amd.com>
Acked-by: default avatarLeo Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92855074
...@@ -2033,6 +2033,7 @@ int dcn20_populate_dml_pipes_from_context( ...@@ -2033,6 +2033,7 @@ int dcn20_populate_dml_pipes_from_context(
pipes[pipe_cnt].pipe.src.viewport_height = timing->v_addressable; pipes[pipe_cnt].pipe.src.viewport_height = timing->v_addressable;
if (pipes[pipe_cnt].pipe.src.viewport_height > 1080) if (pipes[pipe_cnt].pipe.src.viewport_height > 1080)
pipes[pipe_cnt].pipe.src.viewport_height = 1080; pipes[pipe_cnt].pipe.src.viewport_height = 1080;
pipes[pipe_cnt].pipe.src.surface_height_y = pipes[pipe_cnt].pipe.src.viewport_height;
pipes[pipe_cnt].pipe.src.data_pitch = ((pipes[pipe_cnt].pipe.src.viewport_width + 63) / 64) * 64; /* linear sw only */ pipes[pipe_cnt].pipe.src.data_pitch = ((pipes[pipe_cnt].pipe.src.viewport_width + 63) / 64) * 64; /* linear sw only */
pipes[pipe_cnt].pipe.src.source_format = dm_444_32; pipes[pipe_cnt].pipe.src.source_format = dm_444_32;
pipes[pipe_cnt].pipe.dest.recout_width = pipes[pipe_cnt].pipe.src.viewport_width; /*vp_width/hratio*/ pipes[pipe_cnt].pipe.dest.recout_width = pipes[pipe_cnt].pipe.src.viewport_width; /*vp_width/hratio*/
...@@ -2066,6 +2067,7 @@ int dcn20_populate_dml_pipes_from_context( ...@@ -2066,6 +2067,7 @@ int dcn20_populate_dml_pipes_from_context(
pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c.width; pipes[pipe_cnt].pipe.src.viewport_width_c = scl->viewport_c.width;
pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport.height; pipes[pipe_cnt].pipe.src.viewport_height = scl->viewport.height;
pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c.height; pipes[pipe_cnt].pipe.src.viewport_height_c = scl->viewport_c.height;
pipes[pipe_cnt].pipe.src.surface_height_y = pln->plane_size.surface_size.height;
if (pln->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) { if (pln->format >= SURFACE_PIXEL_FORMAT_VIDEO_BEGIN) {
pipes[pipe_cnt].pipe.src.data_pitch = pln->plane_size.surface_pitch; pipes[pipe_cnt].pipe.src.data_pitch = pln->plane_size.surface_pitch;
pipes[pipe_cnt].pipe.src.data_pitch_c = pln->plane_size.chroma_pitch; pipes[pipe_cnt].pipe.src.data_pitch_c = pln->plane_size.chroma_pitch;
......
...@@ -99,6 +99,7 @@ struct _vcs_dpi_soc_bounding_box_st { ...@@ -99,6 +99,7 @@ struct _vcs_dpi_soc_bounding_box_st {
unsigned int num_chans; unsigned int num_chans;
unsigned int vmm_page_size_bytes; unsigned int vmm_page_size_bytes;
unsigned int hostvm_min_page_size_bytes; unsigned int hostvm_min_page_size_bytes;
unsigned int gpuvm_min_page_size_bytes;
double dram_clock_change_latency_us; double dram_clock_change_latency_us;
double dummy_pstate_latency_us; double dummy_pstate_latency_us;
double writeback_dram_clock_change_latency_us; double writeback_dram_clock_change_latency_us;
...@@ -224,6 +225,7 @@ struct _vcs_dpi_display_pipe_source_params_st { ...@@ -224,6 +225,7 @@ struct _vcs_dpi_display_pipe_source_params_st {
int source_scan; int source_scan;
int sw_mode; int sw_mode;
int macro_tile_size; int macro_tile_size;
unsigned int surface_height_y;
unsigned int viewport_width; unsigned int viewport_width;
unsigned int viewport_height; unsigned int viewport_height;
unsigned int viewport_y_y; unsigned int viewport_y_y;
...@@ -400,6 +402,7 @@ struct _vcs_dpi_display_rq_misc_params_st { ...@@ -400,6 +402,7 @@ struct _vcs_dpi_display_rq_misc_params_st {
struct _vcs_dpi_display_rq_params_st { struct _vcs_dpi_display_rq_params_st {
unsigned char yuv420; unsigned char yuv420;
unsigned char yuv420_10bpc; unsigned char yuv420_10bpc;
unsigned char rgbe_alpha;
display_rq_misc_params_st misc; display_rq_misc_params_st misc;
display_rq_sizing_params_st sizing; display_rq_sizing_params_st sizing;
display_rq_dlg_params_st dlg; display_rq_dlg_params_st dlg;
......
...@@ -231,7 +231,7 @@ static void fetch_socbb_params(struct display_mode_lib *mode_lib) ...@@ -231,7 +231,7 @@ static void fetch_socbb_params(struct display_mode_lib *mode_lib)
mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading = soc->dcn_downspread_percent; // new mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading = soc->dcn_downspread_percent; // new
mode_lib->vba.DISPCLKDPPCLKVCOSpeed = soc->dispclk_dppclk_vco_speed_mhz; // new mode_lib->vba.DISPCLKDPPCLKVCOSpeed = soc->dispclk_dppclk_vco_speed_mhz; // new
mode_lib->vba.VMMPageSize = soc->vmm_page_size_bytes; mode_lib->vba.VMMPageSize = soc->vmm_page_size_bytes;
mode_lib->vba.GPUVMMinPageSize = soc->vmm_page_size_bytes / 1024; mode_lib->vba.GPUVMMinPageSize = soc->gpuvm_min_page_size_bytes / 1024;
mode_lib->vba.HostVMMinPageSize = soc->hostvm_min_page_size_bytes / 1024; mode_lib->vba.HostVMMinPageSize = soc->hostvm_min_page_size_bytes / 1024;
// Set the voltage scaling clocks as the defaults. Most of these will // Set the voltage scaling clocks as the defaults. Most of these will
// be set to different values by the test // be set to different values by the test
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment