Commit e6d92197 authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

drm/amdgpu: Add copy_pte_num_dw member in amdgpu_vm_pte_funcs 



Use it to replace the hard coded value in amdgpu_vm_bo_update_mapping().

Signed-off-by: default avatarYong Zhao <yong.zhao@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7bdc53f9

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

+4 −0
Original line number Diff line number Diff line
@@ -294,10 +294,14 @@ struct amdgpu_buffer_funcs { 


/* provided by hw blocks that can write ptes, e.g., sdma */

struct amdgpu_vm_pte_funcs {

	/* number of dw to reserve per operation */

	unsigned	copy_pte_num_dw;



	/* copy pte entries from GART */

	void (*copy_pte)(struct amdgpu_ib *ib,

			 uint64_t pe, uint64_t src,

			 unsigned count);



	/* write pte one entry at a time with addr mapping */

	void (*write_pte)(struct amdgpu_ib *ib, uint64_t pe,

			  uint64_t value, unsigned count,

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

+1 −1
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev, 


	if (pages_addr) {

		/* copy commands needed */

		ndw += ncmds * 7;

		ndw += ncmds * adev->vm_manager.vm_pte_funcs->copy_pte_num_dw;



		/* and also PTEs */

		ndw += nptes * 2;

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

+2 −0
Original line number Diff line number Diff line
@@ -1387,7 +1387,9 @@ static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev) 
}



static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {

	.copy_pte_num_dw = 7,

	.copy_pte = cik_sdma_vm_copy_pte,



	.write_pte = cik_sdma_vm_write_pte,



	.set_max_nums_pte_pde = 0x1fffff >> 3,

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

+2 −0
Original line number Diff line number Diff line
@@ -1324,7 +1324,9 @@ static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev) 
}



static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {

	.copy_pte_num_dw = 7,

	.copy_pte = sdma_v2_4_vm_copy_pte,



	.write_pte = sdma_v2_4_vm_write_pte,



	.set_max_nums_pte_pde = 0x1fffff >> 3,

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

+2 −0
Original line number Diff line number Diff line
@@ -1748,7 +1748,9 @@ static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev) 
}



static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {

	.copy_pte_num_dw = 7,

	.copy_pte = sdma_v3_0_vm_copy_pte,



	.write_pte = sdma_v3_0_vm_write_pte,



	/* not 0x3fffff due to HW limitation */

CRA Git | Maintained and supported by SUSTech CRA and CCSE