[Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON

[Laxminarayan Bharadiya, Pankaj]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of
> Laxminarayan Bharadiya, Pankaj
> Sent: 24 February 2020 13:39
> To: Chris Wilson <chris at chris-wilson.co.uk>; Nikula, Jani
> <jani.nikula at intel.com>
> Cc: intel-gfx at lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
> 
> 
> 
> > -----Original Message-----
> > From: Chris Wilson <chris at chris-wilson.co.uk>
> > Sent: 23 February 2020 23:10
> > To: intel-gfx at lists.freedesktop.org
> > Cc: Chris Wilson <chris at chris-wilson.co.uk>; Laxminarayan Bharadiya,
> > Pankaj <pankaj.laxminarayan.bharadiya at intel.com>; Nikula, Jani
> > <jani.nikula at intel.com>
> > Subject: [PATCH] drm/i915/display: Fix inverted WARN_ON
> >
> > Restore the previous WARN_ON(cond) so that we don't complain about
> > poor old Cherryview.
> >
> > Fixes: eb020ca3d43f ("drm/i915/display/dp: Make WARN* drm specific
> > where drm_device ptr is available")
> 
> Fixes seems to be wrong.
> 
> The commit " eb020ca3d43f" just does the replacement and does not modify
> any existing condition.
> 
> -       if (WARN_ON(!IS_VALLEYVIEW(dev_priv) &&
> !IS_CHERRYVIEW(dev_priv) &&
> -                   !IS_GEN9_LP(dev_priv)))
> +       if (drm_WARN_ON(&dev_priv->drm, !IS_VALLEYVIEW(dev_priv) &&
> +                       IS_CHERRYVIEW(dev_priv) &&

Oops, looks like I accidentally removed !  while fixing checkpatch 80 char warnings ( *!*IS_CHERRYVIEW(dev_priv)) ☹.

-
Pankaj


> +                       !IS_GEN9_LP(dev_priv)))
> 
> Will you please double check and confirm.
> 
> Thanks,
> Pankaj
> 
> > Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> > Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya at intel.com>
> > Cc: Jani Nikula <jani.nikula at intel.com>
> > ---
> >  drivers/gpu/drm/i915/display/intel_dp.c | 7 ++++---
> >  1 file changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> > b/drivers/gpu/drm/i915/display/intel_dp.c
> > index 2f93326c16a3..e8bebd27004d 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> > @@ -1023,9 +1023,10 @@ void intel_power_sequencer_reset(struct
> > drm_i915_private *dev_priv)  {
> >  	struct intel_encoder *encoder;
> >
> > -	if (drm_WARN_ON(&dev_priv->drm, !IS_VALLEYVIEW(dev_priv) &&
> > -			IS_CHERRYVIEW(dev_priv) &&
> > -			!IS_GEN9_LP(dev_priv)))
> > +	if (drm_WARN_ON(&dev_priv->drm,
> > +			!(IS_VALLEYVIEW(dev_priv) ||
> > +			  IS_CHERRYVIEW(dev_priv) ||
> > +			  IS_GEN9_LP(dev_priv))))
> >  		return;
> >
> >  	/*
> > --
> > 2.25.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx