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

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

[Chris Wilson]

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")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Cc: Jani Nikula <jani.nikula@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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Jani Nikula]

On Sun, 23 Feb 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 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")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Auch.

How did a cocci patch have something like this? Manual edits on top?

I did read the patches through, despite them being cocci stuff, but
missed this anyway.

But how did CI not complain? Did I miss the warning?

BR,
Jani.


> ---
>  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;
>  
>  	/*

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Laxminarayan Bharadiya, Pankaj]

> -----Original Message-----
> From: Chris Wilson <chris@chris-wilson.co.uk>
> Sent: 23 February 2020 23:10
> To: intel-gfx@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>; Laxminarayan Bharadiya, Pankaj
> <pankaj.laxminarayan.bharadiya@intel.com>; Nikula, Jani
> <jani.nikula@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) &&
+                       !IS_GEN9_LP(dev_priv)))

Will you please double check and confirm.

Thanks,
Pankaj

> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> Cc: Jani Nikula <jani.nikula@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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Laxminarayan Bharadiya, Pankaj]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Laxminarayan Bharadiya, Pankaj
> Sent: 24 February 2020 13:39
> To: Chris Wilson <chris@chris-wilson.co.uk>; Nikula, Jani
> <jani.nikula@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
> 
> 
> 
> > -----Original Message-----
> > From: Chris Wilson <chris@chris-wilson.co.uk>
> > Sent: 23 February 2020 23:10
> > To: intel-gfx@lists.freedesktop.org
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>; Laxminarayan Bharadiya,
> > Pankaj <pankaj.laxminarayan.bharadiya@intel.com>; Nikula, Jani
> > <jani.nikula@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@chris-wilson.co.uk>
> > Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > Cc: Jani Nikula <jani.nikula@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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Laxminarayan Bharadiya, Pankaj]

> -----Original Message-----
> From: Jani Nikula <jani.nikula@intel.com>
> Sent: 24 February 2020 11:43
> To: Chris Wilson <chris@chris-wilson.co.uk>; intel-gfx@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>; Laxminarayan Bharadiya, Pankaj
> <pankaj.laxminarayan.bharadiya@intel.com>
> Subject: Re: [PATCH] drm/i915/display: Fix inverted WARN_ON
> 
> On Sun, 23 Feb 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > 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")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> 
> Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> 
> Auch.
> 
> How did a cocci patch have something like this? Manual edits on top?

My bad.. I accidentally removed *!* for  IS_CHERRYVIEW(dev_priv) while fixing checkpatch  80 char warning.

Fix should be -

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 4c411a01b7ab..6ab9712b8f53 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1024,7 +1024,7 @@ 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_CHERRYVIEW(dev_priv) &&
                        !IS_GEN9_LP(dev_priv)))
                return;

Thanks,
Pankaj

> 
> I did read the patches through, despite them being cocci stuff, but missed this
> anyway.
> 
> But how did CI not complain? Did I miss the warning?
> 
> BR,
> Jani.
> 
> 
> > ---
> >  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;
> >
> >  	/*
> 
> --
> Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Chris Wilson]

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")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Cc: Jani Nikula <jani.nikula@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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Jani Nikula]

On Mon, 24 Feb 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 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")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> Cc: Jani Nikula <jani.nikula@intel.com>

Why the resubmission? Already r-b'd the original.

BR,
Jani.


> ---
>  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;
>  
>  	/*

-- 
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Chris Wilson]

Quoting Jani Nikula (2020-02-24 10:58:03)
> On Mon, 24 Feb 2020, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > 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")
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
> > Cc: Jani Nikula <jani.nikula@intel.com>
> 
> Why the resubmission? Already r-b'd the original.

Because I couldn't find it in patchwork this morning.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display: Fix inverted WARN_ON (rev3)

[Patchwork]

== Series Details ==

Series: drm/i915/display: Fix inverted WARN_ON (rev3)
URL   : https://patchwork.freedesktop.org/series/73823/
State : failure

== Summary ==

Applying: drm/i915/display: Fix inverted WARN_ON
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_dp.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
No changes -- Patch already applied.

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