Skip to content

Commit d8a26d8

Browse files
drm/mm: revert "Break long searches in fragmented address spaces"
This reverts commit 7be1b9b. 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 <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/359278/
1 parent 4c1cb04 commit d8a26d8

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/gpu/drm/drm_mm.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include <linux/export.h>
4646
#include <linux/interval_tree_generic.h>
4747
#include <linux/seq_file.h>
48-
#include <linux/sched/signal.h>
4948
#include <linux/slab.h>
5049
#include <linux/stacktrace.h>
5150

@@ -367,11 +366,6 @@ next_hole(struct drm_mm *mm,
367366
struct drm_mm_node *node,
368367
enum drm_mm_insert_mode mode)
369368
{
370-
/* Searching is slow; check if we ran out of time/patience */
371-
cond_resched();
372-
if (fatal_signal_pending(current))
373-
return NULL;
374-
375369
switch (mode) {
376370
default:
377371
case DRM_MM_INSERT_BEST:
@@ -563,7 +557,7 @@ int drm_mm_insert_node_in_range(struct drm_mm * const mm,
563557
return 0;
564558
}
565559

566-
return signal_pending(current) ? -ERESTARTSYS : -ENOSPC;
560+
return -ENOSPC;
567561
}
568562
EXPORT_SYMBOL(drm_mm_insert_node_in_range);
569563

0 commit comments

Comments
 (0)