drm/msm: Add a name field for gem objects

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / msm_ringbuffer.c

diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 6f5295b..6169bd6 100644 (file)
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -45,6 +45,9 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,
                ring->start = 0;
                goto fail;
        }
+
+       msm_gem_object_set_name(ring->bo, "ring%d", id);
+
        ring->end   = ring->start + (MSM_GPU_RINGBUFFER_SZ >> 2);
        ring->next  = ring->start;
        ring->cur   = ring->start;
@@ -73,10 +76,7 @@ void msm_ringbuffer_destroy(struct msm_ringbuffer *ring)
 
        msm_fence_context_free(ring->fctx);
 
-       if (ring->bo) {
-               msm_gem_put_iova(ring->bo, ring->gpu->aspace);
-               msm_gem_put_vaddr(ring->bo);
-               drm_gem_object_put_unlocked(ring->bo);
-       }
+       msm_gem_kernel_put(ring->bo, ring->gpu->aspace, false);
+
        kfree(ring);
 }