aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2016-07-19 08:44:39 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-07-29 14:37:01 -0400
commit7c23ace2db5217cfbe066a21d98b761321c67efd (patch)
tree0c21652adec167b22486c032a7a748bf24face3d
parent92c023c47f3af706b7ad1b6b66efddd13a8bf4bd (diff)
drm/amdgpu: remove fence_lock
Was never used as far as I can see. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Chunming Zhou <david1.zhou@amd.com> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu.h1
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index dd710a3467c2..30124f4916d2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -772,7 +772,6 @@ struct amdgpu_ring {
772 struct amdgpu_fence_driver fence_drv; 772 struct amdgpu_fence_driver fence_drv;
773 struct amd_gpu_scheduler sched; 773 struct amd_gpu_scheduler sched;
774 774
775 spinlock_t fence_lock;
776 struct amdgpu_bo *ring_obj; 775 struct amdgpu_bo *ring_obj;
777 volatile uint32_t *ring; 776 volatile uint32_t *ring;
778 unsigned rptr_offs; 777 unsigned rptr_offs;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 3b885e3e9b56..f305f6309e8e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -198,7 +198,6 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
198 ring->cond_exe_gpu_addr = adev->wb.gpu_addr + (ring->cond_exe_offs * 4); 198 ring->cond_exe_gpu_addr = adev->wb.gpu_addr + (ring->cond_exe_offs * 4);
199 ring->cond_exe_cpu_addr = &adev->wb.wb[ring->cond_exe_offs]; 199 ring->cond_exe_cpu_addr = &adev->wb.wb[ring->cond_exe_offs];
200 200
201 spin_lock_init(&ring->fence_lock);
202 r = amdgpu_fence_driver_start_ring(ring, irq_src, irq_type); 201 r = amdgpu_fence_driver_start_ring(ring, irq_src, irq_type);
203 if (r) { 202 if (r) {
204 dev_err(adev->dev, "failed initializing fences (%d).\n", r); 203 dev_err(adev->dev, "failed initializing fences (%d).\n", r);