[PATCH 1/6] drm/v3d: Store a pointer to `struct v3d_file_priv` inside each job

[Maíra Canal]

Instead of storing a pointer to the DRM file data, store a pointer
directly to the private V3D file struct.

Signed-off-by: Maíra Canal <mca...@igalia.com>
---
 drivers/gpu/drm/v3d/v3d_drv.h    |  4 ++--
 drivers/gpu/drm/v3d/v3d_sched.c  | 10 +++++-----
 drivers/gpu/drm/v3d/v3d_submit.c |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
index 
dabda7aaf00074d8de42dcdb345d5f3331ac13b2..dd8d39bf2d948551c66d852aee7f9afa473df4f1
 100644
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -319,9 +319,9 @@ struct v3d_job {
        struct v3d_perfmon *perfmon;
 
        /* File descriptor of the process that submitted the job that could be 
used
-        * for collecting stats by process of GPU usage.
+        * to collect per-process information about the GPU.
         */
-       struct drm_file *file;
+       struct v3d_file_priv *file_priv;
 
        /* Callback for the freeing of the job on refcount going to 0. */
        void (*free)(struct kref *ref);
diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c
index 
7d45664f03c714bbb754ea22902147a64e63d115..797aac34481c8a72cff3e16d9d7abebc570e4983
 100644
--- a/drivers/gpu/drm/v3d/v3d_sched.c
+++ b/drivers/gpu/drm/v3d/v3d_sched.c
@@ -139,7 +139,7 @@ static void
 v3d_job_start_stats(struct v3d_job *job, enum v3d_queue queue)
 {
        struct v3d_dev *v3d = job->v3d;
-       struct v3d_file_priv *file = job->file->driver_priv;
+       struct v3d_file_priv *file = job->file_priv;
        struct v3d_stats *global_stats = &v3d->queue[queue].stats;
        struct v3d_stats *local_stats = &file->stats[queue];
        u64 now = local_clock();
@@ -197,7 +197,7 @@ void
 v3d_job_update_stats(struct v3d_job *job, enum v3d_queue queue)
 {
        struct v3d_dev *v3d = job->v3d;
-       struct v3d_file_priv *file = job->file->driver_priv;
+       struct v3d_file_priv *file = job->file_priv;
        struct v3d_stats *global_stats = &v3d->queue[queue].stats;
        struct v3d_stats *local_stats = &file->stats[queue];
        u64 now = local_clock();
@@ -570,7 +570,7 @@ static void
 v3d_reset_performance_queries(struct v3d_cpu_job *job)
 {
        struct v3d_performance_query_info *performance_query = 
&job->performance_query;
-       struct v3d_file_priv *v3d_priv = job->base.file->driver_priv;
+       struct v3d_file_priv *v3d_priv = job->base.file_priv;
        struct v3d_dev *v3d = job->base.v3d;
        struct v3d_perfmon *perfmon;
 
@@ -600,7 +600,7 @@ v3d_write_performance_query_result(struct v3d_cpu_job *job, 
void *data,
 {
        struct v3d_performance_query_info *performance_query =
                                                &job->performance_query;
-       struct v3d_file_priv *v3d_priv = job->base.file->driver_priv;
+       struct v3d_file_priv *v3d_priv = job->base.file_priv;
        struct v3d_performance_query *perf_query =
                        &performance_query->queries[query];
        struct v3d_dev *v3d = job->base.v3d;
@@ -718,7 +718,7 @@ static enum drm_gpu_sched_stat
 v3d_gpu_reset_for_timeout(struct v3d_dev *v3d, struct drm_sched_job *sched_job)
 {
        struct v3d_job *job = to_v3d_job(sched_job);
-       struct v3d_file_priv *v3d_priv = job->file->driver_priv;
+       struct v3d_file_priv *v3d_priv = job->file_priv;
        enum v3d_queue q;
 
        mutex_lock(&v3d->reset_lock);
diff --git a/drivers/gpu/drm/v3d/v3d_submit.c b/drivers/gpu/drm/v3d/v3d_submit.c
index 
5171ffe9012d4d0140d82d40af71ecbaf029a24a..f3652e90683c398f25d2ce306be1c0fdfe4d286f
 100644
--- a/drivers/gpu/drm/v3d/v3d_submit.c
+++ b/drivers/gpu/drm/v3d/v3d_submit.c
@@ -166,7 +166,7 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file 
*file_priv,
 
        job->v3d = v3d;
        job->free = free;
-       job->file = file_priv;
+       job->file_priv = v3d_priv;
 
        ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue],
                                 1, v3d_priv, file_priv->client_id);

-- 
2.50.0