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, 19 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index e2dfae4b40e6..8ad5c6475d55 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1414,11 +1414,18 @@ static int r300_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;
 }
 
@@ -1443,11 +1450,14 @@ int r300_resume(struct radeon_device *rdev)
         r300_clock_startup(rdev);
         /* Initialize surface registers */
         radeon_surface_init(rdev);
+
+        rdev->accel_working = true;
         return r300_startup(rdev);
 }
 
 int r300_suspend(struct radeon_device *rdev)
 {
+        radeon_ib_pool_suspend(rdev);
         r100_cp_disable(rdev);
         radeon_wb_disable(rdev);
         r100_irq_disable(rdev);
@@ -1548,7 +1558,14 @@ int r300_init(struct radeon_device *rdev)
                         return r;
         }
         r300_set_reg_safe(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 = r300_startup(rdev);
         if (r) {
                 /* Somethings want wront with the accel init stop accel */