drm/panfrost: Rename panfrost_job functions to reflect real role

larunbe · stevenprice-arm · commit 32dd00f17c14 · 2025-10-20T16:05:18.000+01:00
panfrost_job_* prefixed functions in panfrost_job.c deal with both panfrost_job objects and also the more general JM (Job Manager) side of the device itself. This is confusing. Reprefix functions that program the JM to panfrosot_jm_* instead. Reviewed-by: Steven Price <steven.price@arm.com> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Adrián Larumbe <adrian.larumbe@collabora.com> Link: https://lore.kernel.org/r/20251019145225.3621989-12-adrian.larumbe@collabora.com Signed-off-by: Steven Price <steven.price@arm.com>
diff --git a/drivers/gpu/drm/panfrost/panfrost_device.c b/drivers/gpu/drm/panfrost/panfrost_device.c
@@ -259,7 +259,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)
 	if (err)
 		goto out_gpu;
 
-	err = panfrost_job_init(pfdev);
+	err = panfrost_jm_init(pfdev);
 	if (err)
 		goto out_mmu;
 
@@ -269,7 +269,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)
 
 	return 0;
 out_job:
-	panfrost_job_fini(pfdev);
+	panfrost_jm_fini(pfdev);
 out_mmu:
 	panfrost_mmu_fini(pfdev);
 out_gpu:
@@ -290,7 +290,7 @@ int panfrost_device_init(struct panfrost_device *pfdev)
 void panfrost_device_fini(struct panfrost_device *pfdev)
 {
 	panfrost_perfcnt_fini(pfdev);
-	panfrost_job_fini(pfdev);
+	panfrost_jm_fini(pfdev);
 	panfrost_mmu_fini(pfdev);
 	panfrost_gpu_fini(pfdev);
 	panfrost_devfreq_fini(pfdev);
@@ -407,9 +407,9 @@ void panfrost_device_reset(struct panfrost_device *pfdev, bool enable_job_int)
 	panfrost_gpu_power_on(pfdev);
 	panfrost_mmu_reset(pfdev);
 
-	panfrost_job_reset_interrupts(pfdev);
+	panfrost_jm_reset_interrupts(pfdev);
 	if (enable_job_int)
-		panfrost_job_enable_interrupts(pfdev);
+		panfrost_jm_enable_interrupts(pfdev);
 }
 
 static int panfrost_device_runtime_resume(struct device *dev)
@@ -451,11 +451,11 @@ static int panfrost_device_runtime_suspend(struct device *dev)
 {
 	struct panfrost_device *pfdev = dev_get_drvdata(dev);
 
-	if (!panfrost_job_is_idle(pfdev))
+	if (!panfrost_jm_is_idle(pfdev))
 		return -EBUSY;
 
 	panfrost_devfreq_suspend(pfdev);
-	panfrost_job_suspend_irq(pfdev);
+	panfrost_jm_suspend_irq(pfdev);
 	panfrost_mmu_suspend_irq(pfdev);
 	panfrost_gpu_suspend_irq(pfdev);
 	panfrost_gpu_power_off(pfdev);
diff --git a/drivers/gpu/drm/panfrost/panfrost_drv.c b/drivers/gpu/drm/panfrost/panfrost_drv.c
@@ -606,7 +606,7 @@ panfrost_open(struct drm_device *dev, struct drm_file *file)
 		goto err_free;
 	}
 
-	ret = panfrost_job_open(file);
+	ret = panfrost_jm_open(file);
 	if (ret)
 		goto err_job;
 
@@ -625,7 +625,7 @@ panfrost_postclose(struct drm_device *dev, struct drm_file *file)
 	struct panfrost_file_priv *panfrost_priv = file->driver_priv;
 
 	panfrost_perfcnt_close(file);
-	panfrost_job_close(file);
+	panfrost_jm_close(file);
 
 	panfrost_mmu_ctx_put(panfrost_priv->mmu);
 	kfree(panfrost_priv);
diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -430,18 +430,18 @@ static struct dma_fence *panfrost_job_run(struct drm_sched_job *sched_job)
 	return fence;
 }
 
