diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-10 16:55:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-10 16:55:53 +1000 |
| commit | b10733527bfd864605c33ab2e9a886eec317ec39 (patch) | |
| tree | d7d671d2fa69e628e2ac898ba8e9ab10c6481c3c /drivers/gpu/drm/scheduler | |
| parent | 60f2f74978e69fdb63e7a26179cbd5c50d4845c2 (diff) | |
| parent | f8aab60422c371425365d386dfd51e0c6c5b1041 (diff) | |
Merge tag 'amd-drm-next-5.11-2020-12-09' of git://people.freedesktop.org/~agd5f/linux into drm-next
amd-drm-next-5.11-2020-12-09:
amdgpu:
- SR-IOV fixes
- Navy Flounder updates
- Sienna Cichlid updates
- Dimgrey Cavefish updates
- Vangogh updates
- Misc SMU fixes
- Misc display fixes
- Last big hunk of W=1 warning fixes
- Cursor validation fixes
- CI BACO updates
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201210045344.21566-1-alexander.deucher@amd.com
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/scheduler')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_entity.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index f8ec277a6aa8..c1ac3e4003c6 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -308,7 +308,7 @@ void drm_sched_entity_destroy(struct drm_sched_entity *entity) } EXPORT_SYMBOL(drm_sched_entity_destroy); -/** +/* * drm_sched_entity_clear_dep - callback to clear the entities dependency */ static void drm_sched_entity_clear_dep(struct dma_fence *f, @@ -321,7 +321,7 @@ static void drm_sched_entity_clear_dep(struct dma_fence *f, dma_fence_put(f); } -/** +/* * drm_sched_entity_clear_dep - callback to clear the entities dependency and * wake up scheduler */ diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index c6332d75025e..b498d474ef9e 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -65,6 +65,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb); /** * drm_sched_rq_init - initialize a given run queue struct * + * @sched: scheduler instance to associate with this run queue * @rq: scheduler run queue * * Initializes a scheduler runqueue. |