Commit 1f9d56c3 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: add register distance members into vmhub structure 



This patch is to abstract register distances between two continuous
context domains and invalidation engines. In different ip headers, these
distances may be differences.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Tested-by: default avatarAnZhong Huang <anzhong.huang@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c1213911

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,15 @@ struct amdgpu_vmhub { 
	uint32_t	vm_context0_cntl;

	uint32_t	vm_l2_pro_fault_status;

	uint32_t	vm_l2_pro_fault_cntl;



	/*

	 * store the register distances between two continuous context domain

	 * and invalidation engine.

	 */

	uint32_t	ctx_distance;

	uint32_t	ctx_addr_distance; /* include LO32/HI32 */

	uint32_t	eng_distance;

	uint32_t	eng_addr_distance; /* include LO32/HI32 */

};



/*

drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c

+7 −0
Original line number Diff line number Diff line
@@ -386,4 +386,11 @@ void gfxhub_v1_0_init(struct amdgpu_device *adev) 
		SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_STATUS);

	hub->vm_l2_pro_fault_cntl =

		SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL);



	hub->ctx_distance = mmVM_CONTEXT1_CNTL - mmVM_CONTEXT0_CNTL;

	hub->ctx_addr_distance = mmVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 -

		mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32;

	hub->eng_distance = mmVM_INVALIDATE_ENG1_REQ - mmVM_INVALIDATE_ENG0_REQ;

	hub->eng_addr_distance = mmVM_INVALIDATE_ENG1_ADDR_RANGE_LO32 -

		mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32;

}

drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c

+8 −0
Original line number Diff line number Diff line
@@ -373,4 +373,12 @@ void gfxhub_v2_0_init(struct amdgpu_device *adev) 
		SOC15_REG_OFFSET(GC, 0, mmGCVM_L2_PROTECTION_FAULT_STATUS);

	hub->vm_l2_pro_fault_cntl =

		SOC15_REG_OFFSET(GC, 0, mmGCVM_L2_PROTECTION_FAULT_CNTL);



	hub->ctx_distance = mmGCVM_CONTEXT1_CNTL - mmGCVM_CONTEXT0_CNTL;

	hub->ctx_addr_distance = mmGCVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 -

		mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32;

	hub->eng_distance = mmGCVM_INVALIDATE_ENG1_REQ -

		mmGCVM_INVALIDATE_ENG0_REQ;

	hub->eng_addr_distance = mmGCVM_INVALIDATE_ENG1_ADDR_RANGE_LO32 -

		mmGCVM_INVALIDATE_ENG0_ADDR_RANGE_LO32;

}

drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c

+8 −0
Original line number Diff line number Diff line
@@ -372,6 +372,14 @@ void gfxhub_v2_1_init(struct amdgpu_device *adev) 
		SOC15_REG_OFFSET(GC, 0, mmGCVM_L2_PROTECTION_FAULT_STATUS);

	hub->vm_l2_pro_fault_cntl =

		SOC15_REG_OFFSET(GC, 0, mmGCVM_L2_PROTECTION_FAULT_CNTL);



	hub->ctx_distance = mmGCVM_CONTEXT1_CNTL - mmGCVM_CONTEXT0_CNTL;

	hub->ctx_addr_distance = mmGCVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 -

		mmGCVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32;

	hub->eng_distance = mmGCVM_INVALIDATE_ENG1_REQ -

		mmGCVM_INVALIDATE_ENG0_REQ;

	hub->eng_addr_distance = mmGCVM_INVALIDATE_ENG1_ADDR_RANGE_LO32 -

		mmGCVM_INVALIDATE_ENG0_ADDR_RANGE_LO32;

}



int gfxhub_v2_1_get_xgmi_info(struct amdgpu_device *adev)

drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c

+6 −0
Original line number Diff line number Diff line
@@ -429,6 +429,12 @@ void mmhub_v1_0_init(struct amdgpu_device *adev) 
	hub->vm_l2_pro_fault_cntl =

		SOC15_REG_OFFSET(MMHUB, 0, mmVM_L2_PROTECTION_FAULT_CNTL);



	hub->ctx_distance = mmVM_CONTEXT1_CNTL - mmVM_CONTEXT0_CNTL;

	hub->ctx_addr_distance = mmVM_CONTEXT1_PAGE_TABLE_BASE_ADDR_LO32 -

		mmVM_CONTEXT0_PAGE_TABLE_BASE_ADDR_LO32;

	hub->eng_distance = mmVM_INVALIDATE_ENG1_REQ - mmVM_INVALIDATE_ENG0_REQ;

	hub->eng_addr_distance = mmVM_INVALIDATE_ENG1_ADDR_RANGE_LO32 -

		mmVM_INVALIDATE_ENG0_ADDR_RANGE_LO32;

}



static void mmhub_v1_0_update_medium_grain_clock_gating(struct amdgpu_device *adev,