diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2015-05-29 17:43:57 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:02:21 +0200 |
| commit | a84c3ae168837dbedd0bde76a536360e84ae863a (patch) | |
| tree | 1671b7eac2c6f2faa4587f5f8268f470494b8dd3 /drivers/gpu/drm/i915/i915_gem_context.c | |
| parent | e85b26dc1ca5ecbf6456c61a131a986a755cbc69 (diff) | |
| download | op-kernel-dev-a84c3ae168837dbedd0bde76a536360e84ae863a.zip op-kernel-dev-a84c3ae168837dbedd0bde76a536360e84ae863a.tar.gz | |
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/i915_gem_context.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index a223c9d..c80b59d 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -495,7 +495,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags) * itlb_before_ctx_switch. */ if (IS_GEN6(ring->dev)) { - ret = ring->flush(ring, I915_GEM_GPU_DOMAINS, 0); + ret = ring->flush(req, I915_GEM_GPU_DOMAINS, 0); if (ret) return ret; } |
