diff options
author | John Harrison <John.C.Harrison@Intel.com> | 2015-05-29 12:44:06 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 08:02:28 -0400 |
commit | bba09b12b47b31b147206f5784691d2fb8888bf1 (patch) | |
tree | 57fc2d64dd7b9bad1d75a35280c637dee947def2 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | f71696876a16c3d68d27db71d93f389ae440171c (diff) |
drm/i915: Update cacheline_align() to take a request structure
Updated intel_ring_cacheline_align() to take a request instead of a ring.
For: VIZ-5115
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index e6ef8d796311..6a77014e1d66 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -2311,8 +2311,9 @@ int intel_ring_begin(struct intel_engine_cs *ring, | |||
2311 | } | 2311 | } |
2312 | 2312 | ||
2313 | /* Align the ring tail to a cacheline boundary */ | 2313 | /* Align the ring tail to a cacheline boundary */ |
2314 | int intel_ring_cacheline_align(struct intel_engine_cs *ring) | 2314 | int intel_ring_cacheline_align(struct drm_i915_gem_request *req) |
2315 | { | 2315 | { |
2316 | struct intel_engine_cs *ring = req->ring; | ||
2316 | int num_dwords = (ring->buffer->tail & (CACHELINE_BYTES - 1)) / sizeof(uint32_t); | 2317 | int num_dwords = (ring->buffer->tail & (CACHELINE_BYTES - 1)) / sizeof(uint32_t); |
2317 | int ret; | 2318 | int ret; |
2318 | 2319 | ||