aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_fence.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fence.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 2d1384368a4c..aadd73ac9cc2 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -139,8 +139,6 @@ int radeon_fence_create(struct radeon_device *rdev,
139 struct radeon_fence **fence, 139 struct radeon_fence **fence,
140 int ring) 140 int ring)
141{ 141{
142 unsigned long irq_flags;
143
144 *fence = kmalloc(sizeof(struct radeon_fence), GFP_KERNEL); 142 *fence = kmalloc(sizeof(struct radeon_fence), GFP_KERNEL);
145 if ((*fence) == NULL) { 143 if ((*fence) == NULL) {
146 return -ENOMEM; 144 return -ENOMEM;
@@ -153,10 +151,6 @@ int radeon_fence_create(struct radeon_device *rdev,
153 (*fence)->ring = ring; 151 (*fence)->ring = ring;
154 (*fence)->semaphore = NULL; 152 (*fence)->semaphore = NULL;
155 INIT_LIST_HEAD(&(*fence)->list); 153 INIT_LIST_HEAD(&(*fence)->list);
156
157 write_lock_irqsave(&rdev->fence_lock, irq_flags);
158 list_add_tail(&(*fence)->list, &rdev->fence_drv[ring].created);
159 write_unlock_irqrestore(&rdev->fence_lock, irq_flags);
160 return 0; 154 return 0;
161} 155}
162 156
@@ -411,7 +405,6 @@ static void radeon_fence_driver_init_ring(struct radeon_device *rdev, int ring)
411 rdev->fence_drv[ring].cpu_addr = NULL; 405 rdev->fence_drv[ring].cpu_addr = NULL;
412 rdev->fence_drv[ring].gpu_addr = 0; 406 rdev->fence_drv[ring].gpu_addr = 0;
413 atomic_set(&rdev->fence_drv[ring].seq, 0); 407 atomic_set(&rdev->fence_drv[ring].seq, 0);
414 INIT_LIST_HEAD(&rdev->fence_drv[ring].created);
415 INIT_LIST_HEAD(&rdev->fence_drv[ring].emitted); 408 INIT_LIST_HEAD(&rdev->fence_drv[ring].emitted);
416 INIT_LIST_HEAD(&rdev->fence_drv[ring].signaled); 409 INIT_LIST_HEAD(&rdev->fence_drv[ring].signaled);
417 init_waitqueue_head(&rdev->fence_drv[ring].queue); 410 init_waitqueue_head(&rdev->fence_drv[ring].queue);