diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-03-30 21:15:06 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-03-30 21:15:07 +0300 |
| commit | 7af63e079a7d6d45a3796a7ba625e2ec131f62be (patch) | |
| tree | 4a6b95cdede24470f9dba27523433725f12ede4a /include | |
| parent | e8d6d6f0aaa9e1640ad94fb3b11e26c0edec753f (diff) | |
| parent | baad10973fdb442912af676de3348e80bd8fe602 (diff) | |
| download | linux-7af63e079a7d6d45a3796a7ba625e2ec131f62be.tar.xz | |
Merge branch 'etnaviv/fixes' of https://git.pengutronix.de/git/lst/linux into drm-fixes
- revert gpu time fdinfo support
- reference leak fix on imported buffers
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/de8e08c2599ec0e22456ae36e9757b9ff14c2124.camel@pengutronix.de
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/gpu_scheduler.h | 7 |
1 files changed, 0 insertions, 7 deletions
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; }; /** |