aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_execbuffer.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem_execbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_execbuffer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
index 8fd00d279447..1328bc5021b4 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -668,7 +668,7 @@ need_reloc_mappable(struct i915_vma *vma)
668 if (entry->relocation_count == 0) 668 if (entry->relocation_count == 0)
669 return false; 669 return false;
670 670
671 if (!i915_is_ggtt(vma->vm)) 671 if (!vma->is_ggtt)
672 return false; 672 return false;
673 673
674 /* See also use_cpu_reloc() */ 674 /* See also use_cpu_reloc() */
@@ -687,8 +687,7 @@ eb_vma_misplaced(struct i915_vma *vma)
687 struct drm_i915_gem_exec_object2 *entry = vma->exec_entry; 687 struct drm_i915_gem_exec_object2 *entry = vma->exec_entry;
688 struct drm_i915_gem_object *obj = vma->obj; 688 struct drm_i915_gem_object *obj = vma->obj;
689 689
690 WARN_ON(entry->flags & __EXEC_OBJECT_NEEDS_MAP && 690 WARN_ON(entry->flags & __EXEC_OBJECT_NEEDS_MAP && !vma->is_ggtt);
691 !i915_is_ggtt(vma->vm));
692 691
693 if (entry->alignment && 692 if (entry->alignment &&
694 vma->node.start & (entry->alignment - 1)) 693 vma->node.start & (entry->alignment - 1))