aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
diff options
context:
space:
mode:
authormonk.liu <monk.liu@amd.com>2015-07-30 06:28:12 -0400
committerAlex Deucher <alexander.deucher@amd.com>2015-08-17 16:50:48 -0400
commit7f06c236b964db3d8d086c5a0087b2eb4de3bf7a (patch)
tree37893ae39ea28e71e1066ce10dca5b9318784e96 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
parente29551556e055f463fb80cfb07e1cb15641e60a3 (diff)
drm/amdgpu: move wait_queue_head from adev to ring (v2)
thus unnecessary wake up could be avoid between rings v2: move wait_queue_head to fence_drv from ring Signed-off-by: monk.liu <monk.liu@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 1e68a561bbfe..7d442c51063e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -342,6 +342,8 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
342 amdgpu_fence_driver_init_ring(ring); 342 amdgpu_fence_driver_init_ring(ring);
343 } 343 }
344 344
345 init_waitqueue_head(&ring->fence_drv.fence_queue);
346
345 r = amdgpu_wb_get(adev, &ring->rptr_offs); 347 r = amdgpu_wb_get(adev, &ring->rptr_offs);
346 if (r) { 348 if (r) {
347 dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r); 349 dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);