-void panfrost_job_reset_interrupts(struct panfrost_device *pfdev)
+void panfrost_jm_reset_interrupts(struct panfrost_device *pfdev)
 {
 	job_write(pfdev, JOB_INT_CLEAR, ALL_JS_INT_MASK);
 }
 
-void panfrost_job_enable_interrupts(struct panfrost_device *pfdev)
+void panfrost_jm_enable_interrupts(struct panfrost_device *pfdev)
 {
 	clear_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended);
 	job_write(pfdev, JOB_INT_MASK, ALL_JS_INT_MASK);
 }
 
-void panfrost_job_suspend_irq(struct panfrost_device *pfdev)
+void panfrost_jm_suspend_irq(struct panfrost_device *pfdev)
 {
 	set_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended);
 
@@ -503,8 +503,8 @@ static void panfrost_job_handle_err(struct panfrost_device *pfdev,
 	}
 }
 
-static void panfrost_job_handle_done(struct panfrost_device *pfdev,
-				     struct panfrost_job *job)
+static void panfrost_jm_handle_done(struct panfrost_device *pfdev,
+				    struct panfrost_job *job)
 {
 	/* Set ->jc to 0 to avoid re-submitting an already finished job (can
 	 * happen when we receive the DONE interrupt while doing a GPU reset).
@@ -517,7 +517,7 @@ static void panfrost_job_handle_done(struct panfrost_device *pfdev,
 	pm_runtime_put_autosuspend(pfdev->base.dev);
 }
 
-static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)
+static void panfrost_jm_handle_irq(struct panfrost_device *pfdev, u32 status)
 {
 	struct panfrost_job *done[NUM_JOB_SLOTS][2] = {};
 	struct panfrost_job *failed[NUM_JOB_SLOTS] = {};
@@ -592,7 +592,7 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)
 		}
 
 		for (i = 0; i < ARRAY_SIZE(done[0]) && done[j][i]; i++)
-			panfrost_job_handle_done(pfdev, done[j][i]);
+			panfrost_jm_handle_done(pfdev, done[j][i]);
 	}
 
 	/* And finally we requeue jobs that were waiting in the second slot
@@ -610,23 +610,23 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)
 			struct panfrost_job *canceled = panfrost_dequeue_job(pfdev, j);
 
 			dma_fence_set_error(canceled->done_fence, -ECANCELED);
-			panfrost_job_handle_done(pfdev, canceled);
+			panfrost_jm_handle_done(pfdev, canceled);
 		} else if (!atomic_read(&pfdev->reset.pending)) {
 			/* Requeue the job we removed if no reset is pending */
 			job_write(pfdev, JS_COMMAND_NEXT(j), JS_COMMAND_START);
 		}
 	}
 }
 
-static void panfrost_job_handle_irqs(struct panfrost_device *pfdev)
+static void panfrost_jm_handle_irqs(struct panfrost_device *pfdev)
 {
 	u32 status = job_read(pfdev, JOB_INT_RAWSTAT);
 
 	while (status) {
 		pm_runtime_mark_last_busy(pfdev->base.dev);
 
 		spin_lock(&pfdev->js->job_lock);
-		panfrost_job_handle_irq(pfdev, status);
+		panfrost_jm_handle_irq(pfdev, status);
 		spin_unlock(&pfdev->js->job_lock);
 		status = job_read(pfdev, JOB_INT_RAWSTAT);
 	}
@@ -707,7 +707,7 @@ panfrost_reset(struct panfrost_device *pfdev,
 		dev_err(pfdev->base.dev, "Soft-stop failed\n");
 
 	/* Handle the remaining interrupts before we reset. */
-	panfrost_job_handle_irqs(pfdev);
+	panfrost_jm_handle_irqs(pfdev);
 
 	/* Remaining interrupts have been handled, but we might still have
 	 * stuck jobs. Let's make sure the PM counters stay balanced by
@@ -752,7 +752,7 @@ panfrost_reset(struct panfrost_device *pfdev,
 		drm_sched_start(&pfdev->js->queue[i].sched, 0);
 
 	/* Re-enable job interrupts now that everything has been restarted. */
-	panfrost_job_enable_interrupts(pfdev);
+	panfrost_jm_enable_interrupts(pfdev);
 
 	dma_fence_end_signalling(cookie);
 }
@@ -817,11 +817,11 @@ static const struct drm_sched_backend_ops panfrost_sched_ops = {
 	.free_job = panfrost_job_free
 };
 
-static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)
+static irqreturn_t panfrost_jm_irq_handler_thread(int irq, void *data)
 {
 	struct panfrost_device *pfdev = data;
 
-	panfrost_job_handle_irqs(pfdev);
+	panfrost_jm_handle_irqs(pfdev);
 
 	/* Enable interrupts only if we're not about to get suspended */
 	if (!test_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended))
