Revert "drm/amdgpu: fix incorrect vm flags to map bo"

alexdeucher · gregkh · commit 07b367f7ebb1 · 2025-09-04T15:31:53.000+02:00
commit ac4ed2d 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>
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
@@ -88,8 +88,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);

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ int amdgpu_map_static_csa(struct amdgpu_device adev, struct amdgpu_vm vm,`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size,`
`91`		`- AMDGPU_VM_PAGE_READABLE \| AMDGPU_VM_PAGE_WRITEABLE \|`
`92`		`- AMDGPU_VM_PAGE_EXECUTABLE);`
	`91`	`+ AMDGPU_PTE_READABLE \| AMDGPU_PTE_WRITEABLE \|`
	`92`	`+ AMDGPU_PTE_EXECUTABLE);`
`93`	`93`
`94`	`94`	`if (r) {`
`95`	`95`	`DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);`