diff options
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index a3190e793ed4..cc552a4c1f3b 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include "i915_trace.h" | 32 | #include "i915_trace.h" |
| 33 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
| 34 | #include <linux/dma_remapping.h> | 34 | #include <linux/dma_remapping.h> |
| 35 | #include <linux/uaccess.h> | ||
| 35 | 36 | ||
| 36 | #define __EXEC_OBJECT_HAS_PIN (1<<31) | 37 | #define __EXEC_OBJECT_HAS_PIN (1<<31) |
| 37 | #define __EXEC_OBJECT_HAS_FENCE (1<<30) | 38 | #define __EXEC_OBJECT_HAS_FENCE (1<<30) |
| @@ -465,7 +466,7 @@ i915_gem_execbuffer_relocate_entry(struct drm_i915_gem_object *obj, | |||
| 465 | } | 466 | } |
| 466 | 467 | ||
| 467 | /* We can't wait for rendering with pagefaults disabled */ | 468 | /* We can't wait for rendering with pagefaults disabled */ |
| 468 | if (obj->active && in_atomic()) | 469 | if (obj->active && pagefault_disabled()) |
| 469 | return -EFAULT; | 470 | return -EFAULT; |
| 470 | 471 | ||
| 471 | if (use_cpu_reloc(obj)) | 472 | if (use_cpu_reloc(obj)) |
