Skip to content

Commit 7a08d3e

Browse files
mairacanalpelwell
authored andcommitted
drm/v3d: Store a pointer to struct v3d_file_priv inside each job
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 <[email protected]>
1 parent aabec9a commit 7a08d3e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/gpu/drm/v3d/v3d_drv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,9 @@ struct v3d_job {
322322
struct v3d_perfmon *perfmon;
323323

324324
/* File descriptor of the process that submitted the job that could be used
325-
* for collecting stats by process of GPU usage.
325+
* to collect per-process information about the GPU.
326326
*/
327-
struct drm_file *file;
327+
struct v3d_file_priv *file_priv;
328328

329329
/* Callback for the freeing of the job on refcount going to 0. */
330330
void (*free)(struct kref *ref);

drivers/gpu/drm/v3d/v3d_sched.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void
139139
v3d_job_start_stats(struct v3d_job *job, enum v3d_queue queue)
140140
{
141141
struct v3d_dev *v3d = job->v3d;
142-
struct v3d_file_priv *file = job->file->driver_priv;
142+
struct v3d_file_priv *file = job->file_priv;
143143
struct v3d_stats *global_stats = &v3d->queue[queue].stats;
144144
struct v3d_stats *local_stats = &file->stats[queue];
145145
u64 now = local_clock();
@@ -197,7 +197,7 @@ void
197197
v3d_job_update_stats(struct v3d_job *job, enum v3d_queue queue)
198198
{
199199
struct v3d_dev *v3d = job->v3d;
200-
struct v3d_file_priv *file = job->file->driver_priv;
200+
struct v3d_file_priv *file = job->file_priv;
201201
struct v3d_stats *global_stats = &v3d->queue[queue].stats;
202202
u64 now = local_clock();
203203
unsigned long flags;
@@ -574,7 +574,7 @@ static void
574574
v3d_reset_performance_queries(struct v3d_cpu_job *job)
575575
{
576576
struct v3d_performance_query_info *performance_query = &job->performance_query;
577-
struct v3d_file_priv *v3d_priv = job->base.file->driver_priv;
577+
struct v3d_file_priv *v3d_priv = job->base.file_priv;
578578
struct v3d_dev *v3d = job->base.v3d;
579579
struct v3d_perfmon *perfmon;
580580

@@ -604,7 +604,7 @@ v3d_write_performance_query_result(struct v3d_cpu_job *job, void *data,
604604
{
605605
struct v3d_performance_query_info *performance_query =
606606
&job->performance_query;
607-
struct v3d_file_priv *v3d_priv = job->base.file->driver_priv;
607+
struct v3d_file_priv *v3d_priv = job->base.file_priv;
608608
struct v3d_performance_query *perf_query =
609609
&performance_query->queries[query];
610610
struct v3d_dev *v3d = job->base.v3d;

drivers/gpu/drm/v3d/v3d_submit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
227227

228228
job->v3d = v3d;
229229
job->free = free;
230-
job->file = file_priv;
230+
job->file_priv = v3d_priv;
231231

232232
ret = drm_sched_job_init(&job->base, &v3d_priv->sched_entity[queue],
233233
1, v3d_priv);

0 commit comments

Comments
 (0)