All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mika Kuoppala <mika.kuoppala@linux.intel.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/2] drm/i915: Move get-reset-stats ioctl from	intel_uncore.c to i915_gem_context.c
Date: Fri, 13 May 2016 12:51:00 +0300	[thread overview]
Message-ID: <87twi2mgl7.fsf@gaia.fi.intel.com> (raw)
In-Reply-To: <1463132353-3628-1-git-send-email-chris@chris-wilson.co.uk>

Chris Wilson <chris@chris-wilson.co.uk> writes:

> [ text/plain ]
> The get-reset-stats ioctl reports upon the statistics (number of hangs,
> be it as a victim or the guilty party) of a particular context. It is
> semantically better as being part of i915_gem_context.c user interface,
> as opposed to the hardware level access of intel_uncore.c
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>

> ---
>  drivers/gpu/drm/i915/i915_dma.c         |  2 +-
>  drivers/gpu/drm/i915/i915_drv.h         |  4 ++--
>  drivers/gpu/drm/i915/i915_gem_context.c | 39 +++++++++++++++++++++++++++++++++
>  drivers/gpu/drm/i915/intel_uncore.c     | 39 ---------------------------------
>  4 files changed, 42 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index e42fa1769c10..05b2b1901d60 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1631,7 +1631,7 @@ const struct drm_ioctl_desc i915_ioctls[] = {
>  	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_REG_READ, i915_reg_read_ioctl, DRM_RENDER_ALLOW),
> -	DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_get_reset_stats_ioctl, DRM_RENDER_ALLOW),
> +	DRM_IOCTL_DEF_DRV(I915_GET_RESET_STATS, i915_gem_context_reset_stats_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_USERPTR, i915_gem_userptr_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),
>  	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_SETPARAM, i915_gem_context_setparam_ioctl, DRM_RENDER_ALLOW),
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 7a0b51301337..d9d07b70f05c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3362,6 +3362,8 @@ int i915_gem_context_getparam_ioctl(struct drm_device *dev, void *data,
>  				    struct drm_file *file_priv);
>  int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
>  				    struct drm_file *file_priv);
> +int i915_gem_context_reset_stats_ioctl(struct drm_device *dev, void *data,
> +				       struct drm_file *file);
>  
>  /* i915_gem_evict.c */
>  int __must_check i915_gem_evict_something(struct drm_device *dev,
> @@ -3578,8 +3580,6 @@ extern void intel_detect_pch(struct drm_device *dev);
>  extern bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv);
>  int i915_reg_read_ioctl(struct drm_device *dev, void *data,
>  			struct drm_file *file);
> -int i915_get_reset_stats_ioctl(struct drm_device *dev, void *data,
> -			       struct drm_file *file);
>  
>  /* overlay */
>  extern struct intel_overlay_error_state *
> diff --git a/drivers/gpu/drm/i915/i915_gem_context.c b/drivers/gpu/drm/i915/i915_gem_context.c
> index 0fffebcc0ace..f3c76ca6b411 100644
> --- a/drivers/gpu/drm/i915/i915_gem_context.c
> +++ b/drivers/gpu/drm/i915/i915_gem_context.c
> @@ -1040,3 +1040,42 @@ int i915_gem_context_setparam_ioctl(struct drm_device *dev, void *data,
>  
>  	return ret;
>  }
> +
> +int i915_gem_context_reset_stats_ioctl(struct drm_device *dev,
> +				       void *data, struct drm_file *file)
> +{
> +	struct drm_i915_private *dev_priv = dev->dev_private;
> +	struct drm_i915_reset_stats *args = data;
> +	struct i915_ctx_hang_stats *hs;
> +	struct intel_context *ctx;
> +	int ret;
> +
> +	if (args->flags || args->pad)
> +		return -EINVAL;
> +
> +	if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN))
> +		return -EPERM;
> +
> +	ret = mutex_lock_interruptible(&dev->struct_mutex);
> +	if (ret)
> +		return ret;
> +
> +	ctx = i915_gem_context_get(file->driver_priv, args->ctx_id);
> +	if (IS_ERR(ctx)) {
> +		mutex_unlock(&dev->struct_mutex);
> +		return PTR_ERR(ctx);
> +	}
> +	hs = &ctx->hang_stats;
> +
> +	if (capable(CAP_SYS_ADMIN))
> +		args->reset_count = i915_reset_count(&dev_priv->gpu_error);
> +	else
> +		args->reset_count = 0;
> +
> +	args->batch_active = hs->batch_active;
> +	args->batch_pending = hs->batch_pending;
> +
> +	mutex_unlock(&dev->struct_mutex);
> +
> +	return 0;
> +}
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 0b1bd07dd04a..385114bca924 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1460,45 +1460,6 @@ out:
>  	return ret;
>  }
>  
> -int i915_get_reset_stats_ioctl(struct drm_device *dev,
> -			       void *data, struct drm_file *file)
> -{
> -	struct drm_i915_private *dev_priv = dev->dev_private;
> -	struct drm_i915_reset_stats *args = data;
> -	struct i915_ctx_hang_stats *hs;
> -	struct intel_context *ctx;
> -	int ret;
> -
> -	if (args->flags || args->pad)
> -		return -EINVAL;
> -
> -	if (args->ctx_id == DEFAULT_CONTEXT_HANDLE && !capable(CAP_SYS_ADMIN))
> -		return -EPERM;
> -
> -	ret = mutex_lock_interruptible(&dev->struct_mutex);
> -	if (ret)
> -		return ret;
> -
> -	ctx = i915_gem_context_get(file->driver_priv, args->ctx_id);
> -	if (IS_ERR(ctx)) {
> -		mutex_unlock(&dev->struct_mutex);
> -		return PTR_ERR(ctx);
> -	}
> -	hs = &ctx->hang_stats;
> -
> -	if (capable(CAP_SYS_ADMIN))
> -		args->reset_count = i915_reset_count(&dev_priv->gpu_error);
> -	else
> -		args->reset_count = 0;
> -
> -	args->batch_active = hs->batch_active;
> -	args->batch_pending = hs->batch_pending;
> -
> -	mutex_unlock(&dev->struct_mutex);
> -
> -	return 0;
> -}
> -
>  static int i915_reset_complete(struct pci_dev *pdev)
>  {
>  	u8 gdrst;
> -- 
> 2.8.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2016-05-13  9:53 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-12 10:25 [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Chris Wilson
2016-05-12 10:25 ` [PATCH 2/2] drm/i915: Stop automatically retiring requests after a GPU hang Chris Wilson
2016-05-13  7:57   ` [PATCH v2] " Chris Wilson
2016-05-13  8:43     ` Mika Kuoppala
2016-05-13  9:38       ` Chris Wilson
2016-05-13  9:39       ` [PATCH 1/2] drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c Chris Wilson
2016-05-13  9:39         ` [PATCH 2/2] drm/i915: Complete pending resets before get-reset-stats ioctl Chris Wilson
2016-05-13 10:12           ` Mika Kuoppala
2016-05-13  9:51         ` Mika Kuoppala [this message]
2016-05-13 10:48     ` [PATCH v2] drm/i915: Stop automatically retiring requests after a GPU hang Mika Kuoppala
2016-05-13  8:25 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915: Stop retiring requests from busy-ioctl (rev2) Patchwork
2016-05-13  8:38 ` [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Tvrtko Ursulin
2016-05-13  8:50   ` Chris Wilson
2016-05-13  9:01     ` Tvrtko Ursulin
2016-05-13 10:30       ` [PATCH v2] drm/i915: Stop retiring requests from busy/wait ioctls Chris Wilson
2016-05-13  9:48 ` ✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915: Stop retiring requests from busy-ioctl (rev4) Patchwork
2016-05-13 10:40 ` [PATCH 1/2] drm/i915: Stop retiring requests from busy-ioctl Mika Kuoppala
2016-05-13 11:00 ` ✗ Ro.CI.BAT: failure for series starting with [v2] drm/i915: Stop retiring requests from busy/wait ioctls (rev5) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87twi2mgl7.fsf@gaia.fi.intel.com \
    --to=mika.kuoppala@linux.intel.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.