Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d538704b authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move get-reset-stats ioctl from intel_uncore.c to i915_gem_context.c 



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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1463137042-9669-1-git-send-email-chris@chris-wilson.co.uk
parent 1b6f4958

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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),

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -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 *

drivers/gpu/drm/i915/i915_gem_context.c

+39 −0
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/intel_uncore.c

+0 −39
Original line number Diff line number Diff line
@@ -1460,45 +1460,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, 
	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;