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

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

[Jani Nikula]

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 <jani.nikula@intel.com>
---
 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

✓ i915.CI.BAT: success for drm/i915: drop unused non-i915 IS_<PLATFORM> macros

[Patchwork]

[-- Attachment #1: Type: text/plain, Size: 4091 bytes --]

== Series Details ==

Series: drm/i915: drop unused non-i915 IS_<PLATFORM> macros
URL   : https://patchwork.freedesktop.org/series/155725/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_17337 -> Patchwork_155725v1
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/index.html

Participating hosts (44 -> 43)
------------------------------

  Missing    (1): fi-snb-2520m 

Known issues
------------

  Here are the changes found in Patchwork_155725v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@dmabuf@all-tests:
    - bat-apl-1:          [PASS][1] -> [ABORT][2] ([i915#12904]) +1 other test abort
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-apl-1/igt@dmabuf@all-tests.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-apl-1/igt@dmabuf@all-tests.html

  * igt@gem_exec_fence@basic-await@vecs0:
    - bat-rpls-4:         [PASS][3] -> [DMESG-WARN][4] ([i915#13400]) +1 other test dmesg-warn
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-rpls-4/igt@gem_exec_fence@basic-await@vecs0.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-rpls-4/igt@gem_exec_fence@basic-await@vecs0.html

  * igt@i915_pm_rpm@module-reload:
    - bat-dg2-11:         [PASS][5] -> [ABORT][6] ([i915#14385])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-dg2-11/igt@i915_pm_rpm@module-reload.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-dg2-11/igt@i915_pm_rpm@module-reload.html

  * igt@i915_selftest@live@workarounds:
    - bat-arls-5:         [PASS][7] -> [DMESG-FAIL][8] ([i915#12061]) +1 other test dmesg-fail
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-arls-5/igt@i915_selftest@live@workarounds.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-arls-5/igt@i915_selftest@live@workarounds.html

  
#### Possible fixes ####

  * igt@dmabuf@all-tests@dma_fence_chain:
    - fi-bsw-nick:        [ABORT][9] ([i915#12904]) -> [PASS][10] +1 other test pass
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/fi-bsw-nick/igt@dmabuf@all-tests@dma_fence_chain.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/fi-bsw-nick/igt@dmabuf@all-tests@dma_fence_chain.html

  
#### Warnings ####

  * igt@i915_selftest@live:
    - bat-atsm-1:         [DMESG-FAIL][11] ([i915#12061] / [i915#13929]) -> [DMESG-FAIL][12] ([i915#12061] / [i915#14204])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-atsm-1/igt@i915_selftest@live.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-atsm-1/igt@i915_selftest@live.html

  * igt@i915_selftest@live@mman:
    - bat-atsm-1:         [DMESG-FAIL][13] ([i915#13929]) -> [DMESG-FAIL][14] ([i915#14204])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_17337/bat-atsm-1/igt@i915_selftest@live@mman.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/bat-atsm-1/igt@i915_selftest@live@mman.html

  
  [i915#12061]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12061
  [i915#12904]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12904
  [i915#13400]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13400
  [i915#13929]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/13929
  [i915#14204]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14204
  [i915#14385]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14385


Build changes
-------------

  * Linux: CI_DRM_17337 -> Patchwork_155725v1

  CI-20190529: 20190529
  CI_DRM_17337: 9a1514c4046d6b4e173a51c7696d91a2f22ad3b5 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8581: 8581
  Patchwork_155725v1: 9a1514c4046d6b4e173a51c7696d91a2f22ad3b5 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_155725v1/index.html

[-- Attachment #2: Type: text/html, Size: 5226 bytes --]

Re: [PATCH] drm/i915: drop unused non-i915 IS_<PLATFORM> macros

[Rodrigo Vivi]

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 <jani.nikula@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

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

Re: [PATCH] drm/i915: drop unused non-i915 IS_<PLATFORM> macros

[Jani Nikula]

On Fri, 10 Oct 2025, Rodrigo Vivi <rodrigo.vivi@intel.com> 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 <jani.nikula@intel.com>
>
> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

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