diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2023-03-30 17:35:13 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2023-03-30 17:47:05 +0200 |
| commit | baad10973fdb442912af676de3348e80bd8fe602 (patch) | |
| tree | 1012b21fb50bf662be0271aec9e1ef1de3d0472c | |
| parent | 2658d0d0355a3470a96d0e4268cbad174fadf0ed (diff) | |
| download | linux-etnaviv/fixes.tar.gz linux-etnaviv/fixes.tar.xz | |
Revert "drm/scheduler: track GPU active time per entity"etnaviv/fixes
This reverts commit df622729ddbf as it introduces a use-after-free,
which isn't easy to fix without going back to the design drawing board.
Reported-by: Danilo Krummrich <dakr@redhat.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 6 | ||||
| -rw-r--r-- | include/drm/gpu_scheduler.h | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 4e6ad6e122bc..0e4378420271 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -906,12 +906,6 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) spin_unlock(&sched->job_list_lock); - if (job) { - job->entity->elapsed_ns += ktime_to_ns( - ktime_sub(job->s_fence->finished.timestamp, - job->s_fence->scheduled.timestamp)); - } - return job; } diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 9db9e5e504ee..9935d1e2ff69 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -228,13 +228,6 @@ struct drm_sched_entity { */ struct rb_node rb_tree_node; - /** - * @elapsed_ns: - * - * Records the amount of time where jobs from this entity were active - * on the GPU. - */ - uint64_t elapsed_ns; }; /** |