From 73aba31a00b34c254be575b524da568e115d985d Mon Sep 17 00:00:00 2001
From: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Date: Thu, 17 Apr 2025 21:04:58 +0200
Subject: [PATCH] accel/rocket: move to new drm_sched_init API
drm_sched_init was changed to use a struct for the args instead of
being passed the args directly since the rocket code was written. To get
it to build, move to the new way of calling that function.
Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
---
drivers/accel/rocket/rocket_job.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/accel/rocket/rocket_job.c b/drivers/accel/rocket/rocket_job.c
index 25b31f28e932a..35172223e063c 100644
--- a/drivers/accel/rocket/rocket_job.c
+++ b/drivers/accel/rocket/rocket_job.c
@@ -529,6 +529,15 @@ static irqreturn_t rocket_job_irq_handler(int irq, void *data)
int rocket_job_init(struct rocket_core *core)
{
+ struct drm_sched_init_args sched_args = {
+ .ops = &rocket_sched_ops,
+ .num_rqs = DRM_SCHED_PRIORITY_COUNT,
+ .credit_limit = 1,
+ .hang_limit = 0,
+ .timeout = msecs_to_jiffies(JOB_TIMEOUT_MS),
+ .name = "rocket",
+ .dev = core->dev,
+ };
int ret;
INIT_WORK(&core->reset.work, rocket_reset_work);
@@ -552,15 +561,12 @@ int rocket_job_init(struct rocket_core *core)
if (!core->reset.wq)
return -ENOMEM;
+ sched_args.timeout_wq = core->reset.wq;
+
core->fence_context = dma_fence_context_alloc(1);
- ret = drm_sched_init(&core->sched,
- &rocket_sched_ops, NULL,
- DRM_SCHED_PRIORITY_COUNT,
- 1, 0,
- msecs_to_jiffies(JOB_TIMEOUT_MS),
- core->reset.wq,
- NULL, "rocket", core->dev);
+
+ ret = drm_sched_init(&core->sched, &sched_args);
if (ret) {
dev_err(core->dev, "Failed to create scheduler: %d.", ret);
goto err_sched;
--
GitLab