Second round of i915_reg.h splitting
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest6 patches 3 repliesIn review
- v26 patches 7 repliesSuperseded
- v16 patches 2 repliesSuperseded
Changes in v3 from the cover letter
- Split on OA register range (Umesh)
- Correct whitespace mistakes (Lucas/checkpatch)
- Resolve minor rebase conflicts
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | drm/i915/perf: Move OA regs to their own headerdrivers/ drivers/ drivers/ +1 more | +499 | 0 replies | |
| 2/6 | drm/i915/perf: Express OA register ranges with i915_rangedrivers/ drivers/ | +79 | 0 replies | |
| 3/6 | drm/i915: Parameterize R_PWR_CLK_STATE register definitiondrivers/ drivers/ drivers/ +2 more | +20 | 0 replies | |
| 4/6 | drm/i915: Parameterize MI_PREDICATE registersdrivers/ drivers/ drivers/ +2 more | +19 | 0 replies | |
| 5/6 | drm/i915: Move GT registers to their own header filedrivers/ drivers/ drivers/ +44 more | +1594 | 0 replies | |
| 6/6 | drm/i915: Only include i915_reg.h from .c filesdrivers/ drivers/ drivers/ +53 more | +49 | 0 replies |
Reviews trailers per patch
All 6 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Jani Nikula | Lucas De Marchi | Umesh Nerlige Ramappa |
|---|---|---|---|
| Series | A-b | ||
| 1/6 | R-b | ||
| 2/6 | A-b | R-b | |
| 3/6 | R-b | ||
| 4/6 | R-b | ||
| 5/6 | R-b | ||
| 6/6 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.
Cover letter [Intel-gfx] [CI v3 0/6] Second round of i915_reg.h splitting
Let's continue to split our giant i915_reg.h file into more logical domain-specific headers. In addition to a bunch of register definition segregation, the final patch of this series ensures that i915_reg.h is only #include'd from .c files that truly need its definitions (and removes all of the places it was included by other headers). This significantly reduces how much of the driver code gets rebuilt after a modifications to i915_reg.h.
There's still more work to do after this series (especially moving display registers to their own header(s)). We'll also need to do a lot of cleanup of the definitions themselves in a future series --- for now the definitions have mostly been moved to new locations as-is without modification to order, coding-style, etc.
Assuming CI comes back clean, we'll probably want to merge this through a topic branch that can be applied to both drm-intel-next and drm-intel-gt-next to avoid major conflicts.
v2:
- Drop 'inline' from reg_in_range_table()
- Add missing #include to intel_pxp_irq.c
v3:
- Split on OA register range (Umesh)
- Correct whitespace mistakes (Lucas/checkpatch)
- Resolve minor rebase conflicts
Matt Roper (6):
drm/i915/perf: Move OA regs to their own header drm/i915/perf: Express OA register ranges with i915_range drm/i915: Parameterize R_PWR_CLK_STATE register definition drm/i915: Parameterize MI_PREDICATE registers drm/i915: Move GT registers to their own header file drm/i915: Only include i915_reg.h from .c files
drivers/gpu/drm/i915/display/g4x_hdmi.h | 2 +- drivers/gpu/drm/i915/display/intel_atomic.c | 1 + drivers/gpu/drm/i915/display/intel_bios.c | 1 + drivers/gpu/drm/i915/display/intel_bw.c | 1 + drivers/gpu/drm/i915/display/intel_crt.h | 2 +- drivers/gpu/drm/i915/display/intel_ddi.h | 2 +- drivers/gpu/drm/i915/display/intel_de.h | 1 - .../drm/i915/display/intel_display_power.h | 1 - drivers/gpu/drm/i915/display/intel_dmc.h | 2 +- drivers/gpu/drm/i915/display/intel_dp.h | 2 - drivers/gpu/drm/i915/display/intel_dsb.h | 2 +- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 1 + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- drivers/gpu/drm/i915/display/intel_hdmi.h | 2 - drivers/gpu/drm/i915/display/intel_lvds.h | 2 +- drivers/gpu/drm/i915/display/intel_sdvo.h | 2 +- drivers/gpu/drm/i915/display/intel_tc.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 1 + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 1 + .../i915/gem/selftests/i915_gem_client_blt.c | 3 +- .../drm/i915/gem/selftests/i915_gem_context.c | 3 +- drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 1 + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 1 + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 1 + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 3 +- drivers/gpu/drm/i915/gt/intel_engine.h | 1 - drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 26 + .../drm/i915/gt/intel_execlists_submission.c | 1 + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 + drivers/gpu/drm/i915/gt/intel_gt.c | 3 +- .../gpu/drm/i915/gt/intel_gt_clock_utils.c | 2 + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 2 + drivers/gpu/drm/i915/gt/intel_gt_pm_irq.c | 1 + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1543 +++++++++++++ drivers/gpu/drm/i915/gt/intel_gtt.c | 1 + drivers/gpu/drm/i915/gt/intel_llc.c | 1 + drivers/gpu/drm/i915/gt/intel_lrc.c | 1 + drivers/gpu/drm/i915/gt/intel_mocs.c | 2 +- drivers/gpu/drm/i915/gt/intel_rc6.c | 2 + drivers/gpu/drm/i915/gt/intel_rc6.h | 2 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 + drivers/gpu/drm/i915/gt/intel_reset.c | 2 + .../gpu/drm/i915/gt/intel_ring_submission.c | 1 + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + drivers/gpu/drm/i915/gt/intel_sseu.c | 3 +- drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 1 + drivers/gpu/drm/i915/gt/intel_workarounds.c | 1 + .../gpu/drm/i915/gt/intel_workarounds_types.h | 2 +- .../drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 1 - drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc_reg.h | 2 +- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 2 + .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_huc.h | 2 +- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + drivers/gpu/drm/i915/gvt/aperture_gm.c | 1 + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + drivers/gpu/drm/i915/gvt/display.c | 1 + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 + drivers/gpu/drm/i915/gvt/edid.c | 1 + drivers/gpu/drm/i915/gvt/fb_decoder.c | 1 + drivers/gpu/drm/i915/gvt/gtt.c | 2 + drivers/gpu/drm/i915/gvt/handlers.c | 2 + drivers/gpu/drm/i915/gvt/interrupt.c | 1 + drivers/gpu/drm/i915/gvt/interrupt.h | 2 +- drivers/gpu/drm/i915/gvt/mmio.c | 3 + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + drivers/gpu/drm/i915/gvt/mmio_context.h | 1 - drivers/gpu/drm/i915/gvt/scheduler.c | 2 + drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +- drivers/gpu/drm/i915/i915_debugfs.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gpu_error.c | 1 + drivers/gpu/drm/i915/i915_irq.c | 1 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_perf.c | 136 +- drivers/gpu/drm/i915/i915_perf_oa_regs.h | 137 ++ drivers/gpu/drm/i915/i915_perf_types.h | 2 +- drivers/gpu/drm/i915/i915_pmu.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 2057 ----------------- drivers/gpu/drm/i915/i915_reg_defs.h | 4 + drivers/gpu/drm/i915/i915_sysfs.c | 1 + drivers/gpu/drm/i915/intel_dram.c | 1 + drivers/gpu/drm/i915/intel_pcode.c | 1 + drivers/gpu/drm/i915/intel_pm.c | 1 + drivers/gpu/drm/i915/intel_pm.h | 1 - drivers/gpu/drm/i915/intel_sbi.c | 1 + drivers/gpu/drm/i915/intel_uncore.c | 1 + drivers/gpu/drm/i915/intel_uncore.h | 2 +- drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 1 + drivers/gpu/drm/i915/vlv_sideband.c | 1 + drivers/gpu/drm/i915/vlv_suspend.c | 2 + 97 files changed, 1899 insertions(+), 2141 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_regs.h create mode 100644 drivers/gpu/drm/i915/i915_perf_oa_regs.h
Signature · 1 line
2.34.1