On Tue, Jan 05, 2016 at 05:54:07PM +0100, Daniel Vetter wrote:
> They're causing massive amounts of dmesg noise and hence CI noise all
> over the place. Enabling them for a bit was good enough to refresh our
> task list of what's still needed to enable rpm by default.
>
> To make sure we're not forgetting to make this noisy again add a FIXME
> comment.
>
> Fixes: da5827c36607 ("drm/i915: add assert_rpm_wakelock_held helper")
> Cc: Imre Deak <imre.d...@intel.com>
> Cc: drm-intel-fi...@lists.freedesktop.org
> Cc: Chris Wilson <ch...@chris-wilson.co.uk>
> Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com>
Applied to dinq.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_drv.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 187f632aa0ee..d6a8a4730b91 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -1453,8 +1453,10 @@ static inline void
> assert_rpm_wakelock_held(struct drm_i915_private *dev_priv)
> {
> assert_rpm_device_not_suspended(dev_priv);
> - WARN_ONCE(!atomic_read(&dev_priv->pm.wakeref_count),
> - "RPM wakelock ref not held during HW access");
> + /* FIXME: Needs to be converted back to WARN_ONCE, but currently causes
> + * too much noise. */
> + if (!atomic_read(&dev_priv->pm.wakeref_count))
> + DRM_DEBUG_DRIVER("RPM wakelock ref not held during HW access");
> }
>
> static inline int
> --
> 2.6.4
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
