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

Commit 7367612f authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/i915: Emit a user level message when resetting the GPU (or engine) 



Although a banned context will be told to -EIO off if they try to submit
more requests, we have a discrepancy between whole device resets and
per-engine resets where we report the GPU reset but not the engine
resets. This leaves a bit of mystery as to why the context was banned,
and also reduces awareness overall of when a GPU (engine) reset occurs
with its possible side-effects.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarMichel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170721123238.16428-13-chris@chris-wilson.co.uk


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 77b25a97

drivers/gpu/drm/i915/i915_drv.c

+5 −3
Original line number Diff line number Diff line
@@ -1861,9 +1861,10 @@ void i915_reset(struct drm_i915_private *dev_priv) 
	if (!i915_gem_unset_wedged(dev_priv))

		goto wakeup;



	dev_notice(dev_priv->drm.dev,

		   "Resetting chip after gpu hang\n");

	error->reset_count++;



	pr_notice("drm/i915: Resetting chip after gpu hang\n");

	disable_irq(dev_priv->drm.irq);

	ret = i915_gem_reset_prepare(dev_priv);

	if (ret) {
@@ -1941,7 +1942,9 @@ int i915_reset_engine(struct intel_engine_cs *engine) 


	GEM_BUG_ON(!test_bit(I915_RESET_ENGINE + engine->id, &error->flags));



	DRM_DEBUG_DRIVER("resetting %s\n", engine->name);

	dev_notice(engine->i915->drm.dev,

		   "Resetting %s after gpu hang\n", engine->name);

	error->reset_engine_count[engine->id]++;



	active_request = i915_gem_reset_prepare_engine(engine);

	if (IS_ERR(active_request)) {
@@ -1974,7 +1977,6 @@ int i915_reset_engine(struct intel_engine_cs *engine) 
	if (ret)

		goto out;



	error->reset_engine_count[engine->id]++;

out:

	i915_gem_reset_finish_engine(engine);

	return ret;