From bda9afdacf8942c313a47cc95582737345a91c5e Mon Sep 17 00:00:00 2001 From: Dmytro Laktyushkin Date: Wed, 22 May 2019 18:05:41 -0400 Subject: drm/amd/display: move vmid determination logic to a module Currently vmid is decided internally inside dc. With the introduction of new asics we are required to coordinate vmid use with external components. This change converts vmid logic to a DAL module allowing vmid to be passed in as a parameter to DC. Signed-off-by: Dmytro Laktyushkin Reviewed-by: Charlene Liu Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h') diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h index d56fd7d87bbc..959f5b654611 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h @@ -87,6 +87,7 @@ struct dcn_hubbub_virt_addr_config { uint64_t page_table_end_addr; enum dcn_hubbub_page_table_block_size page_table_block_size; enum dcn_hubbub_page_table_depth page_table_depth; + uint64_t page_table_base_addr; }; struct hubbub_addr_config { @@ -105,18 +106,13 @@ struct hubbub_funcs { struct dchub_init_data *dh_data); #ifdef CONFIG_DRM_AMD_DC_DCN2_0 - void (*init_dchub)( + int (*init_dchub_sys_ctx)( struct hubbub *hubbub, - struct hubbub_addr_config *config); - void (*setup_vmid_ptb)( + struct dcn_hubbub_phys_addr_config *pa_config); + void (*init_vm_ctx)( struct hubbub *hubbub, - uint64_t ptb, - uint8_t vmid); - - void (*set_ptb)( - struct hubbub *hubbub, - uint8_t vmid, - uint64_t base_addr); + struct dcn_hubbub_virt_addr_config *va_config, + int vmid); #endif bool (*get_dcc_compression_cap)(struct hubbub *hubbub, -- cgit v1.2.3