Skip to content

Make Display free from i915_reg.h

Uma Shankar intel-gfx intel-xe 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest20 patches 12 repliesIn review
  2. v319 patches 19 repliesSuperseded
  3. v219 patches 33 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v119 patches8 repliesSuperseded

Changes in v4 from the cover letter

- Add granular include instead of putting in common header (Jani)
- Drop redundant includes (Jani)
- Create oprom_regs header (Ville)
- Other minor fixes based on review comments from Jani and Ville

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20drm/i915: Extract display registers from i915_reg.h to displaydrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_pch_display.c drivers/gpu/drm/i915/i915_reg.h +1 more+11 -120 replies
2/20drm/i915: Extract South chicken registers from i915_reg.h to displaydrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_pch_refclk.c drivers/gpu/drm/i915/i915_reg.h+27 -280 replies
3/20drm/i915: Extract display interrupt definitionsdrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_display_rps.c drivers/gpu/drm/i915/i915_reg.h+34 -340 replies
4/20drm/i915: Extract DSPCLK_GATE_D from i915_reg to displaydrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_gmbus.c drivers/gpu/drm/i915/i915_reg.h+50 -510 replies
5/20drm/{i915, xe}: Extract pcode definitions to common headerdrivers/gpu/drm/i915/display/hsw_ips.c drivers/gpu/drm/i915/display/intel_bw.c drivers/gpu/drm/i915/display/intel_cdclk.c +17 more+130 -1011 reply
6/20drm/i915: Remove i915_reg.h from intel_display_device.cdrivers/gpu/drm/i915/display/intel_display_device.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/i915_reg.h+11 -80 replies
7/20drm/i915: Move GMD_ID and mask to intel_gt headerdrivers/gpu/drm/i915/gt/intel_gt_regs.h drivers/gpu/drm/i915/i915_reg.h+3 -41 reply
8/20drm/i915: Remove i915_reg.h from intel_dram.cdrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_dram.c drivers/gpu/drm/i915/i915_reg.h+7 -71 reply
9/20drm/i915: Remove i915_reg.h from intel_display.cdrivers/gpu/drm/i915/display/intel_display.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/i915_reg.h+23 -230 replies
10/20drm/i915: Remove i915_reg.h from intel_overlay.cdrivers/gpu/drm/i915/display/intel_display_irq.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_overlay.c +5 more+50 -380 replies
11/20drm/i915: Remove i915_reg.h from g4x_dp.cdrivers/gpu/drm/i915/display/g4x_dp.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/i915_reg.h+16 -161 reply
12/20drm/i915: Remove i915_reg.h from i9xx_wm.cdrivers/gpu/drm/i915/display/i9xx_wm.c drivers/gpu/drm/i915/display/intel_display_debugfs.c drivers/gpu/drm/i915/display/intel_display_regs.h +10 more+38 -211 reply
13/20drm/{i915, xe}: Remove i915_reg.h from g4x_hdmi.cdrivers/gpu/drm/i915/display/g4x_hdmi.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/i915_reg.h+12 -130 replies
14/20drm/i915: Remove i915_reg.h from intel_rom.cdrivers/gpu/drm/i915/display/intel_oprom_regs.h drivers/gpu/drm/i915/display/intel_rom.c drivers/gpu/drm/i915/i915_reg.h+37 -101 reply
15/20drm/i915: Remove i915_reg.h from intel_psr.cdrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_psr.c drivers/gpu/drm/i915/i915_reg.h+26 -290 replies
16/20drm/i915: Remove i915_reg.h from intel_fifo_underrun.cdrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_fifo_underrun.c drivers/gpu/drm/i915/i915_reg.h+23 -240 replies
17/20drm/i915: Remove i915_reg.h from intel_display_irq.cdrivers/gpu/drm/i915/display/intel_display_irq.c drivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/gt/intel_gt_irq.c +8 more+63 -531 reply
18/20drm/i915: Remove i915_reg.h from intel_display_power_well.cdrivers/gpu/drm/i915/display/intel_display_power_well.c drivers/gpu/drm/i915/display/intel_display_regs.h+2 -21 reply
19/20drm/i915: Remove i915_reg.h from intel_modeset_setup.cdrivers/gpu/drm/i915/display/intel_display_regs.h drivers/gpu/drm/i915/display/intel_modeset_setup.c drivers/gpu/drm/i915/i915_reg.h+14 -150 replies
20/20drm/{i915, xe}: Remove i915_reg.h from displaydrivers/gpu/drm/i915/display/hsw_ips.c drivers/gpu/drm/i915/display/i9xx_plane.c drivers/gpu/drm/i915/display/icl_dsi.c +16 more+0 -191 reply

