diff options
author | Maxime Ripard <mripard@kernel.org> | 2025-08-20 16:08:49 +0200 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2025-08-20 16:08:49 +0200 |
commit | 1a2cf179e2973f6801c67397ecc987391b084bcf (patch) | |
tree | 9212405e147d9750d493f9f785afdb2769a263c7 /drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | |
parent | 3271faf42d135bcf569c3ff6af55c21858eec212 (diff) | |
parent | c17b750b3ad9f45f2b6f7e6f7f4679844244f0b9 (diff) |
Merge drm/drm-fixes into drm-misc-fixes
Update drm-misc-fixes to -rc2.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c index 02138aa55793..dfb6cfd83760 100644 --- 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_PTE_READABLE | AMDGPU_PTE_WRITEABLE | - AMDGPU_PTE_EXECUTABLE); + AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE | + AMDGPU_VM_PAGE_EXECUTABLE); if (r) { DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r); |