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

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

drm/i915: Include power-management state in gpu error dump 



Useful for double checking that the device is powered up when it hung,
include both the status of the power management and our rpm wakelock.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302151544.16915-1-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
parent f73b5674

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -935,6 +935,8 @@ struct i915_gpu_state { 
	char error_msg[128];

	bool simulated;

	bool awake;

	bool wakelock;

	bool suspended;

	int iommu;

	u32 reset_count;

	u32 suspend_count;

drivers/gpu/drm/i915/i915_gpu_error.c

+4 −0
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, 
	}



	err_printf(m, "GT awake: %s\n", yesno(error->awake));

	err_printf(m, "RPM wakelock: %s\n", yesno(error->wakelock));

	err_printf(m, "PM suspended: %s\n", yesno(error->suspended));

	err_printf(m, "EIR: 0x%08x\n", error->eir);

	err_printf(m, "IER: 0x%08x\n", error->ier);

	for (i = 0; i < error->ngtier; i++)
@@ -1617,6 +1619,8 @@ static void i915_capture_gen_state(struct drm_i915_private *dev_priv, 
				   struct i915_gpu_state *error)

{

	error->awake = dev_priv->gt.awake;

	error->wakelock = atomic_read(&dev_priv->pm.wakeref_count);

	error->suspended = dev_priv->pm.suspended;



	error->iommu = -1;

#ifdef CONFIG_INTEL_IOMMU