@@ -830,7 +830,7 @@ static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
+static irqreturn_t panfrost_jm_irq_handler(int irq, void *data)
 {
 	struct panfrost_device *pfdev = data;
 	u32 status;
@@ -846,7 +846,7 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data)
 	return IRQ_WAKE_THREAD;
 }
 
-int panfrost_job_init(struct panfrost_device *pfdev)
+int panfrost_jm_init(struct panfrost_device *pfdev)
 {
 	struct drm_sched_init_args args = {
 		.ops = &panfrost_sched_ops,
@@ -880,8 +880,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)
 		return js->irq;
 
 	ret = devm_request_threaded_irq(pfdev->base.dev, js->irq,
-					panfrost_job_irq_handler,
-					panfrost_job_irq_handler_thread,
+					panfrost_jm_irq_handler,
+					panfrost_jm_irq_handler_thread,
 					IRQF_SHARED, KBUILD_MODNAME "-job",
 					pfdev);
 	if (ret) {
@@ -905,8 +905,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)
 		}
 	}
 
-	panfrost_job_reset_interrupts(pfdev);
-	panfrost_job_enable_interrupts(pfdev);
+	panfrost_jm_reset_interrupts(pfdev);
+	panfrost_jm_enable_interrupts(pfdev);
 
 	return 0;
 
@@ -918,7 +918,7 @@ int panfrost_job_init(struct panfrost_device *pfdev)
 	return ret;
 }
 
-void panfrost_job_fini(struct panfrost_device *pfdev)
+void panfrost_jm_fini(struct panfrost_device *pfdev)
 {
 	struct panfrost_job_slot *js = pfdev->js;
 	int j;
@@ -933,7 +933,7 @@ void panfrost_job_fini(struct panfrost_device *pfdev)
 	destroy_workqueue(pfdev->reset.wq);
 }
 
-int panfrost_job_open(struct drm_file *file)
+int panfrost_jm_open(struct drm_file *file)
 {
 	struct panfrost_file_priv *panfrost_priv = file->driver_priv;
 	int ret;
@@ -955,7 +955,7 @@ int panfrost_job_open(struct drm_file *file)
 	return 0;
 }
 
-void panfrost_job_close(struct drm_file *file)
+void panfrost_jm_close(struct drm_file *file)
 {
 	struct panfrost_file_priv *panfrost_priv = file->driver_priv;
 	struct panfrost_jm_ctx *jm_ctx;
@@ -967,7 +967,7 @@ void panfrost_job_close(struct drm_file *file)
 	xa_destroy(&panfrost_priv->jm_ctxs);
 }
 
