[Intel-gfx] [PATCH 2/2] drm/i915: Restore the invalid access without RPM warning

[Imre Deak]

On Thu, Mar 02, 2017 at 07:41:57AM +0000, Chris Wilson wrote:
> A long time ago we turned off the warning as it was too painful, we had
> too much broken code. Turn it back on now as we are mostly clean and
> need to prevent returning to such orangeness.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Imre Deak <imre.deak at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/intel_drv.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index b9d3e26b7023..0e96f4e6c2a1 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1744,8 +1744,8 @@ assert_rpm_wakelock_held(struct drm_i915_private *dev_priv)
>  	assert_rpm_device_not_suspended(dev_priv);
>  	/* FIXME: Needs to be converted back to WARN_ONCE, but currently causes
>  	 * too much noise. */

The comment can be removed too. Nice!
Reviewed-by: Imre Deak <imre.deak at intel.com>

> -	if (!atomic_read(&dev_priv->pm.wakeref_count))
> -		DRM_DEBUG_DRIVER("RPM wakelock ref not held during HW access");
> +	WARN_ONCE(!atomic_read(&dev_priv->pm.wakeref_count),
> +		  "RPM wakelock ref not held during HW access");
>  }
>  
>  /**
> -- 
> 2.11.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx