public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 3/4] drm/i915/display: remove I915_STATE_WARN_ON()
Date: Fri, 12 May 2023 14:04:43 +0300	[thread overview]
Message-ID: <20230512110444.1448231-3-jani.nikula@intel.com> (raw)
In-Reply-To: <20230512110444.1448231-1-jani.nikula@intel.com>

Remove the unused macro.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.h | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index ac95961f68ba..8f451aaf5760 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -538,12 +538,12 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
 #define assert_transcoder_enabled(d, t) assert_transcoder(d, t, true)
 #define assert_transcoder_disabled(d, t) assert_transcoder(d, t, false)
 
-/* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and
- * WARN_ON()) for hw state sanity checks to check for unexpected conditions
- * which may not necessarily be a user visible problem.  This will either
- * WARN() or DRM_ERROR() depending on the verbose_checks moduleparam, to
- * enable distros and users to tailor their preferred amount of i915 abrt
- * spam.
+/*
+ * Use I915_STATE_WARN(x) (rather than WARN() and WARN_ON()) for hw state sanity
+ * checks to check for unexpected conditions which may not necessarily be a user
+ * visible problem. This will either WARN() or DRM_ERROR() depending on the
+ * verbose_state_checks module param, to enable distros and users to tailor
+ * their preferred amount of i915 abrt spam.
  */
 #define I915_STATE_WARN(condition, format...) ({			\
 	int __ret_warn_on = !!(condition);				\
@@ -553,9 +553,6 @@ void assert_transcoder(struct drm_i915_private *dev_priv,
 	unlikely(__ret_warn_on);					\
 })
 
-#define I915_STATE_WARN_ON(x)						\
-	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
-
 bool intel_scanout_needs_vtd_wa(struct drm_i915_private *i915);
 
 #endif
-- 
2.39.2


  parent reply	other threads:[~2023-05-12 11:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-12 11:04 [Intel-gfx] [PATCH 1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() Jani Nikula
2023-05-12 11:04 ` [Intel-gfx] [PATCH 2/4] drm/i915/crtc: replace I915_STATE_WARN_ON() with I915_STATE_WARN() Jani Nikula
2023-05-12 14:13   ` Rodrigo Vivi
2023-05-12 11:04 ` Jani Nikula [this message]
2023-05-12 14:06   ` [Intel-gfx] [PATCH 3/4] drm/i915/display: remove I915_STATE_WARN_ON() Rodrigo Vivi
2023-05-12 11:04 ` [Intel-gfx] [PATCH 4/4] drm/i915/display: add i915 parameter to I915_STATE_WARN() Jani Nikula
2023-05-12 14:10   ` Rodrigo Vivi
2023-05-12 18:19     ` Jani Nikula
2023-05-12 18:16   ` [Intel-gfx] [PATCH v2] " Jani Nikula
2023-05-12 12:58 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() Patchwork
2023-05-12 13:17 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-05-12 14:05 ` [Intel-gfx] [PATCH 1/4] " Rodrigo Vivi
2023-05-15  9:23   ` Jani Nikula
2023-05-12 20:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/4] drm/i915/dpll: drop a useless I915_STATE_WARN_ON() (rev2) Patchwork
2023-05-12 20:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-05-12 23:58 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230512110444.1448231-3-jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox