[PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON()

[Daniel Vetter]

On Mon, Feb 22, 2016 at 02:22:49PM -0500, Lyude wrote:
> These warnings still seem to be present with DP MST configurations. They
> don't actually indicate any impending doom, so we may as well use
> I915_STATE_WARN_ON() here to help quiet things down a little bit for
> distro kernel users.
> 
> Signed-off-by: Lyude <cpaul at redhat.com>

I thought we've fixed up all offenders in drm-intel-nightly? Can you pls
confirm this is the case - this isn't something we should shrug off ...

Also, I kinda wonder whether we should try another attempt at enabling
this, in 4.6/fc rawhide perhaps, and see what happens? We /should/ be a
lot better with all this fail now.

I guess if this is all fixed in upstream/4.6 already then we could apply
this to 4.5 and stable kernels. But I don't really want this in upstream,
if it can be avoided.

Thanks, Daniel

> ---
>  drivers/gpu/drm/i915/intel_pm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index a234687..1870185 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3545,7 +3545,7 @@ static void skl_update_other_pipe_wm(struct drm_device *dev,
>  		 * because it was really needed, so we expect the WM values to
>  		 * be different.
>  		 */
> -		WARN_ON(!wm_changed);
> +		I915_STATE_WARN_ON(!wm_changed);
>  
>  		skl_compute_wm_results(dev, &pipe_wm, r, intel_crtc);
>  		r->dirty[intel_crtc->pipe] = true;
> -- 
> 2.5.0
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch