Fixes for 6.6

[thirdparty/kernel/stable-queue.git] / queue-6.6 / drm-amdgpu-fix-doorbell-regression.patch

diff --git a/queue-6.6/drm-amdgpu-fix-doorbell-regression.patch b/queue-6.6/drm-amdgpu-fix-doorbell-regression.patch
new file mode 100644 (file)
index 0000000..4b67a8c
--- /dev/null
+++ b/queue-6.6/drm-amdgpu-fix-doorbell-regression.patch
@@ -0,0 +1,40 @@
+From c24af57f3a3befc79bc64aa489e160691c50f44d Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 29 Apr 2024 14:29:47 +0200
+Subject: drm/amdgpu: fix doorbell regression
+
+From: Shashank Sharma <shashank.sharma@amd.com>
+
+[ Upstream commit 705d0480e6ae5a73ca3a9c04316d0678e19a46ed ]
+
+This patch adds a missed handling of PL domain doorbell while
+handling VRAM faults.
+
+Cc: Christian Koenig <christian.koenig@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Fixes: a6ff969fe9cb ("drm/amdgpu: fix visible VRAM handling during faults")
+Reviewed-by: Christian Koenig <christian.koenig@amd.com>
+Signed-off-by: Shashank Sharma <shashank.sharma@amd.com>
+Signed-off-by: Arvind Yadav <arvind.yadav@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+index d1687b5725693..b95018b1d2ae6 100644
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -424,7 +424,7 @@ bool amdgpu_res_cpu_visible(struct amdgpu_device *adev,
+               return false;
+ 
+       if (res->mem_type == TTM_PL_SYSTEM || res->mem_type == TTM_PL_TT ||
+-          res->mem_type == AMDGPU_PL_PREEMPT)
++          res->mem_type == AMDGPU_PL_PREEMPT || res->mem_type == AMDGPU_PL_DOORBELL)
+               return true;
+ 
+       if (res->mem_type != TTM_PL_VRAM)
+-- 
+2.43.0
+