[Intel-xe] [PATCH 01/31] Revert "FIXME: drm/i915: xe doesn't have i915_modparams.verbose_state_checks"

Jouni Högander jouni.hogander at intel.com
Fri Oct 27 07:58:48 UTC 2023


This reverts commit e1253319ab3fb9a6d229e01fc36386d5a464c5ca.

Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index 7a01f61cdcdf..0e5dffe8f018 100644
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -548,17 +548,11 @@ bool assert_port_valid(struct drm_i915_private *i915, enum port port);
  * verbose_state_checks module param, to enable distros and users to tailor
  * their preferred amount of i915 abrt spam.
  */
-#ifdef I915
-#define i915_display_verbose_check (i915_modparams.verbose_state_checks)
-#else
-#define i915_display_verbose_check 1
-#endif
-
 #define I915_STATE_WARN(__i915, condition, format...) ({		\
 	struct drm_device *drm = &(__i915)->drm;			\
 	int __ret_warn_on = !!(condition);				\
 	if (unlikely(__ret_warn_on))					\
-		if (!drm_WARN(drm, i915_display_verbose_check, format)) \
+		if (!drm_WARN(drm, i915_modparams.verbose_state_checks, format)) \
 			drm_err(drm, format);				\
 	unlikely(__ret_warn_on);					\
 })
-- 
2.34.1



More information about the Intel-xe mailing list