Commit 924090f4 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Refactor out intel_context_init() 



Prior to adding a third instance of intel_context_init() and extending
the information stored therewithin, refactor out the common assignments.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190121222117.23305-8-chris@chris-wilson.co.uk
parent 1579ab2d

drivers/gpu/drm/i915/i915_gem_context.c

+2 −5
Original line number Diff line number Diff line
@@ -338,11 +338,8 @@ __create_hw_context(struct drm_i915_private *dev_priv, 
	ctx->i915 = dev_priv;

	ctx->sched.priority = I915_USER_PRIORITY(I915_PRIORITY_NORMAL);



	for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) {

		struct intel_context *ce = &ctx->__engine[n];



		ce->gem_context = ctx;

	}

	for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++)

		intel_context_init(&ctx->__engine[n], ctx, dev_priv->engine[n]);



	INIT_RADIX_TREE(&ctx->handles_vma, GFP_KERNEL);

	INIT_LIST_HEAD(&ctx->handles_list);

drivers/gpu/drm/i915/i915_gem_context.h

+8 −0
Original line number Diff line number Diff line
@@ -364,4 +364,12 @@ static inline void i915_gem_context_put(struct i915_gem_context *ctx) 
	kref_put(&ctx->ref, i915_gem_context_release);

}



static inline void

intel_context_init(struct intel_context *ce,

		   struct i915_gem_context *ctx,

		   struct intel_engine_cs *engine)

{

	ce->gem_context = ctx;

}



#endif /* !__I915_GEM_CONTEXT_H__ */

drivers/gpu/drm/i915/selftests/mock_context.c

+2 −5
Original line number Diff line number Diff line
@@ -45,11 +45,8 @@ mock_context(struct drm_i915_private *i915, 
	INIT_LIST_HEAD(&ctx->handles_list);

	INIT_LIST_HEAD(&ctx->hw_id_link);



	for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++) {

		struct intel_context *ce = &ctx->__engine[n];



		ce->gem_context = ctx;

	}

	for (n = 0; n < ARRAY_SIZE(ctx->__engine); n++)

		intel_context_init(&ctx->__engine[n], ctx, i915->engine[n]);



	ret = i915_gem_context_pin_hw_id(ctx);

	if (ret < 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE