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 17:43:57 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 14:02:21 +0200
commita84c3ae168837dbedd0bde76a536360e84ae863a (patch)
tree1671b7eac2c6f2faa4587f5f8268f470494b8dd3 /drivers/gpu/drm/i915/intel_ringbuffer.h
parente85b26dc1ca5ecbf6456c61a131a986a755cbc69 (diff)
downloadkernel_replicant_linux-a84c3ae168837dbedd0bde76a536360e84ae863a.tar.gz
kernel_replicant_linux-a84c3ae168837dbedd0bde76a536360e84ae863a.tar.bz2
kernel_replicant_linux-a84c3ae168837dbedd0bde76a536360e84ae863a.zip
drm/i915: Update ring->flush() to take a requests structure
Updated the various ring->flush() functions to take a request instead of a ring. Also updated the tracer to include the request id. For: VIZ-5115 Signed-off-by: John Harrison <John.C.Harrison@Intel.com> Reviewed-by: Tomas Elf <tomas.elf@intel.com> [danvet: Rebase since I didn't merge the addition of req->uniq.] 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 3f70687a2dc6..4c0d3296b78f 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -180,7 +180,7 @@ struct intel_engine_cs {
void (*write_tail)(struct intel_engine_cs *ring,
u32 value);
- int __must_check (*flush)(struct intel_engine_cs *ring,
+ int __must_check (*flush)(struct drm_i915_gem_request *req,
u32 invalidate_domains,
u32 flush_domains);
int (*add_request)(struct intel_engine_cs *ring);