diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1868-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1868-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1868-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1868-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch new file mode 100644 index 00000000..0c844158 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1868-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch @@ -0,0 +1,114 @@ +From 12ce4b42b7207d0b25e0b8c48a8532eba124111c Mon Sep 17 00:00:00 2001 +From: Yong Zhao <yong.zhao@amd.com> +Date: Tue, 19 Sep 2017 12:58:15 -0400 +Subject: [PATCH 1868/4131] drm/amdgpu: Add copy_pte_num_dw member in + amdgpu_vm_pte_funcs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use it to replace the hard coded value in amdgpu_vm_bo_update_mapping(). + +Change-Id: Id17f49af2ac2aaa2d4cad35155d41ec5d830a637 +Signed-off-by: Yong Zhao <yong.zhao@amd.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 ++ + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 ++ + 6 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 79150dc..8566bf2 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -299,10 +299,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, +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +index c957155..c542eef 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +@@ -1606,7 +1606,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; +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +index bafa29c..4c9f8d8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +@@ -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, +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +index a8a9bac..10a0ceb 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +@@ -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 */ +diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +index 2d05e43..6fa67a8 100644 +--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +@@ -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, +diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c +index adb6ae7..3fa2fbf 100644 +--- a/drivers/gpu/drm/amd/amdgpu/si_dma.c ++++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c +@@ -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, +-- +2.7.4 + |