Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32753cb8 authored by Joonas Lahtinen's avatar Joonas Lahtinen Committed by Daniel Vetter
Browse files

drm/i915: Simplify _STATE_ debug macros 



Take advantage of WARN return value to simplify the flow.

Cc: Rob Clark <robdclark@gmail.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reported-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1450441647-23924-2-git-send-email-joonas.lahtinen@linux.intel.com


Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4601b933

drivers/gpu/drm/i915/i915_drv.h

+5 −10
Original line number Diff line number Diff line
@@ -88,23 +88,18 @@ 
 */

#define I915_STATE_WARN(condition, format...) ({			\

	int __ret_warn_on = !!(condition);				\

	if (unlikely(__ret_warn_on)) {					\

		if (i915.verbose_state_checks)				\

			WARN(1, format);				\

		else 							\

	if (unlikely(__ret_warn_on))					\

		if (!WARN(i915.verbose_state_checks, format))		\

			DRM_ERROR(format);				\

	}								\

	unlikely(__ret_warn_on);					\

})



#define I915_STATE_WARN_ON(condition) ({				\

	int __ret_warn_on = !!(condition);				\

	if (unlikely(__ret_warn_on)) {					\

		if (i915.verbose_state_checks)				\

			WARN(1, "WARN_ON(" #condition ")\n");		\

		else 							\

	if (unlikely(__ret_warn_on))					\

		if (!WARN(i915.verbose_state_checks,			\

			  "WARN_ON(" #condition ")\n"))			\

			DRM_ERROR("WARN_ON(" #condition ")\n");		\

	}								\

	unlikely(__ret_warn_on);					\

})