dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON()
@ 2016-02-22 19:22 Lyude
  2016-02-29 15:47 ` Daniel Vetter
  0 siblings, 1 reply; 3+ messages in thread
From: Lyude @ 2016-02-22 19:22 UTC (permalink / raw)
  To: intel-gfx
  Cc: Rob Clark, David Airlie,
	open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list,
	Daniel Vetter

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@redhat.com>
---
 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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON()
  2016-02-22 19:22 [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON() Lyude
@ 2016-02-29 15:47 ` Daniel Vetter
  2016-02-29 16:19   ` Rob Clark
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2016-02-29 15:47 UTC (permalink / raw)
  To: Lyude
  Cc: Daniel Vetter, intel-gfx, Rob Clark,
	open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list

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@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON()
  2016-02-29 15:47 ` Daniel Vetter
@ 2016-02-29 16:19   ` Rob Clark
  0 siblings, 0 replies; 3+ messages in thread
From: Rob Clark @ 2016-02-29 16:19 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: Daniel Vetter, intel-gfx,
	open list:INTEL DRM DRIVERS excluding Poulsbo, Moorestow..., linux-kernel@vger.kernel.org open list

On Feb 29 2016 or thereabouts, Daniel Vetter wrote:
> 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@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 ...
 
I was still seeing this w/ nightly as of perhaps ~mid last week..

Note that upstream default is still to have verbose state warn's so this
would still be the splat that you want to see ;-)

BR,
-R

> 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@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/dri-devel
> 
> -- 
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-29 16:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-22 19:22 [PATCH] drm/i915: Change WARN_ON(!wm_changed) to I915_STATE_WARN_ON() Lyude
2016-02-29 15:47 ` Daniel Vetter
2016-02-29 16:19   ` Rob Clark

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).