Commit 56d9d034 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: drop unused non-i915 IS_<PLATFORM> macros 



The IS_LUNARLAKE(), IS_BATTLEMAGE(), and IS_PANTHERLAKE() macros were
added for compatibility with the xe driver, for display needs, even
though i915 does not support the platforms in question. Display has
since moved away from the macros, and they are no longer needed. Remove.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://lore.kernel.org/r/20251010080021.1087315-1-jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 3a5c5c47

drivers/gpu/drm/i915/i915_drv.h

+0 −10
Original line number Diff line number Diff line
@@ -488,16 +488,6 @@ 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)

/*

 * 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_PANTHERLAKE(i915) (0 && i915)



#define IS_ARROWLAKE_H(i915) \

	IS_SUBPLATFORM(i915, INTEL_METEORLAKE, INTEL_SUBPLATFORM_ARL_H)