drm/radeon: introduce a sub allocator and convert ib pool to it v4

Somewhat specializaed sub-allocator designed to perform sub-allocation
for command buffer not only for current cs ioctl but for future command
submission ioctl as well. Patch also convert current ib pool to use
the sub allocator. Idea is that ib poll buffer can be share with other
command buffer submission not having 64K granularity.

v2 Harmonize pool handling and add suspend/resume callback to pin/unpin
sa bo (tested on rv280, rv370, r420, rv515, rv610, rv710, redwood, cayman,
rs480, rs690, rs880)
v3 Simplify allocator
v4 Fix radeon_ib_get error path to properly free fence

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

1 files changed, 20 insertions, 21 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index d7fd5aa47053..657040b15b06 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3752,28 +3752,10 @@ int r100_ib_test(struct radeon_device *rdev)
 
 void r100_ib_fini(struct radeon_device *rdev)
 {
+        radeon_ib_pool_suspend(rdev);
         radeon_ib_pool_fini(rdev);
 }
 
-int r100_ib_init(struct radeon_device *rdev)
-{
-        int r;
-
-        r = radeon_ib_pool_init(rdev);
-        if (r) {
-                dev_err(rdev->dev, "failed initializing IB pool (%d).\n", r);
-                r100_ib_fini(rdev);
-                return r;
-        }
-        r = r100_ib_test(rdev);
-        if (r) {
-                dev_err(rdev->dev, "failed testing IB (%d).\n", r);
-                r100_ib_fini(rdev);
-                return r;
-        }
-        return 0;
-}
-
 void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save)
 {
         /* Shutdown CP we shouldn't need to do that but better be safe than
@@ -3932,11 +3914,18 @@ static int r100_startup(struct radeon_device *rdev)
                 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
                 return r;
         }
-        r = r100_ib_init(rdev);
+
+        r = radeon_ib_pool_start(rdev);
+        if (r)
+                return r;
+
+        r = r100_ib_test(rdev);
         if (r) {
-                dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
+                dev_err(rdev->dev, "failed testing IB (%d).\n", r);
+                rdev->accel_working = false;
                 return r;
         }
+
         return 0;
 }
 
@@ -3959,11 +3948,14 @@ int r100_resume(struct radeon_device *rdev)
         r100_clock_startup(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+
+        rdev->accel_working = true;
         return r100_startup(rdev);
 }
 
 int r100_suspend(struct radeon_device *rdev)
 {
+        radeon_ib_pool_suspend(rdev);
         r100_cp_disable(rdev);
         radeon_wb_disable(rdev);
         r100_irq_disable(rdev);
@@ -4082,7 +4074,14 @@ int r100_init(struct radeon_device *rdev)
                         return r;
         }
         r100_set_safe_registers(rdev);
+
+        r = radeon_ib_pool_init(rdev);
         rdev->accel_working = true;
+        if (r) {
+                dev_err(rdev->dev, "IB initialization failed (%d).\n", r);
+                rdev->accel_working = false;
+        }
+
         r = r100_startup(rdev);
         if (r) {
                 /* Somethings want wront with the accel init stop accel */