summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-05-30 15:54:15 +1000
committerDave Airlie <airlied@redhat.com>2017-05-30 15:54:15 +1000
commit2a1720376adda5ecf8e636fbfb05339c7dad1c55 (patch)
treecdb76abac82306516aa556d9e9ddb15571f07517 /drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
parenta82256bc026722800d1fdeca5521f1ba487bc2ef (diff)
parent5ed02dbb497422bf225783f46e6eadd237d23d6b (diff)
downloadtalos-op-linux-2a1720376adda5ecf8e636fbfb05339c7dad1c55.tar.gz
talos-op-linux-2a1720376adda5ecf8e636fbfb05339c7dad1c55.zip
Backmerge tag 'v4.12-rc3' into drm-next
Linux 4.12-rc3 Daniel has requested this for some drm-intel-next work.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
index d97e28b4bdc4..e1d951ece433 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
@@ -204,6 +204,7 @@ int amdgpu_vm_grab_id(struct amdgpu_vm *vm, struct amdgpu_ring *ring,
int amdgpu_vm_flush(struct amdgpu_ring *ring, struct amdgpu_job *job);
void amdgpu_vm_reset_id(struct amdgpu_device *adev, unsigned vmhub,
unsigned vmid);
+void amdgpu_vm_reset_all_ids(struct amdgpu_device *adev);
int amdgpu_vm_update_directories(struct amdgpu_device *adev,
struct amdgpu_vm *vm);
int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
OpenPOWER on IntegriCloud