Chris Wilson <[email protected]> writes:
> 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: Chris Wilson <[email protected]>
> Cc: Mika Kuoppala <[email protected]>
> ---
> drivers/gpu/drm/i915/i915_drv.h | 2 ++
> drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++++
> 2 files changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 66f19924828a..28d8e95b4a14 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -937,6 +937,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;
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c
> b/drivers/gpu/drm/i915/i915_gpu_error.c
> index b4ae1464e0ab..8e14986f123c 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -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));
Why not print the count as we have it?
-Mika
> + 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++)
> @@ -1655,6 +1657,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
> --
> 2.11.0
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
