Commit ee80de54 authored by Jaehyun Chung's avatar Jaehyun Chung Committed by Alex Deucher
Browse files

drm/amd/display: Add VM page fault handle implementation 



[How] Allocate memory for default page and program memory block addr
into default page addr register.

Signed-off-by: default avatarJaehyun Chung <jaehyun.chung@amd.com>
Reviewed-by: default avatarJun Lei <Jun.Lei@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent df3b7e32

drivers/gpu/drm/amd/display/dc/dc.h

+1 −0
Original line number Diff line number Diff line
@@ -423,6 +423,7 @@ struct dc_phy_addr_space_config { 
	} gart_config;



	bool valid;

	uint64_t page_table_default_page_addr;

};



struct dc_virtual_addr_space_config {

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h

+5 −1
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ struct dcn_hubbub_registers { 
	uint32_t DCN_VM_AGP_BOT;

	uint32_t DCN_VM_AGP_TOP;

	uint32_t DCN_VM_AGP_BASE;

	uint32_t DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB;

	uint32_t DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB;

};



/* set field name */
@@ -196,7 +198,9 @@ struct dcn_hubbub_registers { 
		type DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_A;\

		type DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_B;\

		type DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_C;\

		type DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D

		type DCHUBBUB_ARB_ALLOW_DRAM_CLK_CHANGE_WATERMARK_D;\

		type DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB;\

		type DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB



#define HUBBUB_STUTTER_REG_FIELD_LIST(type) \

		type DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A;\

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c

+5 −0
Original line number Diff line number Diff line
@@ -380,6 +380,11 @@ int hubbub2_init_dchub_sys_ctx(struct hubbub *hubbub, 
	REG_SET(DCN_VM_AGP_BASE, 0,

			AGP_BASE, pa_config->system_aperture.agp_base >> 24);



	REG_SET(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB, 0,

			DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB, (pa_config->page_table_default_page_addr >> 44) & 0xF);

	REG_SET(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB, 0,

			DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB, (pa_config->page_table_default_page_addr >> 12) & 0xFFFFFFFF);



	if (pa_config->gart_config.page_table_start_addr != pa_config->gart_config.page_table_end_addr) {

		phys_config.page_table_start_addr = pa_config->gart_config.page_table_start_addr >> 12;

		phys_config.page_table_end_addr = pa_config->gart_config.page_table_end_addr >> 12;

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h

+7 −2
Original line number Diff line number Diff line
@@ -45,7 +45,10 @@ 
#define HUBBUB_REG_LIST_DCN20(id)\

	HUBBUB_REG_LIST_DCN20_COMMON(), \

	HUBBUB_SR_WATERMARK_REG_LIST(), \

	HUBBUB_VM_REG_LIST()

	HUBBUB_VM_REG_LIST(),\

	SR(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB),\

	SR(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB)





#define HUBBUB_MASK_SH_LIST_DCN20(mask_sh)\

	HUBBUB_MASK_SH_LIST_DCN_COMMON(mask_sh), \
@@ -56,7 +59,9 @@ 
	HUBBUB_SF(DCN_VM_FB_OFFSET, FB_OFFSET, mask_sh), \

	HUBBUB_SF(DCN_VM_AGP_BOT, AGP_BOT, mask_sh), \

	HUBBUB_SF(DCN_VM_AGP_TOP, AGP_TOP, mask_sh), \

	HUBBUB_SF(DCN_VM_AGP_BASE, AGP_BASE, mask_sh)

	HUBBUB_SF(DCN_VM_AGP_BASE, AGP_BASE, mask_sh), \

	HUBBUB_SF(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB, DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_MSB, mask_sh), \

	HUBBUB_SF(DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB, DCN_VM_PROTECTION_FAULT_DEFAULT_ADDR_LSB, mask_sh)



struct dcn20_hubbub {

	struct hubbub base;

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+1 −0
Original line number Diff line number Diff line
@@ -1504,6 +1504,7 @@ static int dcn20_init_sys_ctx(struct dce_hwseq *hws, struct dc *dc, struct dc_ph 
	config.gart_config.page_table_start_addr = pa_config->gart_config.page_table_start_addr;

	config.gart_config.page_table_end_addr = pa_config->gart_config.page_table_end_addr;

	config.gart_config.page_table_base_addr = pa_config->gart_config.page_table_base_addr;

	config.page_table_default_page_addr = pa_config->page_table_default_page_addr;



	return dc->res_pool->hubbub->funcs->init_dchub_sys_ctx(dc->res_pool->hubbub, &config);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE