Skip to content

xe & i915 display integration ifdef cleanups, part 2

Jani Nikula intel-xe 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest41 patches 5 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/41drm/i915/display: add I915 conditional build to g4x_dp.hdrivers/gpu/drm/i915/display/g4x_dp.h+26 -00 replies
2/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dpio_phy.h+0 -140 replies
3/41drm/i915/display: add I915 conditional build to intel_dpio_phy.hdrivers/gpu/drm/i915/display/intel_dpio_phy.h+96 -00 replies
4/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_dp.c drivers/gpu/drm/i915/display/intel_pps.c+4 -200 replies
5/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h+44 -00 replies
6/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h+0 -10 replies
7/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_crtc.c drivers/gpu/drm/i915/display/intel_fbc.c drivers/gpu/drm/i915/display/intel_sprite.c+1 -100 replies
8/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/vlv_sideband.h drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h+133 -00 replies
9/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_cdclk.c drivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_power.c +3 more+4 -160 replies
10/41drm/i915/display: add I915 conditional build to intel_crt.hdrivers/gpu/drm/i915/display/intel_crt.h+14 -00 replies
11/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_power_well.c+3 -70 replies
12/41drm/i915/display: add I915 conditional build to vlv_dsi.hdrivers/gpu/drm/i915/display/vlv_dsi.h+13 -00 replies
13/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_dsi_vbt.c+3 -150 replies
14/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h+0 -30 replies
15/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c+6 -100 replies
16/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c+1 -50 replies
17/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_atomic_plane.c+1 -40 replies
18/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_power_well.c+0 -120 replies
19/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/display/ext/i915_irq.h+6 -20 replies
20/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_core.h drivers/gpu/drm/i915/display/intel_display_types.h+1 -120 replies
21/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_vma.h+1 -03 replies
22/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_types.h drivers/gpu/drm/i915/display/skl_scaler.c +1 more+5 -310 replies
23/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dsi_vbt.c+0 -60 replies
24/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_cdclk.c+0 -120 replies
25/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/xe_device_types.h+6 -00 replies
26/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c+2 -80 replies
27/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dpll_mgr.c+0 -40 replies
28/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display.c+0 -80 replies
29/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_debugfs.c+1 -20 replies
30/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dp.c+0 -20 replies
31/41fixup! drm/i915/display: Remove all uncore mmio accesses in favor of intel_dedrivers/gpu/drm/i915/display/intel_hdmi.c+1 -00 replies
32/41drm/i915/display: remove unnecessary i915_debugfs.h includesdrivers/gpu/drm/i915/display/intel_dp.c drivers/gpu/drm/i915/display/intel_hdmi.c+0 -20 replies
33/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_power.c+0 -40 replies
34/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_power_map.c+0 -40 replies
35/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_power_map.c+0 -40 replies
36/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dpll.c+0 -40 replies
37/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_debugfs.h+14 -00 replies
38/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_debugfs.c+0 -60 replies
39/41fixup! drm/xe/display: Implement display supportdrivers/gpu/drm/xe/compat-i915-headers/i915_trace.h+6 -00 replies
40/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_dp_aux.c+0 -40 replies
41/41fixup! drm/i915/display: Remaining changes to make xe compiledrivers/gpu/drm/i915/display/intel_display_trace.h+0 -20 replies

Reviews trailers per patch

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

PatchNirmoy DasLucas De Marchi
SeriesA-b
1/41
2/41
3/41
4/41
5/41
6/41
7/41
8/41
9/41
10/41
11/41
12/41
13/41
14/41
15/41
16/41
17/41
18/41
19/41
20/41
21/41
22/41
23/41
24/41
25/41
26/41
27/41
28/41
29/41
30/41
31/41
32/41R-b
33/41
34/41
35/41
36/41
37/41
38/41
39/41
40/41
41/41

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/41] xe & i915 display integration ifdef cleanups, part 2

This continues the ifdef cleanups [1].

BR,
Jani.

[1] https://lore.kernel.org/r/[email protected]

Jani Nikula (41):
drm/i915/display: add I915 conditional build to g4x_dp.h fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to intel_dpio_phy.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to intel_crt.h fixup! drm/i915/display: Remaining changes to make xe compile drm/i915/display: add I915 conditional build to vlv_dsi.h fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remove all uncore mmio accesses in favor of
intel_de
drm/i915/display: remove unnecessary i915_debugfs.h includes fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/xe/display: Implement display support
fixup! drm/i915/display: Remaining changes to make xe compile fixup! drm/i915/display: Remaining changes to make xe compile

 drivers/gpu/drm/i915/display/g4x_dp.h         |  26 ++++
 .../gpu/drm/i915/display/intel_atomic_plane.c |   5 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |  15 --
 drivers/gpu/drm/i915/display/intel_crt.h      |  14 ++
 drivers/gpu/drm/i915/display/intel_crtc.c     |   4 -
 drivers/gpu/drm/i915/display/intel_display.c  |  55 ++------
 .../gpu/drm/i915/display/intel_display_core.h |   4 -
 .../drm/i915/display/intel_display_debugfs.c  |   9 +-
 .../drm/i915/display/intel_display_power.c    |  10 --
 .../i915/display/intel_display_power_map.c    |   8 --
 .../i915/display/intel_display_power_well.c   |  17 +--
 .../drm/i915/display/intel_display_trace.h    |   2 -
 .../drm/i915/display/intel_display_types.h    |   9 +-
 drivers/gpu/drm/i915/display/intel_dp.c       |  10 --
 drivers/gpu/drm/i915/display/intel_dp_aux.c   |   4 -
 drivers/gpu/drm/i915/display/intel_dpio_phy.h | 104 ++++++++++++--
 drivers/gpu/drm/i915/display/intel_dpll.c     |   7 -
 drivers/gpu/drm/i915/display/intel_dpll_mgr.c |   4 -
 drivers/gpu/drm/i915/display/intel_dsi_vbt.c  |  20 +--
 drivers/gpu/drm/i915/display/intel_fbc.c      |   3 +-
 drivers/gpu/drm/i915/display/intel_pps.c      |  13 +-
 drivers/gpu/drm/i915/display/intel_sprite.c   |   4 -
 drivers/gpu/drm/i915/display/skl_scaler.c     |   2 -
 .../drm/i915/display/skl_universal_plane.c    |  30 +---
 drivers/gpu/drm/i915/display/vlv_dsi.h        |  13 ++
 .../drm/xe/compat-i915-headers/i915_debugfs.h |  14 ++
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |   4 -
 .../drm/xe/compat-i915-headers/i915_trace.h   |   6 +
 .../drm/xe/compat-i915-headers/i915_vgpu.h    |  44 ++++++
 .../gpu/drm/xe/compat-i915-headers/i915_vma.h |   1 +
 .../drm/xe/compat-i915-headers/vlv_sideband.h | 132 ++++++++++++++++++
 .../xe/compat-i915-headers/vlv_sideband_reg.h |   1 +
 drivers/gpu/drm/xe/display/ext/i915_irq.h     |   8 +-
 drivers/gpu/drm/xe/xe_device_types.h          |   6 +
 34 files changed, 383 insertions(+), 225 deletions(-)
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_debugfs.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_trace.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband.h
 create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband_reg.h
Signature · 1 line
2.39.2