* [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
@ 2020-02-23 17:39 Chris Wilson
2020-02-23 18:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 10+ messages in thread
From: Chris Wilson @ 2020-02-23 17:39 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/display: Fix inverted WARN_ON
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
@ 2020-02-23 18:29 ` Patchwork
2020-02-24 6:12 ` [Intel-gfx] [PATCH] " Jani Nikula
` (2 subsequent siblings)
3 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-02-23 18:29 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Fix inverted WARN_ON
URL : https://patchwork.freedesktop.org/series/73823/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_7991 -> Patchwork_16678
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/index.html
Known issues
------------
Here are the changes found in Patchwork_16678 that come from known issues:
### IGT changes ###
#### Possible fixes ####
* igt@gem_close_race@basic-threads:
- fi-hsw-4770r: [TIMEOUT][1] ([fdo#112271] / [i915#1084]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-hsw-4770r/igt@gem_close_race@basic-threads.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-hsw-4770r/igt@gem_close_race@basic-threads.html
- fi-byt-j1900: [INCOMPLETE][3] ([i915#45]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-byt-j1900/igt@gem_close_race@basic-threads.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-byt-j1900/igt@gem_close_race@basic-threads.html
* igt@gem_exec_suspend@basic-s0:
- fi-bsw-kefka: [INCOMPLETE][5] ([i915#392]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-bsw-kefka/igt@gem_exec_suspend@basic-s0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-bsw-kefka/igt@gem_exec_suspend@basic-s0.html
- fi-bsw-n3050: [INCOMPLETE][7] ([i915#392]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-bsw-n3050/igt@gem_exec_suspend@basic-s0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-bsw-n3050/igt@gem_exec_suspend@basic-s0.html
* igt@i915_selftest@live_sanitycheck:
- fi-icl-u3: [DMESG-WARN][9] ([i915#585]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-icl-u3/igt@i915_selftest@live_sanitycheck.html
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][11] ([i915#44]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-hsw-peppy/igt@kms_frontbuffer_tracking@basic.html
#### Warnings ####
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u: [FAIL][13] ([fdo#111096] / [i915#323]) -> [FAIL][14] ([fdo#111407])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7991/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/fi-kbl-7500u/igt@kms_chamelium@hdmi-hpd-fast.html
[fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
[fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
[fdo#112271]: https://bugs.freedesktop.org/show_bug.cgi?id=112271
[i915#1084]: https://gitlab.freedesktop.org/drm/intel/issues/1084
[i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
[i915#392]: https://gitlab.freedesktop.org/drm/intel/issues/392
[i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
[i915#45]: https://gitlab.freedesktop.org/drm/intel/issues/45
[i915#585]: https://gitlab.freedesktop.org/drm/intel/issues/585
Participating hosts (49 -> 39)
------------------------------
Additional (3): fi-tgl-y fi-byt-n2820 fi-bwr-2160
Missing (13): fi-ilk-m540 fi-bdw-samus fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-snb-2520m fi-ctg-p8600 fi-skl-6700k2 fi-skl-lmem fi-blb-e6850 fi-byt-clapper fi-skl-6600u fi-snb-2600
Build changes
-------------
* CI: CI-20190529 -> None
* Linux: CI_DRM_7991 -> Patchwork_16678
CI-20190529: 20190529
CI_DRM_7991: 56b4b8720717a562ebf4657c8624fb63a6c9d195 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5458: 5f7e4ae6a91ed2c104593b8abd5b71a6cc96fc10 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_16678: 420956745a7d0b74e6aa762cdded28fa10627979 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
420956745a7d drm/i915/display: Fix inverted WARN_ON
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16678/index.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
2020-02-23 18:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
@ 2020-02-24 6:12 ` Jani Nikula
2020-02-24 9:00 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 8:08 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 9:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: Fix inverted WARN_ON (rev2) Patchwork
3 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2020-02-24 6:12 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-24 6:12 ` [Intel-gfx] [PATCH] " Jani Nikula
@ 2020-02-24 9:00 ` Laxminarayan Bharadiya, Pankaj
0 siblings, 0 replies; 10+ messages in thread
From: Laxminarayan Bharadiya, Pankaj @ 2020-02-24 9:00 UTC (permalink / raw)
To: Nikula, Jani, Chris Wilson, intel-gfx@lists.freedesktop.org
> -----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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
2020-02-23 18:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-24 6:12 ` [Intel-gfx] [PATCH] " Jani Nikula
@ 2020-02-24 8:08 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 8:22 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 9:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: Fix inverted WARN_ON (rev2) Patchwork
3 siblings, 1 reply; 10+ messages in thread
From: Laxminarayan Bharadiya, Pankaj @ 2020-02-24 8:08 UTC (permalink / raw)
To: Chris Wilson, Nikula, Jani; +Cc: intel-gfx@lists.freedesktop.org
> -----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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-24 8:08 ` Laxminarayan Bharadiya, Pankaj
@ 2020-02-24 8:22 ` Laxminarayan Bharadiya, Pankaj
0 siblings, 0 replies; 10+ messages in thread
From: Laxminarayan Bharadiya, Pankaj @ 2020-02-24 8:22 UTC (permalink / raw)
To: Laxminarayan Bharadiya, Pankaj, Chris Wilson, Nikula, Jani
Cc: intel-gfx@lists.freedesktop.org
> -----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
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: Fix inverted WARN_ON (rev2)
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
` (2 preceding siblings ...)
2020-02-24 8:08 ` Laxminarayan Bharadiya, Pankaj
@ 2020-02-24 9:03 ` Patchwork
3 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-02-24 9:03 UTC (permalink / raw)
To: Laxminarayan Bharadiya, Pankaj; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/display: Fix inverted WARN_ON (rev2)
URL : https://patchwork.freedesktop.org/series/73823/
State : failure
== Summary ==
Applying: drm/i915/display: Fix inverted WARN_ON
error: patch failed: drivers/gpu/drm/i915/display/intel_dp.c:1024
error: drivers/gpu/drm/i915/display/intel_dp.c: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
hint: Use 'git am --show-current-patch' to see the failed patch
Using index info to reconstruct a base tree...
Patch failed at 0001 drm/i915/display: Fix inverted WARN_ON
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
@ 2020-02-24 10:24 Chris Wilson
2020-02-24 10:58 ` Jani Nikula
0 siblings, 1 reply; 10+ messages in thread
From: Chris Wilson @ 2020-02-24 10:24 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-24 10:24 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
@ 2020-02-24 10:58 ` Jani Nikula
2020-02-24 10:59 ` Chris Wilson
0 siblings, 1 reply; 10+ messages in thread
From: Jani Nikula @ 2020-02-24 10:58 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
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
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
2020-02-24 10:58 ` Jani Nikula
@ 2020-02-24 10:59 ` Chris Wilson
0 siblings, 0 replies; 10+ messages in thread
From: Chris Wilson @ 2020-02-24 10:59 UTC (permalink / raw)
To: Jani Nikula, intel-gfx
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
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-02-24 10:59 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
2020-02-23 18:29 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-02-24 6:12 ` [Intel-gfx] [PATCH] " Jani Nikula
2020-02-24 9:00 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 8:08 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 8:22 ` Laxminarayan Bharadiya, Pankaj
2020-02-24 9:03 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/display: Fix inverted WARN_ON (rev2) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2020-02-24 10:24 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
2020-02-24 10:58 ` Jani Nikula
2020-02-24 10:59 ` Chris Wilson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.