Skip to content

xe & i915 display integration ifdef cleanups

Jani Nikula intel-xe 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21fixup! drm/i915/display: Set DISPLAY_MMIO_BASE to 0 for xedrivers/gpu/drm/i915/Makefile+1 -10 replies
2/21drm/i915: define I915 during i915 driver builddrivers/gpu/drm/i915/Makefile+1 -10 replies
3/21drm/i915/display: add I915 conditional build to intel_lvds.hdrivers/gpu/drm/i915/display/intel_lvds.h+19 -00 replies
4/21fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/Makefile+0 -10 replies
5/21drm/i915/display: add I915 conditional build to hsw_ips.hdrivers/gpu/drm/i915/display/hsw_ips.h+35 -00 replies
6/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_cdclk.c drivers/gpu/drm/i915/display/intel_display.c+2 -100 replies
7/21fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h+1 -30 replies
8/21drm/i915/display: add I915 conditional build to i9xx_plane.hdrivers/gpu/drm/i915/display/i9xx_plane.h+23 -00 replies
9/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_crtc.c drivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_sprite.c+2 -110 replies
10/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_lpe_audio.h+0 -80 replies
11/21drm/i915/display: add I915 conditional build to intel_lpe_audio.hdrivers/gpu/drm/i915/display/intel_lpe_audio.h+18 -00 replies
12/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_pch_refclk.h+0 -80 replies
13/21drm/i915/display: add I915 conditional build to intel_pch_refclk.hdrivers/gpu/drm/i915/display/intel_pch_refclk.h+23 -00 replies
14/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_pch_display.h+0 -160 replies
15/21drm/i915/display: add I915 conditional build to intel_pch_display.hdrivers/gpu/drm/i915/display/intel_pch_display.h+53 -00 replies
16/21drm/i915/display: add I915 conditional build to intel_sprite.hdrivers/gpu/drm/i915/display/intel_sprite.h+8 -00 replies
17/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_sprite.c+0 -180 replies
18/21fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/Makefile+0 -10 replies
19/21drm/i915/display: add I915 conditional build to intel_overlay.hdrivers/gpu/drm/i915/display/intel_overlay.h+35 -00 replies
20/21fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c+1 -10 replies
21/21fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h+0 -30 replies

Reviews trailers per patch

None of the 21 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchRodrigo Vivi
SeriesA-b
1/21
2/21
3/21
4/21
5/21
6/21
7/21
8/21
9/21
10/21
11/21
12/21
13/21
14/21
15/21
16/21
17/21
18/21
19/21
20/21
21/21

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Intel-xe] [PATCH 00/21] xe & i915 display integration ifdef cleanups

Hey all, here's my first batch of #ifdef cleanups for xe and i915 display integration.

Many of the patches in this series break the build, and will get fixed by subsequent changes. It's pretty much unavoidable as many of the changes are standalone to i915, and others are fixups.

This is pretty straightforward stuff for starters, really. The idea is that in the next rebase, the drm/i915 changes here go *before* any of the current i915 changes.

Adding the static inline stubs for xe build in i915 (the !I915 parts) is very helpful in not sprinkling #ifdefs all over the place. A lot of the time, the compiler is able to just compile out lots and lots of unreachable static functions and data without explicitly conditionally building them out. We can leave a lot of it out from "drm/i915/display:
Remaining changes to make xe compile". This is crucial especially while upstreaming by keeping the changes to i915 minimal.

Also, I think the conditional build and stubs in headers is the least intrusive way of going about this before xe is actually upstream, and it also follows the usual patterns for CONFIG_FOO=n code paths, albeit I915 is defined in the Makefile, not in kconfig.

BR,
Jani.

Jani Nikula (21):
fixup! drm/i915/display: Set DISPLAY_MMIO_BASE to 0 for xe drm/i915: define I915 during i915 driver build drm/i915/display: add I915 conditional build to intel_lvds.h fixup! drm/xe/display: Implement display support drm/i915/display: add I915 conditional build to hsw_ips.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support drm/i915/display: add I915 conditional build to i9xx_plane.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to intel_lpe_audio.h fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to intel_pch_refclk.h fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to intel_pch_display.h drm/i915/display: add I915 conditional build to intel_sprite.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support drm/i915/display: add I915 conditional build to intel_overlay.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support

 drivers/gpu/drm/i915/display/hsw_ips.h        | 35 +++++++++++
 drivers/gpu/drm/i915/display/i9xx_plane.h     | 23 +++++++
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  4 +-
 drivers/gpu/drm/i915/display/intel_crtc.c     |  6 +-
 drivers/gpu/drm/i915/display/intel_display.c  | 15 +----
 .../gpu/drm/i915/display/intel_lpe_audio.h    | 20 ++++--
 drivers/gpu/drm/i915/display/intel_lvds.h     | 19 ++++++
 drivers/gpu/drm/i915/display/intel_overlay.h  | 35 +++++++++++
 .../gpu/drm/i915/display/intel_pch_display.h  | 63 +++++++++++++++----
 .../gpu/drm/i915/display/intel_pch_refclk.h   | 25 ++++++--
 drivers/gpu/drm/i915/display/intel_sprite.c   | 20 +-----
 drivers/gpu/drm/i915/display/intel_sprite.h   |  8 +++
 drivers/gpu/drm/xe/Makefile                   |  2 -
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |  7 +--
 14 files changed, 211 insertions(+), 71 deletions(-)
Signature · 1 line
2.39.2