summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem_context.c
diff options
context:
space:
mode:
authorJohn Harrison <John.C.Harrison@Intel.com>2015-05-29 17:43:44 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2015-06-23 14:02:12 +0200
commit8753181e1006dcebc84127ce29b8f8166bb1ada3 (patch)
treecbd8beeb1fa7a6e404de868650b817f0336dfc83 /drivers/gpu/drm/i915/i915_gem_context.c
parent76c3916887f1225db4b4960c59820db1a995f3cb (diff)
downloadop-kernel-dev-8753181e1006dcebc84127ce29b8f8166bb1ada3.zip
op-kernel-dev-8753181e1006dcebc84127ce29b8f8166bb1ada3.tar.gz
drm/i915: Update init_context() to take a request structure
Now that everything above has been converted to use requests, it is possible to update init_context() to take a request pointer instead of a ring/context pair. 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_context.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem_context.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
index 116c983..4969fc4 100644
--- a/drivers/gpu/drm/i915/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/i915_gem_context.c
@@ -418,7 +418,7 @@ int i915_gem_context_enable(struct drm_i915_gem_request *req)
if (ring->init_context == NULL)
return 0;
- ret = ring->init_context(ring, ring->default_context);
+ ret = ring->init_context(req);
} else
ret = i915_switch_context(req);
@@ -760,7 +760,7 @@ done:
if (uninitialized) {
if (ring->init_context) {
- ret = ring->init_context(ring, to);
+ ret = ring->init_context(req);
if (ret)
DRM_ERROR("ring init context: %d\n", ret);
}
OpenPOWER on IntegriCloud