aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch
new file mode 100644
index 00000000..87b71716
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0956-drm-amd-amdgpu-Support-VM-environments-in-amdgpu_ttm.patch
@@ -0,0 +1,38 @@
+From 93e7411a23655e2de4a126d2d5e347881053ba98 Mon Sep 17 00:00:00 2001
+From: Tom St Denis <tom.stdenis@amd.com>
+Date: Thu, 14 Sep 2017 08:57:26 -0400
+Subject: [PATCH 0956/4131] drm/amd/amdgpu: Support VM environments in
+ amdgpu_ttm_access_memory()
+
+Signed-off-by: Tom St Denis <tom.stdenis@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+index 5427cac..a95bbc2 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -1244,14 +1244,14 @@ static int amdgpu_ttm_access_memory(struct ttm_buffer_object *bo,
+ }
+
+ spin_lock_irqsave(&adev->mmio_idx_lock, flags);
+- WREG32(mmMM_INDEX, ((uint32_t)aligned_pos) | 0x80000000);
+- WREG32(mmMM_INDEX_HI, aligned_pos >> 31);
++ WREG32_NO_KIQ(mmMM_INDEX, ((uint32_t)aligned_pos) | 0x80000000);
++ WREG32_NO_KIQ(mmMM_INDEX_HI, aligned_pos >> 31);
+ if (!write || mask != 0xffffffff)
+- value = RREG32(mmMM_DATA);
++ value = RREG32_NO_KIQ(mmMM_DATA);
+ if (write) {
+ value &= ~mask;
+ value |= (*(uint32_t *)buf << shift) & mask;
+- WREG32(mmMM_DATA, value);
++ WREG32_NO_KIQ(mmMM_DATA, value);
+ }
+ spin_unlock_irqrestore(&adev->mmio_idx_lock, flags);
+ if (!write) {
+--
+2.7.4
+