diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-06-14 11:14:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-14 11:14:34 +0200 |
| commit | 3559ff9650224a4af6b777a5df786f521f66db5a (patch) | |
| tree | ff1d9ec0e27ab4b452f1d8b12485d21102900597 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | 70e0d117f2502f19517be03a64b3c513f31b3cdb (diff) | |
| parent | db06d759d6cf903aeda8c107fd3abd366dd80200 (diff) | |
| download | linux-3559ff9650224a4af6b777a5df786f521f66db5a.tar.gz linux-3559ff9650224a4af6b777a5df786f521f66db5a.tar.bz2 linux-3559ff9650224a4af6b777a5df786f521f66db5a.zip | |
Merge branch 'linus' into perf/core, to pick up fixes before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index 3b02272db678..870f9494252c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -343,6 +343,7 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) ring->ring = NULL; ring->ring_obj = NULL; + amdgpu_wb_free(ring->adev, ring->cond_exe_offs); amdgpu_wb_free(ring->adev, ring->fence_offs); amdgpu_wb_free(ring->adev, ring->rptr_offs); amdgpu_wb_free(ring->adev, ring->wptr_offs); |