diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-11-14 01:43:06 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-11-14 01:43:07 +0300 |
| commit | 0990ca235d9145ec40ed002f8ff7f6e1a910db4f (patch) | |
| tree | f3b622905180952f792411641c39fd433d839f9c /include/drm | |
| parent | 77e0723bd27f830d0903225372aa778fe2975648 (diff) | |
| parent | 53dbc27ad5a93932ff1892a8e4ef266827d74a0f (diff) | |
| download | linux-0990ca235d9145ec40ed002f8ff7f6e1a910db4f.tar.xz | |
Merge tag 'drm-next-5.5-2019-11-08' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.5-2019-11-08:
amdgpu:
- Enable VCN dynamic powergating on RV/RV2
- Fixes for Navi14
- Misc Navi fixes
- Fix MSI-X tear down
- Misc Arturus fixes
- Fix xgmi powerstate handling
- Documenation fixes
scheduler:
- Fix static code checker warning
- Fix possible thread reactivation while thread is stopped
- Avoid cleanup if thread is parked
radeon:
- SI dpm fix ported from amdgpu
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191108212713.5078-1-alexander.deucher@amd.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/gpu_scheduler.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index 57b4121c750a..684692a8ed76 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -26,6 +26,7 @@ #include <drm/spsc_queue.h> #include <linux/dma-fence.h> +#include <linux/completion.h> #define MAX_WAIT_SCHED_ENTITY_Q_EMPTY msecs_to_jiffies(1000) @@ -71,6 +72,7 @@ enum drm_sched_priority { * @last_scheduled: points to the finished fence of the last scheduled job. * @last_user: last group leader pushing a job into the entity. * @stopped: Marks the enity as removed from rq and destined for termination. + * @entity_idle: Signals when enityt is not in use * * Entities will emit jobs in order to their corresponding hardware * ring, and the scheduler will alternate between entities based on @@ -94,6 +96,7 @@ struct drm_sched_entity { struct dma_fence *last_scheduled; struct task_struct *last_user; bool stopped; + struct completion entity_idle; }; /** |