diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-04-30 07:51:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-04-30 07:51:54 +0200 |
| commit | d5963d87bf84060ff3fb572bf6d3606f7fd087d1 (patch) | |
| tree | 5a94c33a56d7bdd91a38aa0ec50e9202914f742e /drivers/gpu/drm/scheduler/sched_main.c | |
| parent | 3db6d5a5ecaf0a778d721ccf9809248350d4bfaf (diff) | |
| parent | 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b (diff) | |
| download | linux-d5963d87bf84060ff3fb572bf6d3606f7fd087d1.tar.gz linux-d5963d87bf84060ff3fb572bf6d3606f7fd087d1.tar.bz2 linux-d5963d87bf84060ff3fb572bf6d3606f7fd087d1.zip | |
Merge tag 'v5.1-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/scheduler/sched_main.c')
| -rw-r--r-- | drivers/gpu/drm/scheduler/sched_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 19fc601c9eeb..a1bec2779e76 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -366,10 +366,9 @@ void drm_sched_increase_karma(struct drm_sched_job *bad) EXPORT_SYMBOL(drm_sched_increase_karma); /** - * drm_sched_hw_job_reset - stop the scheduler if it contains the bad job + * drm_sched_stop - stop the scheduler * * @sched: scheduler instance - * @bad: bad scheduler job * */ void drm_sched_stop(struct drm_gpu_scheduler *sched) |