]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/mm: revert "Break long searches in fragmented address spaces"
authorChristian König <christian.koenig@amd.com>
Mon, 30 Mar 2020 12:30:41 +0000 (14:30 +0200)
committerChristian König <christian.koenig@amd.com>
Tue, 31 Mar 2020 15:35:56 +0000 (17:35 +0200)
This reverts commit 644cac6d1b898970c0cf84bb05fa4e335cc673b9.

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/
drivers/gpu/drm/drm_mm.c

index bc6e208949e85fb69e5f9661de16832fabeecdce..8981abe8b7c940e82fe33fa1085994035dd0daf4 100644 (file)
@@ -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);