[Intel-gfx] [PATCH 09/12] drm/i915: Put the kernel_context in drm_i915_private next to its friends

[Tvrtko Ursulin]

On 22/05/16 14:02, Chris Wilson wrote:
> Just move the kernel_context memboer of drm_i915_private next to the
> engines it is associated with.
>
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.h            | 3 +--
>   drivers/gpu/drm/i915/i915_guc_submission.c | 5 +++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e6735dc9eeb2..d3d2538d17e8 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1760,6 +1760,7 @@ struct drm_i915_private {
>   	wait_queue_head_t gmbus_wait_queue;
>
>   	struct pci_dev *bridge_dev;
> +	struct i915_gem_context *kernel_context;
>   	struct intel_engine_cs engine[I915_NUM_ENGINES];
>   	struct drm_i915_gem_object *semaphore_obj;
>   	uint32_t last_seqno, next_seqno;
> @@ -2013,8 +2014,6 @@ struct drm_i915_private {
>   		void (*stop_engine)(struct intel_engine_cs *engine);
>   	} gt;
>
> -	struct i915_gem_context *kernel_context;
> -
>   	/* perform PHY state sanity checks? */
>   	bool chv_phy_assert[2];

OK bit.

>
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index c29c1d19764f..78b70526c197 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -912,11 +912,12 @@ int i915_guc_submission_enable(struct drm_device *dev)
>   {
>   	struct drm_i915_private *dev_priv = dev->dev_private;
>   	struct intel_guc *guc = &dev_priv->guc;
> -	struct i915_gem_context *ctx = dev_priv->kernel_context;
>   	struct i915_guc_client *client;
>
>   	/* client for execbuf submission */
> -	client = guc_client_alloc(dev, GUC_CTX_PRIORITY_KMD_NORMAL, ctx);
> +	client = guc_client_alloc(dev,
> +				  GUC_CTX_PRIORITY_KMD_NORMAL,
> +				  dev_priv->kernel_context);
>   	if (!client) {
>   		DRM_ERROR("Failed to create execbuf guc_client\n");
>   		return -ENOMEM;
>

Churn bit. :)

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko