All of lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
@ 2020-02-24 10:24 Chris Wilson
  2020-02-24 10:58 ` Jani Nikula
  2020-02-24 13:47 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display: Fix inverted WARN_ON (rev3) Patchwork
  0 siblings, 2 replies; 9+ 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] 9+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON
@ 2020-02-23 17:39 Chris Wilson
  2020-02-24  6:12 ` Jani Nikula
  2020-02-24  8:08 ` Laxminarayan Bharadiya, Pankaj
  0 siblings, 2 replies; 9+ 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] 9+ messages in thread

end of thread, other threads:[~2020-02-24 13:47 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2020-02-24 13:47 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/display: Fix inverted WARN_ON (rev3) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2020-02-23 17:39 [Intel-gfx] [PATCH] drm/i915/display: Fix inverted WARN_ON Chris Wilson
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  8:22   ` Laxminarayan Bharadiya, Pankaj

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.