aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-07-27 05:18:55 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2018-07-27 06:05:28 -0400
commit7a859c655d8f9e83d95ad8e4722c0da6b29590d6 (patch)
tree6ada293e484fb5a50d854b92c19fee69b5c7a2e6 /drivers/gpu/drm/i915/intel_ringbuffer.c
parent6dc17d69f83ec315157b76fbf47d4379e1266cef (diff)
drm/i915: Eliminate use of PAGE_SIZE as a virtual alignment
Using PAGE_SIZE for virtual offset alignment is superfluous as it is equal to the minimum gtt alignment and so equivalent to 0. It is also the wrong value to use as we stopped using physical page constructs for the virtual GTT, i.e. it would be preferrable to use I915_GTT_PAGE_SIZE and in these cases merely imply I915_GTT_MIN_ALIGNMENT. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180727091855.1879-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 33faad3197fe..27b24000412f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -1035,7 +1035,7 @@ int intel_ring_pin(struct intel_ring *ring,
1035 return ret; 1035 return ret;
1036 } 1036 }
1037 1037
1038 ret = i915_vma_pin(vma, 0, PAGE_SIZE, flags); 1038 ret = i915_vma_pin(vma, 0, 0, flags);
1039 if (unlikely(ret)) 1039 if (unlikely(ret))
1040 return ret; 1040 return ret;
1041 1041
@@ -1220,8 +1220,7 @@ static int __context_pin(struct intel_context *ce)
1220 return err; 1220 return err;
1221 } 1221 }
1222 1222
1223 err = i915_vma_pin(vma, 0, I915_GTT_MIN_ALIGNMENT, 1223 err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
1224 PIN_GLOBAL | PIN_HIGH);
1225 if (err) 1224 if (err)
1226 return err; 1225 return err;
1227 1226