Skip to content

Commit baad109

Browse files
committed
Revert "drm/scheduler: track GPU active time per entity"
This reverts commit df62272 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 <[email protected]> Signed-off-by: Lucas Stach <[email protected]>
1 parent 2658d0d commit baad109

File tree

2 files changed

+0
-13
lines changed

2 files changed

+0
-13
lines changed

drivers/gpu/drm/scheduler/sched_main.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -906,12 +906,6 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched)
906906

907907
spin_unlock(&sched->job_list_lock);
908908

909-
if (job) {
910-
job->entity->elapsed_ns += ktime_to_ns(
911-
ktime_sub(job->s_fence->finished.timestamp,
912-
job->s_fence->scheduled.timestamp));
913-
}
914-
915909
return job;
916910
}
917911

include/drm/gpu_scheduler.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,13 +228,6 @@ struct drm_sched_entity {
228228
*/
229229
struct rb_node rb_tree_node;
230230

231-
/**
232-
* @elapsed_ns:
233-
*
234-
* Records the amount of time where jobs from this entity were active
235-
* on the GPU.
236-
*/
237-
uint64_t elapsed_ns;
238231
};
239232

240233
/**

0 commit comments

Comments
 (0)