drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h (0a2ecbe5) · Commits · 戴 / test

drivers/gpu/drm/i915/display/intel_display.h

+18 −0

Original line number	Diff line number	Diff line
		@@ -571,4 +571,22 @@ void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state);
		#define assert_pipe_enabled(d, p) assert_pipe(d, p, true)
		#define assert_pipe_disabled(d, p) assert_pipe(d, p, 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.
		*/
		#define I915_STATE_WARN(condition, format...) ({ \
		int __ret_warn_on = !!(condition); \
		if (unlikely(__ret_warn_on)) \
		if (!WARN(i915_modparams.verbose_state_checks, format)) \
		DRM_ERROR(format); \
		unlikely(__ret_warn_on); \
		})

		#define I915_STATE_WARN_ON(x) \
		I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")

		#endif

+0 −18

Original line number	Diff line number	Diff line
		@@ -104,24 +104,6 @@
		#define DRIVER_DATE "20190730"
		#define DRIVER_TIMESTAMP 1564512624

		/* 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.
		*/
		#define I915_STATE_WARN(condition, format...) ({ \
		int __ret_warn_on = !!(condition); \
		if (unlikely(__ret_warn_on)) \
		if (!WARN(i915_modparams.verbose_state_checks, format)) \
		DRM_ERROR(format); \
		unlikely(__ret_warn_on); \
		})

		#define I915_STATE_WARN_ON(x) \
		I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")

		#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)

		int __i915_inject_load_error(struct drm_i915_private *i915, int err,