aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.h
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2015-05-29 12:44:07 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 08:02:29 -0400
commit5fb9de1a2ea1968b57c906c6770794f1e7744828 (patch)
tree378728ad7bce8217c51b4606dcf58a1839c1e34b /drivers/gpu/drm/i915/intel_ringbuffer.h
parentbba09b12b47b31b147206f5784691d2fb8888bf1 (diff)
drm/i915: Update intel_ring_begin() to take a request structure
Now that everything above has been converted to use requests, intel_ring_begin() can be updated to take a request instead of a ring. This also means that it no longer needs to lazily allocate a request if no-one happens to have done it earlier. 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.h')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 8a5317bba112..00a4ff7593ce 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -421,7 +421,7 @@ void intel_cleanup_ring_buffer(struct intel_engine_cs *ring);
421 421
422int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request); 422int intel_ring_alloc_request_extras(struct drm_i915_gem_request *request);
423 423
424int __must_check intel_ring_begin(struct intel_engine_cs *ring, int n); 424int __must_check intel_ring_begin(struct drm_i915_gem_request *req, int n);
425int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req); 425int __must_check intel_ring_cacheline_align(struct drm_i915_gem_request *req);
426static inline void intel_ring_emit(struct intel_engine_cs *ring, 426static inline void intel_ring_emit(struct intel_engine_cs *ring,
427 u32 data) 427 u32 data)