Commit-ID: 32d8206725bcf6e3ce7832ac39e61a6ecfd558db Gitweb: http://git.kernel.org/tip/32d8206725bcf6e3ce7832ac39e61a6ecfd558db Author: David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx> AuthorDate: Mon, 11 May 2015 17:52:12 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Tue, 19 May 2015 08:39:15 +0200 mm/fault, drm/i915: Use pagefault_disabled() to check for disabled pagefaults Now that the pagefault disabled counter is in place, we can replace the in_atomic() check by a pagefault_disabled() checks. Reviewed-and-tested-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: David Hildenbrand <dahi@xxxxxxxxxxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Cc: David.Laight@xxxxxxxxxx Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: airlied@xxxxxxxx Cc: akpm@xxxxxxxxxxxxxxxxxxxx Cc: benh@xxxxxxxxxxxxxxxxxxx Cc: bigeasy@xxxxxxxxxxxxx Cc: borntraeger@xxxxxxxxxx Cc: daniel.vetter@xxxxxxxxx Cc: heiko.carstens@xxxxxxxxxx Cc: herbert@xxxxxxxxxxxxxxxxxxx Cc: hocko@xxxxxxx Cc: hughd@xxxxxxxxxx Cc: mst@xxxxxxxxxx Cc: paulus@xxxxxxxxx Cc: ralf@xxxxxxxxxxxxxx Cc: schwidefsky@xxxxxxxxxx Cc: yang.shi@xxxxxxxxxxxxx Link: http://lkml.kernel.org/r/1431359540-32227-8-git-send-email-dahi@xxxxxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index a3190e79..cc552a4 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -32,6 +32,7 @@ #include "i915_trace.h" #include "intel_drv.h" #include <linux/dma_remapping.h> +#include <linux/uaccess.h> #define __EXEC_OBJECT_HAS_PIN (1<<31) #define __EXEC_OBJECT_HAS_FENCE (1<<30) @@ -465,7 +466,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, } /* We can't wait for rendering with pagefaults disabled */ - if (obj->active && in_atomic()) + if (obj->active && pagefault_disabled()) return -EFAULT; if (use_cpu_reloc(obj)) -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|