]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "drm/amdgpu: fix incorrect vm flags to map bo"
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 25 Aug 2025 17:40:22 +0000 (13:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Sep 2025 12:41:44 +0000 (14:41 +0200)
commit ac4ed2da4c1305a1a002415058aa7deaf49ffe3e upstream.

This reverts commit b08425fa77ad2f305fe57a33dceb456be03b653f.

Revert this to align with 6.17 because the fixes tag
was wrong on this commit.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit be33e8a239aac204d7e9e673c4220ef244eb1ba3)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c

index 2df9e81e2b490e651c01d8693d3110711e8aff1f..08047bc4d58860af370868a867b0cdaf5d5f5b8e 100644 (file)
@@ -94,8 +94,8 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
        }
 
        r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size,
-                            AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |
-                            AMDGPU_VM_PAGE_EXECUTABLE);
+                            AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |
+                            AMDGPU_PTE_EXECUTABLE);
 
        if (r) {
                DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);