| Message ID | 1426768264-16996-25-git-send-email-John.C.Harrison@Intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 19/03/2015 12:30, John.C.Harrison@Intel.com wrote: > From: John Harrison <John.C.Harrison@Intel.com> > > Updated do_switch() to take a request pointer instead of a ring/context pair. > > For: VIZ-5115 > Signed-off-by: John Harrison <John.C.Harrison@Intel.com> > > v2: Removed some overzealous req-> dereferencing. > --- > drivers/gpu/drm/i915/i915_gem_context.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c > index 26d5816..78e9c9c 100644 > --- a/drivers/gpu/drm/i915/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/i915_gem_context.c > @@ -560,9 +560,10 @@ mi_set_context(struct intel_engine_cs *ring, > return ret; > } > > -static int do_switch(struct intel_engine_cs *ring, > - struct intel_context *to) > +static int do_switch(struct drm_i915_gem_request *req) > { > + struct intel_context *to = req->ctx; > + struct intel_engine_cs *ring = req->ring; > struct drm_i915_private *dev_priv = ring->dev->dev_private; > struct intel_context *from = ring->last_context; > u32 hw_flags = 0; > @@ -726,7 +727,7 @@ int i915_switch_context(struct drm_i915_gem_request *req) > return 0; > } > > - return do_switch(req->ring, req->ctx); > + return do_switch(req); > } > > static bool contexts_enabled(struct drm_device *dev) > Reviewed-by: Tomas Elf <tomas.elf@intel.com> Thanks, Tomas
diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c index 26d5816..78e9c9c 100644 --- a/drivers/gpu/drm/i915/i915_gem_context.c +++ b/drivers/gpu/drm/i915/i915_gem_context.c @@ -560,9 +560,10 @@ mi_set_context(struct intel_engine_cs *ring, return ret; } -static int do_switch(struct intel_engine_cs *ring, - struct intel_context *to) +static int do_switch(struct drm_i915_gem_request *req) { + struct intel_context *to = req->ctx; + struct intel_engine_cs *ring = req->ring; struct drm_i915_private *dev_priv = ring->dev->dev_private; struct intel_context *from = ring->last_context; u32 hw_flags = 0; @@ -726,7 +727,7 @@ int i915_switch_context(struct drm_i915_gem_request *req) return 0; } - return do_switch(req->ring, req->ctx); + return do_switch(req); } static bool contexts_enabled(struct drm_device *dev)