diff options
| author | Christian König <christian.koenig@amd.com> | 2020-03-30 14:30:41 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2020-03-31 17:35:56 +0200 |
| commit | d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4 (patch) | |
| tree | ea780c3a16277f29e15a4aa4864464d1b555cedf | |
| parent | 4c1cb04e0e7ac4ba1ef5457929ef9b5671d9eed3 (diff) | |
drm/mm: revert "Break long searches in fragmented address spaces"drm-misc-next-fixes-2020-04-04
This reverts commit 7be1b9b8e9d1e9ef0342d2e001f44eec4030aa4d.
The drm_mm is supposed to work in atomic context, so calling schedule()
or in this case cond_resched() is illegal.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/359278/
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index bc6e208949e8..8981abe8b7c9 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -45,7 +45,6 @@ #include <linux/export.h> #include <linux/interval_tree_generic.h> #include <linux/seq_file.h> -#include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/stacktrace.h> @@ -367,11 +366,6 @@ next_hole(struct drm_mm *mm, struct drm_mm_node *node, enum drm_mm_insert_mode mode) { - /* Searching is slow; check if we ran out of time/patience */ - cond_resched(); - if (fatal_signal_pending(current)) - return NULL; - switch (mode) { default: case DRM_MM_INSERT_BEST: @@ -563,7 +557,7 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm, return 0; } - return signal_pending(current) ? -ERESTARTSYS : -ENOSPC; + return -ENOSPC; } EXPORT_SYMBOL(drm_mm_insert_node_in_range); |