drm/radeon/kms: Rework radeon object handling

The locking & protection of radeon object was somewhat messy.
This patch completely rework it to now use ttm reserve as a
protection for the radeon object structure member. It also
shrink down the various radeon object structure by removing
field which were redondant with the ttm information. Last it
converts few simple functions to inline which should with
performances.

airlied: rebase on top of r600 and other changes.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/gpu/drm/radeon/r600_blit_kms.c b/drivers/gpu/drm/radeon/r600_blit_kms.c
index c20909c34e8..9aecafb51b6 100644
--- a/drivers/gpu/drm/radeon/r600_blit_kms.c
+++ b/drivers/gpu/drm/radeon/r600_blit_kms.c
@@ -473,9 +473,8 @@ int r600_blit_init(struct radeon_device *rdev)
         obj_size += r6xx_ps_size * 4;
         obj_size = ALIGN(obj_size, 256);
 
-        r = radeon_object_create(rdev, NULL, obj_size,
-                                 true, RADEON_GEM_DOMAIN_VRAM,
-                                 false, &rdev->r600_blit.shader_obj);
+        r = radeon_bo_create(rdev, NULL, obj_size, true, RADEON_GEM_DOMAIN_VRAM,
+                                &rdev->r600_blit.shader_obj);
         if (r) {
                 DRM_ERROR("r600 failed to allocate shader\n");
                 return r;
@@ -485,12 +484,14 @@ int r600_blit_init(struct radeon_device *rdev)
                   obj_size,
                   rdev->r600_blit.vs_offset, rdev->r600_blit.ps_offset);
 
-        r = radeon_object_kmap(rdev->r600_blit.shader_obj, &ptr);
+        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+        if (unlikely(r != 0))
+                return r;
+        r = radeon_bo_kmap(rdev->r600_blit.shader_obj, &ptr);
         if (r) {
                 DRM_ERROR("failed to map blit object %d\n", r);
                 return r;
         }
-
         if (rdev->family >= CHIP_RV770)
                 memcpy_toio(ptr + rdev->r600_blit.state_offset,
                             r7xx_default_state, rdev->r600_blit.state_len * 4);
@@ -500,19 +501,26 @@ int r600_blit_init(struct radeon_device *rdev)
         if (num_packet2s)
                 memcpy_toio(ptr + rdev->r600_blit.state_offset + (rdev->r600_blit.state_len * 4),
                             packet2s, num_packet2s * 4);
-
-
         memcpy(ptr + rdev->r600_blit.vs_offset, r6xx_vs, r6xx_vs_size * 4);
         memcpy(ptr + rdev->r600_blit.ps_offset, r6xx_ps, r6xx_ps_size * 4);
-
-        radeon_object_kunmap(rdev->r600_blit.shader_obj);
+        radeon_bo_kunmap(rdev->r600_blit.shader_obj);
+        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
         return 0;
 }
 
 void r600_blit_fini(struct radeon_device *rdev)
 {
-        radeon_object_unpin(rdev->r600_blit.shader_obj);
-        radeon_object_unref(&rdev->r600_blit.shader_obj);
+        int r;
+
+        r = radeon_bo_reserve(rdev->r600_blit.shader_obj, false);
+        if (unlikely(r != 0)) {
+                dev_err(rdev->dev, "(%d) can't finish r600 blit\n", r);
+                goto out_unref;
+        }
+        radeon_bo_unpin(rdev->r600_blit.shader_obj);
+        radeon_bo_unreserve(rdev->r600_blit.shader_obj);
+out_unref:
+        radeon_bo_unref(&rdev->r600_blit.shader_obj);
 }
 
 int r600_vb_ib_get(struct radeon_device *rdev)