Reviews trailers per patch

All 20 patches have a Reviewed-by or Acked-by.

PatchJani Nikula
1/20R-b
2/20R-b
3/20R-b
4/20R-b
5/20R-b
6/20R-b
7/20R-b
8/20R-b
9/20R-b
10/20R-b
11/20R-b
12/20R-b
13/20R-b
14/20R-b
15/20R-b
16/20R-b
17/20R-b
18/20R-b
19/20R-b
20/20R-b

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

Read the v4 thread

Cover letter [v4 00/20] Make Display free from i915_reg.h

Move the common register definition to per feature header which makes display files free from including i915_reg.h. This will help avoid dupicate definitions and includes and can serve as a common file for xe, i915 and display module.

v4:
- Add granular include instead of putting in common header (Jani)
- Drop redundant includes (Jani)
- Create oprom_regs header (Ville)
- Other minor fixes based on review comments from Jani and Ville

v3:
- Create per feature modular headers instead of 1 common header (Jani)
- Commit message and header fixes (Jani)

v2:
- Moved display definitions needed for gvt and clock gating to display header (Jani)
- Fixed redundant includes

Uma Shankar (20):
drm/i915: Extract display registers from i915_reg.h to display drm/i915: Extract South chicken registers from i915_reg.h to display drm/i915: Extract display interrupt definitions
drm/i915: Extract DSPCLK_GATE_D from i915_reg to display drm/{i915, xe}: Extract pcode definitions to common header drm/i915: Remove i915_reg.h from intel_display_device.c drm/i915: Move GMD_ID and mask to intel_gt header drm/i915: Remove i915_reg.h from intel_dram.c
drm/i915: Remove i915_reg.h from intel_display.c drm/i915: Remove i915_reg.h from intel_overlay.c drm/i915: Remove i915_reg.h from g4x_dp.c
drm/i915: Remove i915_reg.h from i9xx_wm.c
drm/{i915, xe}: Remove i915_reg.h from g4x_hdmi.c drm/i915: Remove i915_reg.h from intel_rom.c
drm/i915: Remove i915_reg.h from intel_psr.c
drm/i915: Remove i915_reg.h from intel_fifo_underrun.c drm/i915: Remove i915_reg.h from intel_display_irq.c drm/i915: Remove i915_reg.h from intel_display_power_well.c drm/i915: Remove i915_reg.h from intel_modeset_setup.c drm/{i915, xe}: Remove i915_reg.h from display

 drivers/gpu/drm/i915/display/g4x_dp.c         |   1 -
 drivers/gpu/drm/i915/display/g4x_hdmi.c       |   1 -
 drivers/gpu/drm/i915/display/hsw_ips.c        |   2 +-
 drivers/gpu/drm/i915/display/i9xx_plane.c     |   1 -
 drivers/gpu/drm/i915/display/i9xx_wm.c        |   2 +-
 drivers/gpu/drm/i915/display/icl_dsi.c        |   1 -
 .../gpu/drm/i915/display/intel_backlight.c    |   1 -
 drivers/gpu/drm/i915/display/intel_bw.c       |   2 +-
 drivers/gpu/drm/i915/display/intel_casf.c     |   1 -
 drivers/gpu/drm/i915/display/intel_cdclk.c    |   2 +-
 drivers/gpu/drm/i915/display/intel_ddi.c      |   1 -
 drivers/gpu/drm/i915/display/intel_display.c  |   1 -
 .../drm/i915/display/intel_display_debugfs.c  |   2 +-
 .../drm/i915/display/intel_display_device.c   |   7 +-
 .../gpu/drm/i915/display/intel_display_irq.c  |   2 +-
 .../drm/i915/display/intel_display_power.c    |   2 +-
 .../i915/display/intel_display_power_well.c   |   4 +-
 .../gpu/drm/i915/display/intel_display_regs.h | 263 +++++++++-
 .../gpu/drm/i915/display/intel_display_rps.c  |   2 +-
 .../gpu/drm/i915/display/intel_display_wa.c   |   1 -
 drivers/gpu/drm/i915/display/intel_dmc.c      |   1 -
 drivers/gpu/drm/i915/display/intel_dram.c     |   3 +-
 drivers/gpu/drm/i915/display/intel_fdi.c      |   1 -
 .../drm/i915/display/intel_fifo_underrun.c    |   1 -
 drivers/gpu/drm/i915/display/intel_gmbus.c    |   1 -
 drivers/gpu/drm/i915/display/intel_hdcp.c     |   2 +-
 .../gpu/drm/i915/display/intel_hotplug_irq.c  |   1 -
 drivers/gpu/drm/i915/display/intel_lt_phy.c   |   1 -
 .../drm/i915/display/intel_modeset_setup.c    |   1 -
 .../gpu/drm/i915/display/intel_oprom_regs.h   |  36 ++
 drivers/gpu/drm/i915/display/intel_overlay.c  |   2 +-
 .../gpu/drm/i915/display/intel_pch_display.c  |   1 -
 .../gpu/drm/i915/display/intel_pch_refclk.c   |   1 -
 drivers/gpu/drm/i915/display/intel_pps.c      |   1 -
 drivers/gpu/drm/i915/display/intel_psr.c      |   1 -
 drivers/gpu/drm/i915/display/intel_rom.c      |   3 +-
 drivers/gpu/drm/i915/display/intel_tc.c       |   1 -
 drivers/gpu/drm/i915/display/skl_watermark.c  |   2 +-
 drivers/gpu/drm/i915/display/vlv_dsi.c        |   1 -
 drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c  |   1 +
 drivers/gpu/drm/i915/gt/intel_gt.c            |   1 +
 drivers/gpu/drm/i915/gt/intel_gt_irq.c        |   2 +
 drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c |   1 +
 drivers/gpu/drm/i915/gt/intel_gt_regs.h       |   3 +
 drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c   |   2 +
 drivers/gpu/drm/i915/gt/intel_llc.c           |   2 +
 drivers/gpu/drm/i915/gt/intel_rc6.c           |   2 +
 .../gpu/drm/i915/gt/intel_ring_submission.c   |   2 +
 drivers/gpu/drm/i915/gt/intel_rps.c           |   1 +
 drivers/gpu/drm/i915/gt/intel_workarounds.c   |   2 +
 drivers/gpu/drm/i915/gvt/cmd_parser.c         |   1 +
 drivers/gpu/drm/i915/gvt/handlers.c           |   2 +
 drivers/gpu/drm/i915/gvt/interrupt.c          |   1 +
 drivers/gpu/drm/i915/gvt/mmio_context.c       |   1 +
 drivers/gpu/drm/i915/i915_debugfs.c           |   1 +
 drivers/gpu/drm/i915/i915_driver.c            |   1 +
 drivers/gpu/drm/i915/i915_hwmon.c             |   2 +
 drivers/gpu/drm/i915/i915_irq.c               |   1 +
 drivers/gpu/drm/i915/i915_reg.h               | 464 ------------------
 drivers/gpu/drm/i915/intel_clock_gating.c     |   4 +-
 drivers/gpu/drm/i915/intel_gvt_mmio_table.c   |   5 +
 drivers/gpu/drm/i915/intel_pcode.c            |   1 +
 drivers/gpu/drm/i915/vlv_suspend.c            |   1 +
 include/drm/intel/intel_gmd_interrupt_regs.h  |  92 ++++
 include/drm/intel/intel_gmd_misc_regs.h       |  21 +
 include/drm/intel/intel_pcode_regs.h          | 108 ++++
 66 files changed, 577 insertions(+), 508 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/display/intel_oprom_regs.h
 create mode 100644 include/drm/intel/intel_gmd_interrupt_regs.h
 create mode 100644 include/drm/intel/intel_gmd_misc_regs.h
 create mode 100644 include/drm/intel/intel_pcode_regs.h
Signature · 1 line
2.50.1