On Fri, 10 Oct 2025, Rodrigo Vivi <[email protected]> wrote: > On Fri, Oct 10, 2025 at 11:00:21AM +0300, Jani Nikula wrote: >> 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. >> >> Signed-off-by: Jani Nikula <[email protected]> > > Reviewed-by: Rodrigo Vivi <[email protected]>
Pushed to din, thanks. BR, Jani. > >> --- >> drivers/gpu/drm/i915/i915_drv.h | 10 ---------- >> 1 file changed, 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h >> b/drivers/gpu/drm/i915/i915_drv.h >> index 6e159bb8ad2f..adadb7e7836f 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -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) >> -- >> 2.47.3 >> -- Jani Nikula, Intel
