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

Commit f0d66153 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Move WARN_ON/MISSING_CASE macros to i915_utils.h 



We can't sometimes use these macros in other headers due to
include and definition order. As i915_utils.h already contains
other helper macros move these macros there.

v2: checkpatch cleanup for WARN() macro.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170328084513.174200-1-michal.wajdeczko@intel.com


Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent c276be4f

drivers/gpu/drm/i915/i915_drv.h

+0 −18
Original line number Diff line number Diff line
@@ -82,24 +82,6 @@ 
#define DRIVER_DATE		"20170320"

#define DRIVER_TIMESTAMP	1489994464



#undef WARN_ON

/* Many gcc seem to no see through this and fall over :( */

#if 0

#define WARN_ON(x) ({ \

	bool __i915_warn_cond = (x); \

	if (__builtin_constant_p(__i915_warn_cond)) \

		BUILD_BUG_ON(__i915_warn_cond); \

	WARN(__i915_warn_cond, "WARN_ON(" #x ")"); })

#else

#define WARN_ON(x) WARN((x), "%s", "WARN_ON(" __stringify(x) ")")

#endif



#undef WARN_ON_ONCE

#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")")



#define MISSING_CASE(x) WARN(1, "Missing switch case (%lu) in %s\n", \

			     (long) (x), __func__);



/* 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

drivers/gpu/drm/i915/i915_utils.h

+18 −0
Original line number Diff line number Diff line
@@ -25,6 +25,24 @@ 
#ifndef __I915_UTILS_H

#define __I915_UTILS_H



#undef WARN_ON

/* Many gcc seem to no see through this and fall over :( */

#if 0

#define WARN_ON(x) ({ \

	bool __i915_warn_cond = (x); \

	if (__builtin_constant_p(__i915_warn_cond)) \

		BUILD_BUG_ON(__i915_warn_cond); \

	WARN(__i915_warn_cond, "WARN_ON(" #x ")"); })

#else

#define WARN_ON(x) WARN((x), "%s", "WARN_ON(" __stringify(x) ")")

#endif



#undef WARN_ON_ONCE

#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")")



#define MISSING_CASE(x) WARN(1, "Missing switch case (%lu) in %s\n", \

			     (long)(x), __func__)



#if GCC_VERSION >= 70000

#define add_overflows(A, B) \

	__builtin_add_overflow_p((A), (B), (typeof((A) + (B)))0)

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -8088,7 +8088,7 @@ static inline int gen6_check_mailbox_status(struct drm_i915_private *dev_priv) 
	case GEN6_PCODE_TIMEOUT:

		return -ETIMEDOUT;

	default:

		MISSING_CASE(flags)

		MISSING_CASE(flags);

		return 0;

	}

}