diff options
| author | Chris Wilson | 2018-06-30 11:05:09 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-07-02 18:36:09 +0200 |
| commit | 7e7367d3bc6cf27dd7e007e7897fcebfeff1ee8b (patch) | |
| tree | 188142c2868774a07fdd60ec47f26b6e69cb3ea0 /drivers/gpu/drm/i915/i915_vma.c | |
| parent | drm/i915: abstract and document register picking macros (diff) | |
| download | kernel-qcow2-linux-7e7367d3bc6cf27dd7e007e7897fcebfeff1ee8b.tar.gz kernel-qcow2-linux-7e7367d3bc6cf27dd7e007e7897fcebfeff1ee8b.tar.xz kernel-qcow2-linux-7e7367d3bc6cf27dd7e007e7897fcebfeff1ee8b.zip | |
drm/i915: Try GGTT mmapping whole object as partial
If the whole object is already pinned by HW for use as scanout, we will
fail to move it to the mappable region and so must resort to using a
partial VMA covering the whole object.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104513
Fixes: aa136d9d72c2 ("drm/i915: Convert partial ggtt vma to full ggtt if it spans the entire object")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: Matthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180630090509.469-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/i915_vma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_vma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index d0e606e9b27a..de2b6d65e865 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -143,7 +143,7 @@ vma_create(struct drm_i915_gem_object *obj, obj->base.size >> PAGE_SHIFT)); vma->size = view->partial.size; vma->size <<= PAGE_SHIFT; - GEM_BUG_ON(vma->size >= obj->base.size); + GEM_BUG_ON(vma->size > obj->base.size); } else if (view->type == I915_GGTT_VIEW_ROTATED) { vma->size = intel_rotation_info_size(&view->rotated); vma->size <<= PAGE_SHIFT; |