mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/
synced 2026-04-18 06:33:43 -04:00
drm/i915: Move request->ctx aside
In the next patch, we want to store the intel_context pointer inside i915_request, as it is frequently access via a convoluted dance when submitting the request to hw. Having two context pointers inside i915_request leads to confusion so first rename the existing i915_gem_context pointer to i915_request.gem_context. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180517212633.24934-1-chris@chris-wilson.co.uk
This commit is contained in:
@@ -105,7 +105,10 @@ static int emit_recurse_batch(struct hang *h,
|
||||
struct i915_request *rq)
|
||||
{
|
||||
struct drm_i915_private *i915 = h->i915;
|
||||
struct i915_address_space *vm = rq->ctx->ppgtt ? &rq->ctx->ppgtt->base : &i915->ggtt.base;
|
||||
struct i915_address_space *vm =
|
||||
rq->gem_context->ppgtt ?
|
||||
&rq->gem_context->ppgtt->base :
|
||||
&i915->ggtt.base;
|
||||
struct i915_vma *hws, *vma;
|
||||
unsigned int flags;
|
||||
u32 *batch;
|
||||
|
||||
Reference in New Issue
Block a user