diff options
| author | Dave Airlie <[email protected]> | 2019-08-27 07:22:15 +0000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2019-08-27 07:22:15 +0000 |
| commit | 578d2342ec702e5fb8a77983fabb3754ae3e9660 (patch) | |
| tree | 399b2fa095abc00356c3acddb68cffe04d47e762 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | |
| parent | Merge tag 'drm-misc-next-2019-08-23' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | drm/amd/display: 3.2.48 (diff) | |
| download | kernel-578d2342ec702e5fb8a77983fabb3754ae3e9660.tar.gz kernel-578d2342ec702e5fb8a77983fabb3754ae3e9660.zip | |
Merge tag 'drm-next-5.4-2019-08-23' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.4-2019-08-23:
amdgpu:
- Enable power features on Navi12
- Enable power features on Arcturus
- RAS updates
- Initial Renoir APU support
- Enable power featyres on Renoir
- DC gamma fixes
- DCN2 fixes
- GPU reset support for Picasso
- Misc cleanups and fixes
scheduler:
- Possible race fix
Signed-off-by: Dave Airlie <[email protected]>
From: Alex Deucher <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index b7665b31a2ca..e2fb141ff2e5 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -2863,6 +2863,13 @@ int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm, uns WARN_ONCE((vm->use_cpu_for_update && !amdgpu_gmc_vram_full_visible(&adev->gmc)), "CPU update of VM recommended only for large BAR system\n"); + if (vm->use_cpu_for_update) + vm->update_funcs = &amdgpu_vm_cpu_funcs; + else + vm->update_funcs = &amdgpu_vm_sdma_funcs; + dma_fence_put(vm->last_update); + vm->last_update = NULL; + if (vm->pasid) { unsigned long flags; |