mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
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: Yong Zhao <yong.zhao@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
7bdc53f925
commit
e6d921974a
7 changed files with 15 additions and 1 deletions
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -1714,7 +1714,9 @@ static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
|
|||
}
|
||||
|
||||
static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
|
||||
.copy_pte_num_dw = 7,
|
||||
.copy_pte = sdma_v4_0_vm_copy_pte,
|
||||
|
||||
.write_pte = sdma_v4_0_vm_write_pte,
|
||||
|
||||
.set_max_nums_pte_pde = 0x400000 >> 3,
|
||||
|
|
|
@ -887,7 +887,9 @@ static void si_dma_set_buffer_funcs(struct amdgpu_device *adev)
|
|||
}
|
||||
|
||||
static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
|
||||
.copy_pte_num_dw = 5,
|
||||
.copy_pte = si_dma_vm_copy_pte,
|
||||
|
||||
.write_pte = si_dma_vm_write_pte,
|
||||
|
||||
.set_max_nums_pte_pde = 0xffff8 >> 3,
|
||||
|
|
Loading…
Reference in a new issue