[Intel-gfx] [PATCH 01/13] drm/i915: add context parameter to i915_switch_context()

[Ben Widawsky]

On Tue, Feb 26, 2013 at 01:05:04PM +0200, Mika Kuoppala wrote:
> In preparation for the next commit, return context that
> was switch to from i915_switch_context().
> 
> Signed-off-by: Mika Kuoppala <mika.kuoppala at intel.com>

I'd suggest using ERR_PTR and PTR_ERR instead of the **ctx

> ---
>  drivers/gpu/drm/i915/i915_drv.h            |    3 ++-
>  drivers/gpu/drm/i915/i915_gem.c            |    2 +-
>  drivers/gpu/drm/i915/i915_gem_context.c    |   36 ++++++++++++++++++----------
>  drivers/gpu/drm/i915/i915_gem_execbuffer.c |    2 +-
>  4 files changed, 27 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index e95337c..27459ec 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -1671,7 +1671,8 @@ void i915_gem_context_init(struct drm_device *dev);
>  void i915_gem_context_fini(struct drm_device *dev);
>  void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);
>  int i915_switch_context(struct intel_ring_buffer *ring,
> -			struct drm_file *file, int to_id);
> +			struct drm_file *file, int to_id,
> +			struct i915_hw_context **ctx);
>  int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
>  				  struct drm_file *file);
>  int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data,
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 8413ffc..61610f3 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -2517,7 +2517,7 @@ int i915_gpu_idle(struct drm_device *dev)
>  
>  	/* Flush everything onto the inactive list. */
>  	for_each_ring(ring, dev_priv, i) {
> -		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID);
> +		ret = i915_switch_context(ring, NULL, DEFAULT_CONTEXT_ID, NULL);
>  		if (ret)
>  			return ret;
>  
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 21177d9..4125919 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -428,10 +428,9 @@ static int do_switch(struct i915_hw_context *to)
>  /**
>   * i915_switch_context() - perform a GPU context switch.
>   * @ring: ring for which we'll execute the context switch
> - * @file_priv: file_priv associated with the context, may be NULL
> - * @id: context id number
> - * @seqno: sequence number by which the new context will be switched to
> - * @flags:
> + * @file: file associated with the context, may be NULL
> + * @to_id: context id number
> + * @ctx: i915_hw_context we switched to, may be NULL
>   *
>   * The context life cycle is simple. The context refcount is incremented and
>   * decremented by 1 and create and destroy. If the context is in use by the GPU,
> @@ -440,29 +439,40 @@ static int do_switch(struct i915_hw_context *to)
>   */
>  int i915_switch_context(struct intel_ring_buffer *ring,
>  			struct drm_file *file,
> -			int to_id)
> +			int to_id,
> +			struct i915_hw_context **ctx)
>  {
>  	struct drm_i915_private *dev_priv = ring->dev->dev_private;
> -	struct i915_hw_context *to;
> +	struct i915_hw_context *to = NULL;
> +	int ret = 0;
>  
>  	if (dev_priv->hw_contexts_disabled)
> -		return 0;
> +		goto out;
>  
>  	if (ring != &dev_priv->ring[RCS])
> -		return 0;
> +		goto out;
>  
>  	if (to_id == DEFAULT_CONTEXT_ID) {
>  		to = ring->default_context;
>  	} else {
> -		if (file == NULL)
> -			return -EINVAL;
> +		if (file == NULL) {
> +			ret = -EINVAL;
> +			goto out;
> +		}
>  
>  		to = i915_gem_context_get(file->driver_priv, to_id);
> -		if (to == NULL)
> -			return -ENOENT;
> +		if (to == NULL) {
> +			ret = -ENOENT;
> +			goto out;
> +		}
>  	}
>  
> -	return do_switch(to);
> +	ret = do_switch(to);
> +out:
> +	if (ctx)
> +		*ctx = to;
> +
> +	return ret;
>  }
>  
>  int i915_gem_context_create_ioctl(struct drm_device *dev, void *data,
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 2f2daeb..499d025 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -1017,7 +1017,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data,
>  	if (ret)
>  		goto err;
>  
> -	ret = i915_switch_context(ring, file, ctx_id);
> +	ret = i915_switch_context(ring, file, ctx_id, NULL);
>  	if (ret)
>  		goto err;
>  
> -- 
> 1.7.9.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ben Widawsky, Intel Open Source Technology Center