Skip to content

Commit

Permalink
6.9: misc-additions: Remove merged patch "drm/amdgpu: Fix comparison …
Browse files Browse the repository at this point in the history
…in amdgpu_res_cpu_visible"
  • Loading branch information
Tk-Glitch committed May 14, 2024
1 parent 34498b7 commit 1ee2da7
Showing 1 changed file with 0 additions and 39 deletions.
39 changes: 0 additions & 39 deletions linux-tkg-patches/6.9/0012-misc-additions.patch
Original file line number Diff line number Diff line change
Expand Up @@ -251,42 +251,3 @@ index a54663f2e2ab9f..7ffad3eb0a0150 100644
case IP_VERSION(11, 0, 7):
case IP_VERSION(11, 0, 11):
case IP_VERSION(11, 0, 12):

From patchwork Wed May 8 13:19:16 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: drm/amdgpu: Fix comparison in amdgpu_res_cpu_visible
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
X-Patchwork-Id: 593130
Message-Id: <[email protected]>
To: Alex Deucher <[email protected]>,
=?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Cc: [email protected]
Date: Wed, 8 May 2024 15:19:16 +0200

From: Michel Dänzer <[email protected]>

It incorrectly claimed a resource isn't CPU visible if it's located at
the very end of CPU visible VRAM.

Fixes: a6ff969fe9 ("drm/amdgpu: fix visible VRAM handling during faults")
Reported-and-Tested-by: Jeremy Day <[email protected]>
Signed-off-by: Michel Dänzer <[email protected]>
---
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 109fe557a02b..29c197c00018 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -427,7 +427,7 @@ bool amdgpu_res_cpu_visible(struct amdgpu_device *adev,

amdgpu_res_first(res, 0, res->size, &cursor);
while (cursor.remaining) {
- if ((cursor.start + cursor.size) >= adev->gmc.visible_vram_size)
+ if ((cursor.start + cursor.size) > adev->gmc.visible_vram_size)
return false;
amdgpu_res_next(&cursor, cursor.size);
}

0 comments on commit 1ee2da7

Please sign in to comment.