Commit 37153b0a authored Apr 30, 2024 by Balasubramani Vivekanandan Committed by Radhakrishna Sripada May 03, 2024

drm/i915/bmg: Define IS_BATTLEMAGE macro

Display code uses IS_BATTLEMAGE macro but the platform support doesn't
exist in i915. So fake IS_BATTLEMAGE macro defined to enable building
i915 code. We should make sure the macro parameter is used in the
always-false expression so that we don't run into "unused variable"
warnings from i915 builds if the IS_BATTLEMAGE() check is the only place
the i915 pointer gets used in a function.

While we're at it, also update the IS_LUNARLAKE macro to include the
parameter in the false expression for consistency.

Signed-off-by: Balasubramani Vivekanandan <balasubramani.vivekanandan@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Radhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240430172850.1881525-3-radhakrishna.sripada@intel.com

parent 7f071dde

drivers/gpu/drm/i915/i915_drv.h

+9 −1

Original line number	Diff line number	Diff line
		@@ -535,7 +535,15 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
		#define IS_ALDERLAKE_P(i915) IS_PLATFORM(i915, INTEL_ALDERLAKE_P)
		#define IS_DG2(i915) IS_PLATFORM(i915, INTEL_DG2)
		#define IS_METEORLAKE(i915) IS_PLATFORM(i915, INTEL_METEORLAKE)
		#define IS_LUNARLAKE(i915) 0
		/*
		* Display code shared by i915 and Xe relies on macros like IS_LUNARLAKE,
		* so we need to define these even on platforms that the i915 base driver
		* doesn't support. Ensure the parameter is used in the definition to
		* avoid 'unused variable' warnings when compiling the shared display code
		* for i915.
		*/
		#define IS_LUNARLAKE(i915) (0 && i915)
		#define IS_BATTLEMAGE(i915) (0 && i915)

		#define IS_DG2_G10(i915) \
		IS_SUBPLATFORM(i915, INTEL_DG2, INTEL_SUBPLATFORM_G10)