diff options
author | Christian König <deathsimple@vodafone.de> | 2012-05-02 09:11:17 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 04:16:21 -0400 |
commit | bfb9a07785fea0c41dff1a38890bc9b4679a9430 (patch) | |
tree | 991719c90b88b41f95450415af2322ccf1e52156 | |
parent | adea5c27694d2f6a783abb250b8e6def250928ba (diff) |
drm/radeon: don't keep list of created fences.
It's never used and so practically superfluous.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_fence.c | 7 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index d73bba8f4332..794182a1324b 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -257,7 +257,6 @@ struct radeon_fence_driver { | |||
257 | uint32_t last_seq; | 257 | uint32_t last_seq; |
258 | unsigned long last_activity; | 258 | unsigned long last_activity; |
259 | wait_queue_head_t queue; | 259 | wait_queue_head_t queue; |
260 | struct list_head created; | ||
261 | struct list_head emitted; | 260 | struct list_head emitted; |
262 | struct list_head signaled; | 261 | struct list_head signaled; |
263 | bool initialized; | 262 | bool initialized; |
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); |