| commit | 9e53d9be0d9e09f834d3bdfccafb8330f2597e6c | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Thu Aug 18 17:16:54 2016 +0100 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Thu Aug 18 22:36:47 2016 +0100 |
| tree | 33589b0d316fb2c4146bfb43acddde37f790c51d | |
| parent | e8cb909ac3abbcac5184825638903a2b9a225725 [diff] [blame] |
drm/i915: Disallow direct CPU access to stolen pages for relocations As we cannot access the backing pages behind stolen objects, we should not attempt to do so for relocations. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20160818161718.27187-15-chris@chris-wilson.co.uk
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index c970aab..98d5aa5 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -283,6 +283,9 @@ static inline int use_cpu_reloc(struct drm_i915_gem_object *obj) { + if (!i915_gem_object_has_struct_page(obj)) + return false; + if (DBG_USE_CPU_RELOC) return DBG_USE_CPU_RELOC > 0;