diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-02-10 16:24:39 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-02-10 17:26:00 +0300 |
| commit | e2183fb135a7f62d317aa1c61eb3d1919080edba (patch) | |
| tree | 5d032ccec9182b8b68ae1f1839e4dfd406498728 /drivers/gpu/drm/lima | |
| parent | 4b8878eefa0a3b65e2e016db49014ea66fb9fd45 (diff) | |
| download | linux-e2183fb135a7f62d317aa1c61eb3d1919080edba.tar.xz | |
Revert "drm/scheduler: Job timeout handler returns status (v3)"
This reverts commit c10983e14e8f5d7c8dab0415e0cb7fe8d10aa9e3.
This commit is not meant for drm-misc-next-fixes, and was accidentally
cherry picked over.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/lima')
| -rw-r--r-- | drivers/gpu/drm/lima/lima_sched.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c index 20dafa62980f..5cc20b403a25 100644 --- a/drivers/gpu/drm/lima/lima_sched.c +++ b/drivers/gpu/drm/lima/lima_sched.c @@ -415,7 +415,7 @@ out: mutex_unlock(&dev->error_task_list_lock); } -static enum drm_gpu_sched_stat lima_sched_timedout_job(struct drm_sched_job *job) +static void lima_sched_timedout_job(struct drm_sched_job *job) { struct lima_sched_pipe *pipe = to_lima_pipe(job->sched); struct lima_sched_task *task = to_lima_task(job); @@ -449,8 +449,6 @@ static enum drm_gpu_sched_stat lima_sched_timedout_job(struct drm_sched_job *job drm_sched_resubmit_jobs(&pipe->base); drm_sched_start(&pipe->base, true); - - return DRM_GPU_SCHED_STAT_NOMINAL; } static void lima_sched_free_job(struct drm_sched_job *job) |