diff options
| author | Mukul Joshi <mukul.joshi@amd.com> | 2025-09-10 14:36:09 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2026-01-05 16:59:56 -0500 |
| commit | 5a8c343d2e87a4d623934e73a0c3a200e2a47a42 (patch) | |
| tree | 9005a9b8e4d76b39e51092f5ca5bdb8e46842adc /drivers/gpu | |
| parent | fab4099549a050703b87da012e5ebd75463bd654 (diff) | |
drm/amdgpu: Cleanup gmc_v12_1 after 6.16 merge
After the 6.16 merge, some changes not applicable to GFX 12.1 were
added in the gmc_v12_1_get_vm_pte function. Additionally, add the
case for MTYPE RW for GFX 12.1.
Signed-off-by: Mukul Joshi <mukul.joshi@amd.com>
Reviewed-by: Alex Sierra <alex.sierra@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c b/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c index 3c6b6c6f0cfc..d32e88cace6a 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c @@ -562,28 +562,14 @@ static void gmc_v12_1_get_vm_pte(struct amdgpu_device *adev, default: *flags = AMDGPU_PTE_MTYPE_GFX12(*flags, MTYPE_NC); break; + case AMDGPU_VM_MTYPE_RW: + *flags = AMDGPU_PTE_MTYPE_GFX12(*flags, MTYPE_RW); + break; case AMDGPU_VM_MTYPE_UC: *flags = AMDGPU_PTE_MTYPE_GFX12(*flags, MTYPE_UC); break; } - if (vm_flags & AMDGPU_VM_PAGE_NOALLOC) - *flags |= AMDGPU_PTE_NOALLOC; - else - *flags &= ~AMDGPU_PTE_NOALLOC; - - if (vm_flags & AMDGPU_VM_PAGE_PRT) { - *flags |= AMDGPU_PTE_SNOOPED; - *flags |= AMDGPU_PTE_SYSTEM; - *flags |= AMDGPU_PTE_IS_PTE; - *flags &= ~AMDGPU_PTE_VALID; - } - - if (bo && bo->flags & (AMDGPU_GEM_CREATE_COHERENT | - AMDGPU_GEM_CREATE_EXT_COHERENT | - AMDGPU_GEM_CREATE_UNCACHED)) - *flags = AMDGPU_PTE_MTYPE_NV10(*flags, MTYPE_UC); - if ((*flags & AMDGPU_PTE_VALID) && bo) gmc_v12_1_get_coherence_flags(adev, bo, flags); } |