Skip to content

drm/i915: dissolve soc/

Jani Nikula intel-gfx intel-xe 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest13 patches 5 repliesIn review
  2. v18 patches 4 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/13drm/i915/edram: extract i915_edram.[ch] for edram detectiondrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/i915/i915_edram.c +4 more+58 -440 replies
2/13drm/i915: split out i915_freq.[ch]drivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c drivers/gpu/drm/i915/gt/intel_rps.c +2 more+130 -50 replies
3/13drm/i915: move intel_dram.[ch] from soc/ to display/drivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/display/i9xx_wm.c drivers/gpu/drm/i915/display/intel_bw.c +9 more+11 -220 replies
4/13drm/xe: remove MISSING_CASE() from compat i915_utils.hdrivers/gpu/drm/xe/compat-i915-headers/i915_utils.h+0 -60 replies
5/13drm/i915/dram: convert to struct intel_displaydrivers/gpu/drm/i915/display/i9xx_wm.c drivers/gpu/drm/i915/display/intel_bw.c drivers/gpu/drm/i915/display/intel_cdclk.c +6 more+120 -1143 replies
6/13drm/i915: move dram_info to struct intel_displaydrivers/gpu/drm/i915/display/intel_display_core.h drivers/gpu/drm/i915/display/intel_dram.c drivers/gpu/drm/i915/i915_drv.h +1 more+6 -100 replies
7/13drm/i915: move intel_rom.[ch] from soc/ to display/drivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/display/intel_bios.c drivers/gpu/drm/i915/display/intel_rom.c +3 more+4 -190 replies
8/13drm/xe: remove remaining platform checks from compat i915_drv.hdrivers/gpu/drm/xe/compat-i915-headers/i915_drv.h+0 -150 replies
9/13drm/i915/gmch: split out i915_gmch.[ch] from socdrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/i915/i915_gmch.c +3 more+160 -1410 replies
10/13drm/i915/gmch: switch to use pci_bus_{read, write}_config_word()drivers/gpu/drm/i915/soc/intel_gmch.c+3 -20 replies
11/13drm/i915/gmch: convert intel_gmch.c to struct intel_displaydrivers/gpu/drm/i915/soc/intel_gmch.c drivers/gpu/drm/i915/soc/intel_gmch.h+6 -90 replies
12/13drm/i915: merge soc/intel_gmch.[ch] to display/intel_vga.cdrivers/gpu/drm/i915/Makefile drivers/gpu/drm/i915/display/intel_vga.c drivers/gpu/drm/i915/soc/intel_gmch.c +4 more+50 -1000 replies
13/13drm/xe/vga: use the same intel_gmch_vga_set_decode() as i915drivers/gpu/drm/i915/display/intel_vga.c+0 -82 replies

Reviews trailers per patch

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

PatchVille Syrjälä
SeriesR-b
1/13
2/13
3/13
4/13
5/13
6/13
7/13
8/13
9/13
10/13
11/13
12/13
13/13

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

Read the v2 thread

Cover letter [PATCH v2 00/13] drm/i915: dissolve soc/

Split soc/ to i915 and display specific parts, and relocate code accordingly.

In v2, cover all of soc/.

BR,
Jani.

Jani Nikula (13):
drm/i915/edram: extract i915_edram.[ch] for edram detection drm/i915: split out i915_freq.[ch]
drm/i915: move intel_dram.[ch] from soc/ to display/ drm/xe: remove MISSING_CASE() from compat i915_utils.h drm/i915/dram: convert to struct intel_display drm/i915: move dram_info to struct intel_display drm/i915: move intel_rom.[ch] from soc/ to display/ drm/xe: remove remaining platform checks from compat i915_drv.h drm/i915/gmch: split out i915_gmch.[ch] from soc drm/i915/gmch: switch to use pci_bus_{read,write}_config_word() drm/i915/gmch: convert intel_gmch.c to struct intel_display drm/i915: merge soc/intel_gmch.[ch] to display/intel_vga.c drm/xe/vga: use the same intel_gmch_vga_set_decode() as i915

 drivers/gpu/drm/i915/Makefile                 |  11 +-
 drivers/gpu/drm/i915/display/i9xx_wm.c        |   5 +-
 drivers/gpu/drm/i915/display/intel_bios.c     |   3 +-
 drivers/gpu/drm/i915/display/intel_bw.c       |   5 +-
 drivers/gpu/drm/i915/display/intel_cdclk.c    |   7 +-
 .../gpu/drm/i915/display/intel_display_core.h |   4 +
 .../drm/i915/display/intel_display_power.c    |   5 +-
 .../drm/i915/{soc => display}/intel_dram.c    | 249 ++++++++----------
 .../drm/i915/{soc => display}/intel_dram.h    |  12 +-
 .../gpu/drm/i915/{soc => display}/intel_rom.c |   0
 .../gpu/drm/i915/{soc => display}/intel_rom.h |   0
 drivers/gpu/drm/i915/display/intel_vga.c      |  44 +++-
 drivers/gpu/drm/i915/display/skl_watermark.c  |   6 +-
 .../gpu/drm/i915/gt/intel_gt_clock_utils.c    |   4 +-
 drivers/gpu/drm/i915/gt/intel_rps.c           |   6 +-
 drivers/gpu/drm/i915/i915_driver.c            |  18 +-
 drivers/gpu/drm/i915/i915_drv.h               |   3 -
 drivers/gpu/drm/i915/i915_edram.c             |  44 ++++
 drivers/gpu/drm/i915/i915_edram.h             |  11 +
 drivers/gpu/drm/i915/i915_freq.c              | 111 ++++++++
 drivers/gpu/drm/i915/i915_freq.h              |  13 +
 .../i915/{soc/intel_gmch.c => i915_gmch.c}    |  61 +----
 drivers/gpu/drm/i915/i915_gmch.h              |  13 +
 drivers/gpu/drm/i915/soc/intel_gmch.h         |  20 --
 drivers/gpu/drm/xe/Makefile                   |  13 +-
 .../gpu/drm/xe/compat-i915-headers/i915_drv.h |  15 --
 .../drm/xe/compat-i915-headers/i915_utils.h   |   6 -
 .../xe/compat-i915-headers/soc/intel_dram.h   |   6 -
 .../xe/compat-i915-headers/soc/intel_gmch.h   |   6 -
 .../xe/compat-i915-headers/soc/intel_rom.h    |   6 -
 drivers/gpu/drm/xe/display/xe_display.c       |   4 +-
 drivers/gpu/drm/xe/display/xe_display_misc.c  |  16 --
 drivers/gpu/drm/xe/xe_device_types.h          |   8 -
 33 files changed, 394 insertions(+), 341 deletions(-)
 rename drivers/gpu/drm/i915/{soc => display}/intel_dram.c (70%)
 rename drivers/gpu/drm/i915/{soc => display}/intel_dram.h (68%)
 rename drivers/gpu/drm/i915/{soc => display}/intel_rom.c (100%)
 rename drivers/gpu/drm/i915/{soc => display}/intel_rom.h (100%)
 create mode 100644 drivers/gpu/drm/i915/i915_edram.c
 create mode 100644 drivers/gpu/drm/i915/i915_edram.h
 create mode 100644 drivers/gpu/drm/i915/i915_freq.c
 create mode 100644 drivers/gpu/drm/i915/i915_freq.h
 rename drivers/gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} (68%)
 create mode 100644 drivers/gpu/drm/i915/i915_gmch.h
 delete mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h
 delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h
 delete mode 100644 drivers/gpu/drm/xe/display/xe_display_misc.c
Signature · 1 line
2.47.3