diff options
| author | John Harrison <John.C.Harrison@Intel.com> | 2015-05-29 17:43:41 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-06-23 14:02:09 +0200 |
| commit | ba01cc9346bce45a8861f36bce2c4c5d44b800b2 (patch) | |
| tree | bad9f082b684d4dfde399ae182915ded21439099 /drivers/gpu/drm/i915/i915_gem_execbuffer.c | |
| parent | b3dd6b9681e4116bce4dd1145cb162a5a48bac8e (diff) | |
| download | lwn-ba01cc9346bce45a8861f36bce2c4c5d44b800b2.tar.gz lwn-ba01cc9346bce45a8861f36bce2c4c5d44b800b2.zip | |
drm/i915: Update i915_switch_context() to take a request structure
Now that the request is guaranteed to specify the context, it is possible to
update the context switch code to use requests rather than ring and context
pairs. This patch updates i915_switch_context() accordingly.
Also removed the warning that the request's context must match the last context
switch's context. As the context switch now gets the context object from the
request structure, there is no longer any scope for the two to become out of
step.
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/i915_gem_execbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index a15517249bb9..d0ced5b04f4d 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1250,7 +1250,7 @@ i915_gem_ringbuffer_submission(struct i915_execbuffer_params *params, if (ret) goto error; - ret = i915_switch_context(ring, params->ctx); + ret = i915_switch_context(params->request); if (ret) goto error; |