34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: David Hildenbrand <dahi@linux.vnet.ibm.com>
|
|
Date: Mon, 11 May 2015 17:52:12 +0200
|
|
Subject: mm/fault, drm/i915: Use pagefault_disabled() to check for disabled pagefaults
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.1/patches-4.1.3-rt3.tar.xz
|
|
|
|
Now that the pagefault disabled counter is in place, we can replace
|
|
the in_atomic() check by a pagefault_disabled() checks.
|
|
|
|
[upstream commit 32d8206725bcf6e3ce7832ac39e61a6ecfd558db]
|
|
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
|
|
---
|
|
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- 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(struc
|
|
}
|
|
|
|
/* 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))
|