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:
Yong Zhao 2017-09-19 12:58:15 -04:00 committed by Alex Deucher
parent 7bdc53f925
commit e6d921974a
7 changed files with 15 additions and 1 deletions

View File

@ -294,10 +294,14 @@ struct amdgpu_buffer_funcs {
/* provided by hw blocks that can write ptes, e.g., sdma */ /* provided by hw blocks that can write ptes, e.g., sdma */
struct amdgpu_vm_pte_funcs { struct amdgpu_vm_pte_funcs {
/* number of dw to reserve per operation */
unsigned copy_pte_num_dw;
/* copy pte entries from GART */ /* copy pte entries from GART */
void (*copy_pte)(struct amdgpu_ib *ib, void (*copy_pte)(struct amdgpu_ib *ib,
uint64_t pe, uint64_t src, uint64_t pe, uint64_t src,
unsigned count); unsigned count);
/* write pte one entry at a time with addr mapping */ /* write pte one entry at a time with addr mapping */
void (*write_pte)(struct amdgpu_ib *ib, uint64_t pe, void (*write_pte)(struct amdgpu_ib *ib, uint64_t pe,
uint64_t value, unsigned count, uint64_t value, unsigned count,

View File

@ -1597,7 +1597,7 @@ static int amdgpu_vm_bo_update_mapping(struct amdgpu_device *adev,
if (pages_addr) { if (pages_addr) {
/* copy commands needed */ /* copy commands needed */
ndw += ncmds * 7; ndw += ncmds * adev->vm_manager.vm_pte_funcs->copy_pte_num_dw;
/* and also PTEs */ /* and also PTEs */
ndw += nptes * 2; ndw += nptes * 2;

View File

@ -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 = { static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
.copy_pte_num_dw = 7,
.copy_pte = cik_sdma_vm_copy_pte, .copy_pte = cik_sdma_vm_copy_pte,
.write_pte = cik_sdma_vm_write_pte, .write_pte = cik_sdma_vm_write_pte,
.set_max_nums_pte_pde = 0x1fffff >> 3, .set_max_nums_pte_pde = 0x1fffff >> 3,

View File

@ -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 = { 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, .copy_pte = sdma_v2_4_vm_copy_pte,
.write_pte = sdma_v2_4_vm_write_pte, .write_pte = sdma_v2_4_vm_write_pte,
.set_max_nums_pte_pde = 0x1fffff >> 3, .set_max_nums_pte_pde = 0x1fffff >> 3,

View File

@ -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 = { 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, .copy_pte = sdma_v3_0_vm_copy_pte,
.write_pte = sdma_v3_0_vm_write_pte, .write_pte = sdma_v3_0_vm_write_pte,
/* not 0x3fffff due to HW limitation */ /* not 0x3fffff due to HW limitation */

View File

@ -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 = { 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, .copy_pte = sdma_v4_0_vm_copy_pte,
.write_pte = sdma_v4_0_vm_write_pte, .write_pte = sdma_v4_0_vm_write_pte,
.set_max_nums_pte_pde = 0x400000 >> 3, .set_max_nums_pte_pde = 0x400000 >> 3,

View File

@ -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 = { static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
.copy_pte_num_dw = 5,
.copy_pte = si_dma_vm_copy_pte, .copy_pte = si_dma_vm_copy_pte,
.write_pte = si_dma_vm_write_pte, .write_pte = si_dma_vm_write_pte,
.set_max_nums_pte_pde = 0xffff8 >> 3, .set_max_nums_pte_pde = 0xffff8 >> 3,