diff options
| author |   James Morris <james.morris@microsoft.com> | 2018-04-24 03:57:26 +1000 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-04-24 03:57:26 +1000 |
| commit | b393a707c84bb56a7800c93849fd8b492f76ba42 (patch) | |
| tree | 0c752bbf4d28f47d29042df8fa0c7826c51c50fd /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | security: remove security_settime (diff) | |
| parent | Linux 4.17-rc2 (diff) | |
| download | wireguard-linux-b393a707c84bb56a7800c93849fd8b492f76ba42.tar.xz wireguard-linux-b393a707c84bb56a7800c93849fd8b492f76ba42.zip | |
Merge tag 'v4.17-rc2' into next-general
Sync to Linux 4.17-rc2 for developers.
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 561d3312af32..d5f526f38e50 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -360,6 +360,9 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) amdgpu_debugfs_ring_fini(ring); + dma_fence_put(ring->vmid_wait); + ring->vmid_wait = NULL; + ring->adev->rings[ring->idx] = NULL; } |