-int panfrost_job_is_idle(struct panfrost_device *pfdev)
+int panfrost_jm_is_idle(struct panfrost_device *pfdev)
 {
 	struct panfrost_job_slot *js = pfdev->js;
 	int i;
diff --git a/drivers/gpu/drm/panfrost/panfrost_job.h b/drivers/gpu/drm/panfrost/panfrost_job.h
@@ -62,16 +62,16 @@ void panfrost_jm_ctx_put(struct panfrost_jm_ctx *jm_ctx);
 struct panfrost_jm_ctx *panfrost_jm_ctx_get(struct panfrost_jm_ctx *jm_ctx);
 struct panfrost_jm_ctx *panfrost_jm_ctx_from_handle(struct drm_file *file, u32 handle);
 
-int panfrost_job_init(struct panfrost_device *pfdev);
-void panfrost_job_fini(struct panfrost_device *pfdev);
-int panfrost_job_open(struct drm_file *file);
-void panfrost_job_close(struct drm_file *file);
+int panfrost_jm_init(struct panfrost_device *pfdev);
+void panfrost_jm_fini(struct panfrost_device *pfdev);
+int panfrost_jm_open(struct drm_file *file);
+void panfrost_jm_close(struct drm_file *file);
+void panfrost_jm_reset_interrupts(struct panfrost_device *pfdev);
+void panfrost_jm_enable_interrupts(struct panfrost_device *pfdev);
+void panfrost_jm_suspend_irq(struct panfrost_device *pfdev);
+int panfrost_jm_is_idle(struct panfrost_device *pfdev);
 int panfrost_job_get_slot(struct panfrost_job *job);
 int panfrost_job_push(struct panfrost_job *job);
 void panfrost_job_put(struct panfrost_job *job);
-void panfrost_job_reset_interrupts(struct panfrost_device *pfdev);
-void panfrost_job_enable_interrupts(struct panfrost_device *pfdev);
-void panfrost_job_suspend_irq(struct panfrost_device *pfdev);
-int panfrost_job_is_idle(struct panfrost_device *pfdev);
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -430,18 +430,18 @@ static struct dma_fence panfrost_job_run(struct drm_sched_job sched_job)`
`430`	`430`	`return fence;`
`431`	`431`	`}`
`432`	`432`
`433`		`-void panfrost_job_reset_interrupts(struct panfrost_device *pfdev)`
	`433`	`+void panfrost_jm_reset_interrupts(struct panfrost_device *pfdev)`
`434`	`434`	`{`
`435`	`435`	`job_write(pfdev, JOB_INT_CLEAR, ALL_JS_INT_MASK);`
`436`	`436`	`}`
`437`	`437`
`438`		`-void panfrost_job_enable_interrupts(struct panfrost_device *pfdev)`
	`438`	`+void panfrost_jm_enable_interrupts(struct panfrost_device *pfdev)`
`439`	`439`	`{`
`440`	`440`	`clear_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended);`
`441`	`441`	`job_write(pfdev, JOB_INT_MASK, ALL_JS_INT_MASK);`
`442`	`442`	`}`
`443`	`443`
`444`		`-void panfrost_job_suspend_irq(struct panfrost_device *pfdev)`
	`444`	`+void panfrost_jm_suspend_irq(struct panfrost_device *pfdev)`
`445`	`445`	`{`
`446`	`446`	`set_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended);`
`447`	`447`
`@@ -503,8 +503,8 @@ static void panfrost_job_handle_err(struct panfrost_device *pfdev,`
`503`	`503`	`}`
`504`	`504`	`}`
`505`	`505`
`506`		`-static void panfrost_job_handle_done(struct panfrost_device *pfdev,`
`507`		`- struct panfrost_job *job)`
	`506`	`+static void panfrost_jm_handle_done(struct panfrost_device *pfdev,`
	`507`	`+ struct panfrost_job *job)`
`508`	`508`	`{`
`509`	`509`	`/* Set ->jc to 0 to avoid re-submitting an already finished job (can`
`510`	`510`	`* happen when we receive the DONE interrupt while doing a GPU reset).`
`@@ -517,7 +517,7 @@ static void panfrost_job_handle_done(struct panfrost_device *pfdev,`
`517`	`517`	`pm_runtime_put_autosuspend(pfdev->base.dev);`
`518`	`518`	`}`
`519`	`519`
`520`		`-static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)`
	`520`	`+static void panfrost_jm_handle_irq(struct panfrost_device *pfdev, u32 status)`
`521`	`521`	`{`
`522`	`522`	`struct panfrost_job *done[NUM_JOB_SLOTS][2] = {};`
`523`	`523`	`struct panfrost_job *failed[NUM_JOB_SLOTS] = {};`
`@@ -592,7 +592,7 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`for (i = 0; i < ARRAY_SIZE(done[0]) && done[j][i]; i++)`
`595`		`- panfrost_job_handle_done(pfdev, done[j][i]);`
	`595`	`+ panfrost_jm_handle_done(pfdev, done[j][i]);`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`/* And finally we requeue jobs that were waiting in the second slot`
`@@ -610,23 +610,23 @@ static void panfrost_job_handle_irq(struct panfrost_device *pfdev, u32 status)`
`610`	`610`	`struct panfrost_job *canceled = panfrost_dequeue_job(pfdev, j);`
`611`	`611`
`612`	`612`	`dma_fence_set_error(canceled->done_fence, -ECANCELED);`
`613`		`- panfrost_job_handle_done(pfdev, canceled);`
	`613`	`+ panfrost_jm_handle_done(pfdev, canceled);`
`614`	`614`	`} else if (!atomic_read(&pfdev->reset.pending)) {`
`615`	`615`	`/* Requeue the job we removed if no reset is pending */`
`616`	`616`	`job_write(pfdev, JS_COMMAND_NEXT(j), JS_COMMAND_START);`
`617`	`617`	`}`
`618`	`618`	`}`
`619`	`619`	`}`
`620`	`620`
`621`		`-static void panfrost_job_handle_irqs(struct panfrost_device *pfdev)`
	`621`	`+static void panfrost_jm_handle_irqs(struct panfrost_device *pfdev)`
`622`	`622`	`{`
`623`	`623`	`u32 status = job_read(pfdev, JOB_INT_RAWSTAT);`
`624`	`624`
`625`	`625`	`while (status) {`
`626`	`626`	`pm_runtime_mark_last_busy(pfdev->base.dev);`
`627`	`627`
`628`	`628`	`spin_lock(&pfdev->js->job_lock);`
`629`		`- panfrost_job_handle_irq(pfdev, status);`
	`629`	`+ panfrost_jm_handle_irq(pfdev, status);`
`630`	`630`	`spin_unlock(&pfdev->js->job_lock);`
`631`	`631`	`status = job_read(pfdev, JOB_INT_RAWSTAT);`
`632`	`632`	`}`
`@@ -707,7 +707,7 @@ panfrost_reset(struct panfrost_device *pfdev,`
`707`	`707`	`dev_err(pfdev->base.dev, "Soft-stop failed\n");`
`708`	`708`
`709`	`709`	`/* Handle the remaining interrupts before we reset. */`
`710`		`- panfrost_job_handle_irqs(pfdev);`
	`710`	`+ panfrost_jm_handle_irqs(pfdev);`
`711`	`711`
`712`	`712`	`/* Remaining interrupts have been handled, but we might still have`
`713`	`713`	`* stuck jobs. Let's make sure the PM counters stay balanced by`
`@@ -752,7 +752,7 @@ panfrost_reset(struct panfrost_device *pfdev,`
`752`	`752`	`drm_sched_start(&pfdev->js->queue[i].sched, 0);`
`753`	`753`
`754`	`754`	`/* Re-enable job interrupts now that everything has been restarted. */`
`755`		`- panfrost_job_enable_interrupts(pfdev);`
	`755`	`+ panfrost_jm_enable_interrupts(pfdev);`
`756`	`756`
`757`	`757`	`dma_fence_end_signalling(cookie);`
`758`	`758`	`}`
`@@ -817,11 +817,11 @@ static const struct drm_sched_backend_ops panfrost_sched_ops = {`
`817`	`817`	`.free_job = panfrost_job_free`
`818`	`818`	`};`
`819`	`819`
`820`		`-static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)`
	`820`	`+static irqreturn_t panfrost_jm_irq_handler_thread(int irq, void *data)`
`821`	`821`	`{`
`822`	`822`	`struct panfrost_device *pfdev = data;`
`823`	`823`
`824`		`- panfrost_job_handle_irqs(pfdev);`
	`824`	`+ panfrost_jm_handle_irqs(pfdev);`
`825`	`825`
`826`	`826`	`/* Enable interrupts only if we're not about to get suspended */`
`827`	`827`	`if (!test_bit(PANFROST_COMP_BIT_JOB, pfdev->is_suspended))`
`@@ -830,7 +830,7 @@ static irqreturn_t panfrost_job_irq_handler_thread(int irq, void *data)`
`830`	`830`	`return IRQ_HANDLED;`
`831`	`831`	`}`
`832`	`832`
`833`		`-static irqreturn_t panfrost_job_irq_handler(int irq, void *data)`
	`833`	`+static irqreturn_t panfrost_jm_irq_handler(int irq, void *data)`
`834`	`834`	`{`
`835`	`835`	`struct panfrost_device *pfdev = data;`
`836`	`836`	`u32 status;`
`@@ -846,7 +846,7 @@ static irqreturn_t panfrost_job_irq_handler(int irq, void *data)`
`846`	`846`	`return IRQ_WAKE_THREAD;`
`847`	`847`	`}`
`848`	`848`
`849`		`-int panfrost_job_init(struct panfrost_device *pfdev)`
	`849`	`+int panfrost_jm_init(struct panfrost_device *pfdev)`
`850`	`850`	`{`
`851`	`851`	`struct drm_sched_init_args args = {`
`852`	`852`	`.ops = &panfrost_sched_ops,`
`@@ -880,8 +880,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)`
`880`	`880`	`return js->irq;`
`881`	`881`
`882`	`882`	`ret = devm_request_threaded_irq(pfdev->base.dev, js->irq,`
`883`		`- panfrost_job_irq_handler,`
`884`		`- panfrost_job_irq_handler_thread,`
	`883`	`+ panfrost_jm_irq_handler,`
	`884`	`+ panfrost_jm_irq_handler_thread,`
`885`	`885`	`IRQF_SHARED, KBUILD_MODNAME "-job",`
`886`	`886`	`pfdev);`
`887`	`887`	`if (ret) {`
`@@ -905,8 +905,8 @@ int panfrost_job_init(struct panfrost_device *pfdev)`
`905`	`905`	`}`
`906`	`906`	`}`
`907`	`907`
`908`		`- panfrost_job_reset_interrupts(pfdev);`
`909`		`- panfrost_job_enable_interrupts(pfdev);`
	`908`	`+ panfrost_jm_reset_interrupts(pfdev);`
	`909`	`+ panfrost_jm_enable_interrupts(pfdev);`
`910`	`910`
`911`	`911`	`return 0;`
`912`	`912`
`@@ -918,7 +918,7 @@ int panfrost_job_init(struct panfrost_device *pfdev)`
`918`	`918`	`return ret;`
`919`	`919`	`}`
`920`	`920`
`921`		`-void panfrost_job_fini(struct panfrost_device *pfdev)`
	`921`	`+void panfrost_jm_fini(struct panfrost_device *pfdev)`
`922`	`922`	`{`
`923`	`923`	`struct panfrost_job_slot *js = pfdev->js;`
`924`	`924`	`int j;`
`@@ -933,7 +933,7 @@ void panfrost_job_fini(struct panfrost_device *pfdev)`
`933`	`933`	`destroy_workqueue(pfdev->reset.wq);`
`934`	`934`	`}`
`935`	`935`
`936`		`-int panfrost_job_open(struct drm_file *file)`
	`936`	`+int panfrost_jm_open(struct drm_file *file)`
`937`	`937`	`{`
`938`	`938`	`struct panfrost_file_priv *panfrost_priv = file->driver_priv;`
`939`	`939`	`int ret;`
`@@ -955,7 +955,7 @@ int panfrost_job_open(struct drm_file *file)`
`955`	`955`	`return 0;`
`956`	`956`	`}`
`957`	`957`
`958`		`-void panfrost_job_close(struct drm_file *file)`
	`958`	`+void panfrost_jm_close(struct drm_file *file)`
`959`	`959`	`{`
`960`	`960`	`struct panfrost_file_priv *panfrost_priv = file->driver_priv;`
`961`	`961`	`struct panfrost_jm_ctx *jm_ctx;`
`@@ -967,7 +967,7 @@ void panfrost_job_close(struct drm_file *file)`
`967`	`967`	`xa_destroy(&panfrost_priv->jm_ctxs);`
`968`	`968`	`}`
`969`	`969`
`970`		`-int panfrost_job_is_idle(struct panfrost_device *pfdev)`
	`970`	`+int panfrost_jm_is_idle(struct panfrost_device *pfdev)`
`971`	`971`	`{`
`972`	`972`	`struct panfrost_job_slot *js = pfdev->js;`
`973`	`973`	`int i;`