1 files changed, 76 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1865-drm-amdgpu-Fix-CIK-references-in-gmc_v8.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1865-drm-amdgpu-Fix-CIK-references-in-gmc_v8.patch
new file mode 100644
index 00000000..919b5337
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/1865-drm-amdgpu-Fix-CIK-references-in-gmc_v8.patch
@@ -0,0 +1,76 @@
+From 0670c924fac46abf766b38b55281139c24e906b0 Mon Sep 17 00:00:00 2001
+From: Kent Russell <kent.russell@amd.com>
+Date: Wed, 1 May 2019 08:22:50 -0400
+Subject: [PATCH 1865/2940] drm/amdgpu: Fix CIK references in gmc_v8
+
+gmc_v8 is for VI, not CIK, so fix those references
+
+Change-Id: Ifa46212fbeadbec7e73ba28d02e97339ffcfb5d1
+Signed-off-by: Kent Russell <kent.russell@amd.com>
+Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
+Signed-off-by: Chaudhary Amit Kumar <Chaudharyamit.Kumar@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+index c188238e6bc1..2f459a434cde 100644
+--- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
++++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+@@ -289,7 +289,7 @@ static int gmc_v8_0_init_microcode(struct amdgpu_device *adev)
+  *
+  * @adev: amdgpu_device pointer
+  *
+- * Load the GDDR MC ucode into the hw (CIK).
++ * Load the GDDR MC ucode into the hw (VI).
+  * Returns 0 on success, error on failure.
+  */
+ static int gmc_v8_0_tonga_mc_load_microcode(struct amdgpu_device *adev)
+@@ -443,7 +443,7 @@ static void gmc_v8_0_vram_gtt_location(struct amdgpu_device *adev,
+  * @adev: amdgpu_device pointer
+  *
+  * Set the location of vram, gart, and AGP in the GPU's
+- * physical address space (CIK).
++ * physical address space (VI).
+  */
+ static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
+ {
+@@ -515,7 +515,7 @@ static void gmc_v8_0_mc_program(struct amdgpu_device *adev)
+  * @adev: amdgpu_device pointer
+  *
+  * Look up the amount of vram, vram width, and decide how to place
+- * vram and gart within the GPU's physical address space (CIK).
++ * vram and gart within the GPU's physical address space (VI).
+  * Returns 0 for success.
+  */
+ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
+@@ -635,7 +635,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)
+  * @adev: amdgpu_device pointer
+  * @vmid: vm instance to flush
+  *
+- * Flush the TLB for the requested page table (CIK).
++ * Flush the TLB for the requested page table (VI).
+  */
+ static void gmc_v8_0_flush_gpu_tlb(struct amdgpu_device *adev,
+ 					uint32_t vmid)
+@@ -805,7 +805,7 @@ static void gmc_v8_0_set_prt(struct amdgpu_device *adev, bool enable)
+  * This sets up the TLBs, programs the page tables for VMID0,
+  * sets up the hw for VMIDs 1-15 which are allocated on
+  * demand, and sets up the global locations for the LDS, GDS,
+- * and GPUVM for FSA64 clients (CIK).
++ * and GPUVM for FSA64 clients (VI).
+  * Returns 0 for success, errors for failure.
+  */
+ static int gmc_v8_0_gart_enable(struct amdgpu_device *adev)
+@@ -953,7 +953,7 @@ static int gmc_v8_0_gart_init(struct amdgpu_device *adev)
+  *
+  * @adev: amdgpu_device pointer
+  *
+- * This disables all VM page table (CIK).
++ * This disables all VM page table (VI).
+  */
+ static void gmc_v8_0_gart_disable(struct amdgpu_device *adev)
+ {
+-- 
+2.17.1
+