Merge remote branch 'korg/drm-radeon-testing' into drm-next-stage

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_ring.c

diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 38fa144..e50513a 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -130,6 +130,8 @@ void radeon_ib_free(struct radeon_device *rdev, struct radeon_ib **ib)
        if (tmp == NULL) {
                return;
        }
+       if (!tmp->fence->emited)
+               radeon_fence_unref(&tmp->fence);
        mutex_lock(&rdev->ib_pool.mutex);
        tmp->free = true;
        mutex_unlock(&rdev->ib_pool.mutex);
@@ -222,6 +224,7 @@ void radeon_ib_pool_fini(struct radeon_device *rdev)
        }
        mutex_lock(&rdev->ib_pool.mutex);
        radeon_ib_bogus_cleanup(rdev);
+
        if (rdev->ib_pool.robj) {
                r = radeon_bo_reserve(rdev->ib_pool.robj, false);
                if (likely(r == 0)) {