drm/imagination: Rename fence returned by pvr_queue_job_arm()

Rename from done_fence to finished_fence, both because the function
returns a drm_sched_fence's finished fence, and to avoid confusion with
the job fence, which is called the same but has a different purpose.

Signed-off-by: Alessio Belle <alessio.belle@imgtec.com>
Reviewed-by: Brajesh Gupta <brajesh.gupta@imgtec.com>
Link: https://patch.msgid.link/20260330-job-submission-fixes-cleanup-v1-5-7de8c09cef8c@imgtec.com
Signed-off-by: Matt Coster <matt.coster@imgtec.com>

diff --git a/drivers/gpu/drm/imagination/pvr_job.c b/drivers/gpu/drm/imagination/pvr_job.c
index 0c2f511a617852d80eda03e99775dbeef2535c15..dd9f5df01e0803c20c5c8a1d38fb008682fbf0cc 100644 (file)
--- a/drivers/gpu/drm/imagination/pvr_job.c
+++ b/drivers/gpu/drm/imagination/pvr_job.c
@@ -326,7 +326,7 @@ prepare_job_syncs(struct pvr_file *pvr_file,
                  struct pvr_job_data *job_data,
                  struct xarray *signal_array)
 {
-       struct dma_fence *done_fence;
+       struct dma_fence *finished_fence;
        int err = pvr_sync_signal_array_collect_ops(signal_array,
                                                    from_pvr_file(pvr_file),
                                                    job_data->sync_op_count,
@@ -359,13 +359,13 @@ prepare_job_syncs(struct pvr_file *pvr_file,
                        return err;
        }
 
-       /* We need to arm the job to get the job done fence. */
-       done_fence = pvr_queue_job_arm(job_data->job);
+       /* We need to arm the job to get the job finished fence. */
+       finished_fence = pvr_queue_job_arm(job_data->job);
 
        err = pvr_sync_signal_array_update_fences(signal_array,
                                                  job_data->sync_op_count,
                                                  job_data->sync_ops,
-                                                 done_fence);
+                                                 finished_fence);
        return err;
 }
 

diff --git a/drivers/gpu/drm/imagination/pvr_sync.c b/drivers/gpu/drm/imagination/pvr_sync.c
index 757a18b1ab8f09ecf89c7f8c0f6a3a0f3ba219d9..936f840a52218943ce251a6ac3c2e1db49749425 100644 (file)
--- a/drivers/gpu/drm/imagination/pvr_sync.c
+++ b/drivers/gpu/drm/imagination/pvr_sync.c
@@ -160,7 +160,7 @@ int
 pvr_sync_signal_array_update_fences(struct xarray *array,
                                    u32 sync_op_count,
                                    const struct drm_pvr_sync_op *sync_ops,
-                                   struct dma_fence *done_fence)
+                                   struct dma_fence *finished_fence)
 {
        for (u32 i = 0; i < sync_op_count; i++) {
                struct dma_fence *old_fence;
@@ -175,7 +175,7 @@ pvr_sync_signal_array_update_fences(struct xarray *array,
                        return -EINVAL;
 
                old_fence = sig_sync->fence;
-               sig_sync->fence = dma_fence_get(done_fence);
+               sig_sync->fence = dma_fence_get(finished_fence);
                dma_fence_put(old_fence);
 
                if (WARN_ON(!sig_sync->fence))

diff --git a/drivers/gpu/drm/imagination/pvr_sync.h b/drivers/gpu/drm/imagination/pvr_sync.h
index db6ccfda104a3ad7d2901af494bc8c49f88da9b3..48501ad2779421a6a23e3d861a9b98db1d9614f8 100644 (file)
--- a/drivers/gpu/drm/imagination/pvr_sync.h
+++ b/drivers/gpu/drm/imagination/pvr_sync.h
@@ -70,7 +70,7 @@ int
 pvr_sync_signal_array_update_fences(struct xarray *array,
                                    u32 sync_op_count,
                                    const struct drm_pvr_sync_op *sync_ops,
-                                   struct dma_fence *done_fence);
+                                   struct dma_fence *finished_fence);
 
 void
 pvr_sync_signal_array_push_fences(struct xarray *array);