diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2012-05-09 15:35:00 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-09 17:22:49 +0100 |
| commit | 68470ae7e67fe15b9ab01e1c1c709e6e2485a8e5 (patch) | |
| tree | e403d728a22c66484cb37e8e6e4d29f12e54a241 /drivers/gpu/drm/radeon/radeon_ring.c | |
| parent | 7c0d409db56dab0fb211d7710403456c7b4b794b (diff) | |
drm/radeon: move the semaphore from the fence into the ib
It never really belonged there in the first place.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_ring.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index b3d6942a2be..af8e1ee1dc0 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -93,6 +93,7 @@ int radeon_ib_get(struct radeon_device *rdev, int ring, (*ib)->gpu_addr = radeon_sa_bo_gpu_addr((*ib)->sa_bo); (*ib)->vm_id = 0; (*ib)->is_const_ib = false; + (*ib)->semaphore = NULL; return 0; } @@ -105,6 +106,7 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib) if (tmp == NULL) { return; } + radeon_semaphore_free(rdev, tmp->semaphore, tmp->fence); radeon_sa_bo_free(rdev, &tmp->sa_bo, tmp->fence); radeon_fence_unref(&tmp->fence); kfree(tmp); |