6.8-stable patches

[thirdparty/kernel/stable-queue.git] / queue-6.8 / drm-amdgpu-remove-invalid-resource-start-check-v2.patch

diff --git a/queue-6.8/drm-amdgpu-remove-invalid-resource-start-check-v2.patch b/queue-6.8/drm-amdgpu-remove-invalid-resource-start-check-v2.patch
new file mode 100644 (file)
index 0000000..efce8b6
--- /dev/null
+++ b/queue-6.8/drm-amdgpu-remove-invalid-resource-start-check-v2.patch
@@ -0,0 +1,51 @@
+From ca7c4507ba87e9fc22e0ecfa819c3664b3e8287b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20K=C3=B6nig?= <christian.koenig@amd.com>
+Date: Fri, 15 Mar 2024 13:07:53 +0100
+Subject: drm/amdgpu: remove invalid resource->start check v2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Christian König <christian.koenig@amd.com>
+
+commit ca7c4507ba87e9fc22e0ecfa819c3664b3e8287b upstream.
+
+The majority of those where removed in the commit aed01a68047b
+("drm/amdgpu: Remove TTM resource->start visible VRAM condition v2")
+
+But this one was missed because it's working on the resource and not the
+BO. Since we also no longer use a fake start address for visible BOs
+this will now trigger invalid mapping errors.
+
+v2: also remove the unused variable
+
+Signed-off-by: Christian König <christian.koenig@amd.com>
+Fixes: aed01a68047b ("drm/amdgpu: Remove TTM resource->start visible VRAM condition v2")
+CC: stable@vger.kernel.org
+Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+@@ -562,7 +562,6 @@ static int amdgpu_ttm_io_mem_reserve(str
+                                    struct ttm_resource *mem)
+ {
+       struct amdgpu_device *adev = amdgpu_ttm_adev(bdev);
+-      size_t bus_size = (size_t)mem->size;
+ 
+       switch (mem->mem_type) {
+       case TTM_PL_SYSTEM:
+@@ -573,9 +572,6 @@ static int amdgpu_ttm_io_mem_reserve(str
+               break;
+       case TTM_PL_VRAM:
+               mem->bus.offset = mem->start << PAGE_SHIFT;
+-              /* check if it's visible */
+-              if ((mem->bus.offset + bus_size) > adev->gmc.visible_vram_size)
+-                      return -EINVAL;
+ 
+               if (adev->mman.aper_base_kaddr &&
+                   mem->placement & TTM_PL_FLAG_CONTIGUOUS)