|
@@ -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))
|