aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch129
1 files changed, 129 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch
new file mode 100644
index 00000000..1dc3858b
--- /dev/null
+++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/1083-drm-amdgpu-Add-copy_pte_num_dw-member-in-amdgpu_vm_p.patch
@@ -0,0 +1,129 @@
+From 1b8cfeae80fbe1e6ba957deea6a7d1dcb77fe9fa 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 1083/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/cik_sdma.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 ++
+ 7 files changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+index fa3935b8..cde0a0a 100644
+--- 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 7f4f721..9217edd 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+@@ -1550,7 +1550,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/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+index 11beef7..ddffa06 100644
+--- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
++++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
+@@ -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_pte_pde = cik_sdma_vm_set_pte_pde,
+ };
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+index 9928473..5edd39e 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_pte_pde = sdma_v2_4_vm_set_pte_pde,
+ };
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+index f5db1fa..07ee682 100644
+--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+@@ -1731,7 +1731,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,
+ .set_pte_pde = sdma_v3_0_vm_set_pte_pde,
+ };
+diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+index 4e5fed7..0048050 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_pte_pde = sdma_v4_0_vm_set_pte_pde,
+ };
+diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
+index 112969f..7f28c0a 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_pte_pde = si_dma_vm_set_pte_pde,
+ };
+--
+2.7.4
+