[Intel-xe] [PATCH v2 00/11] Start register cleanup

Lucas De Marchi lucas.demarchi at intel.com
Fri Feb 17 00:52:15 UTC 2023


Start cleaning up the register definitions used in xe.
This removes dependency on the following registers:

	- intel_engine_regs.h
	- intel_gt_regs.h
	- intel_lrc_reg.h
	- intel_gpu_commands.h
	- i915_reg.h
	- intel_mchbar_regs.h

The includes on the display/ part are left as is since there is still
some more work to do to detangle dependencies. Other than from the
display/ files, xe still depends on:

	- i915_reg_defs.h
	- display/intel_display_core.h
	- display/ext/intel_device_info.h
	- display/ext/intel_pch.h

The first one are the generic defines used for defining the registers.
They probably can be split and part of them copied to include/drm to be
shared across the drivers. The last 3 are expected to be cleaned up
together with the rest of the display.

This series started by doing it manually with a few greps, migrated in
the middle to do by "remove the include, parse the warnings from the
compile and use that to generate the header" and finished with a small
python script with clang. There may be some inconsistencies how the
first patches and the last ones were done. I can clean that up on next
version.


Lucas De Marchi (11):
  drm/xe: Remove outdated build workaround
  drm/xe: Sort includes
  drm/xe/guc: Remove i915_regs.h include
  drm/xe: Remove dependency on intel_engine_regs.h
  drm/xe: Remove dependency on intel_gt_regs.h
  drm/xe: Remove dependency on intel_lrc_reg.h
  drm/xe: Remove dependency on intel_gpu_commands.h
  drm/xe: Remove dependency on i915_reg.h
  drm/xe/guc_pc: Move gt register to the proper place
  drm/xe: Remove dependency on intel_mchbar_regs.h
  drm/xe: Use relative includes for i915_reg_defs.h

 drivers/gpu/drm/i915/i915_reg_defs.h        |   2 +
 drivers/gpu/drm/xe/Makefile                 |  10 +-
 drivers/gpu/drm/xe/display/Makefile         | 120 ++++++++
 drivers/gpu/drm/xe/regs/xe_engine_regs.h    |  98 +++++++
 drivers/gpu/drm/xe/regs/xe_gpu_commands.h   |  96 +++++++
 drivers/gpu/drm/xe/regs/xe_gt_regs.h        | 289 ++++++++++++++++++++
 drivers/gpu/drm/xe/regs/xe_lrc_regs.h       |  17 ++
 drivers/gpu/drm/xe/regs/xe_regs.h           | 111 ++++++++
 drivers/gpu/drm/xe/xe_bb.c                  |   7 +-
 drivers/gpu/drm/xe/xe_bo.c                  |   2 -
 drivers/gpu/drm/xe/xe_bo_evict.c            |   2 +-
 drivers/gpu/drm/xe/xe_debugfs.c             |   2 +-
 drivers/gpu/drm/xe/xe_device.c              |   9 +-
 drivers/gpu/drm/xe/xe_device.h              |   3 +-
 drivers/gpu/drm/xe/xe_display.c             |  12 +-
 drivers/gpu/drm/xe/xe_dma_buf.c             |   8 +-
 drivers/gpu/drm/xe/xe_engine.c              |   4 +-
 drivers/gpu/drm/xe/xe_exec.c                |   2 +-
 drivers/gpu/drm/xe/xe_execlist.c            |  16 +-
 drivers/gpu/drm/xe/xe_force_wake.c          |   5 +-
 drivers/gpu/drm/xe/xe_ggtt.c                |  10 +-
 drivers/gpu/drm/xe/xe_gt.c                  |   5 +-
 drivers/gpu/drm/xe/xe_gt_clock.c            |   7 +-
 drivers/gpu/drm/xe/xe_gt_debugfs.c          |   2 +-
 drivers/gpu/drm/xe/xe_gt_mcr.c              |   5 +-
 drivers/gpu/drm/xe/xe_gt_mcr.h              |   2 +-
 drivers/gpu/drm/xe/xe_gt_pagefault.c        |   2 +-
 drivers/gpu/drm/xe/xe_gt_sysfs.c            |   4 +-
 drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c |   2 +-
 drivers/gpu/drm/xe/xe_gt_topology.c         |   2 +-
 drivers/gpu/drm/xe/xe_guc.c                 |  13 +-
 drivers/gpu/drm/xe/xe_guc_ads.c             |   8 +-
 drivers/gpu/drm/xe/xe_guc_ct.c              |   4 +-
 drivers/gpu/drm/xe/xe_guc_debugfs.c         |   2 +-
 drivers/gpu/drm/xe/xe_guc_hwconfig.c        |   2 +-
 drivers/gpu/drm/xe/xe_guc_log.c             |   2 +-
 drivers/gpu/drm/xe/xe_guc_pc.c              |  29 +-
 drivers/gpu/drm/xe/xe_guc_reg.h             |   2 +-
 drivers/gpu/drm/xe/xe_guc_submit.c          |   9 +-
 drivers/gpu/drm/xe/xe_huc.c                 |   2 +-
 drivers/gpu/drm/xe/xe_huc_debugfs.c         |   2 +-
 drivers/gpu/drm/xe/xe_hw_engine.c           |   8 +-
 drivers/gpu/drm/xe/xe_hw_fence.c            |   1 -
 drivers/gpu/drm/xe/xe_irq.c                 |   8 +-
 drivers/gpu/drm/xe/xe_lrc.c                 |  14 +-
 drivers/gpu/drm/xe/xe_migrate.c             |  14 +-
 drivers/gpu/drm/xe/xe_mmio.c                |   8 +-
 drivers/gpu/drm/xe/xe_mocs.c                |   7 +-
 drivers/gpu/drm/xe/xe_module.c              |   1 +
 drivers/gpu/drm/xe/xe_pci.c                 |   8 +-
 drivers/gpu/drm/xe/xe_pcode.c               |  10 +-
 drivers/gpu/drm/xe/xe_pm.c                  |   4 +-
 drivers/gpu/drm/xe/xe_preempt_fence.c       |   2 +-
 drivers/gpu/drm/xe/xe_pt.c                  |   4 +-
 drivers/gpu/drm/xe/xe_query.c               |  11 +-
 drivers/gpu/drm/xe/xe_reg_sr.c              |  10 +-
 drivers/gpu/drm/xe/xe_reg_sr_types.h        |   2 -
 drivers/gpu/drm/xe/xe_reg_whitelist.c       |   8 +-
 drivers/gpu/drm/xe/xe_ring_ops.c            |  11 +-
 drivers/gpu/drm/xe/xe_rtp.c                 |   1 -
 drivers/gpu/drm/xe/xe_rtp.h                 |   2 -
 drivers/gpu/drm/xe/xe_rtp_types.h           |   2 -
 drivers/gpu/drm/xe/xe_sa.c                  |   3 +-
 drivers/gpu/drm/xe/xe_sched_job.c           |   1 -
 drivers/gpu/drm/xe/xe_sync.c                |   5 +-
 drivers/gpu/drm/xe/xe_ttm_gtt_mgr.c         |   2 +-
 drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c      |   5 +-
 drivers/gpu/drm/xe/xe_ttm_vram_mgr.c        |   2 +-
 drivers/gpu/drm/xe/xe_tuning.c              |   5 +-
 drivers/gpu/drm/xe/xe_uc.c                  |   4 +-
 drivers/gpu/drm/xe/xe_vm.c                  |   2 +-
 drivers/gpu/drm/xe/xe_vm_madvise.c          |   8 +-
 drivers/gpu/drm/xe/xe_wa.c                  |   7 +-
 drivers/gpu/drm/xe/xe_wopcm.c               |   2 +-
 74 files changed, 900 insertions(+), 213 deletions(-)
 create mode 100644 drivers/gpu/drm/xe/display/Makefile
 create mode 100644 drivers/gpu/drm/xe/regs/xe_engine_regs.h
 create mode 100644 drivers/gpu/drm/xe/regs/xe_gpu_commands.h
 create mode 100644 drivers/gpu/drm/xe/regs/xe_gt_regs.h
 create mode 100644 drivers/gpu/drm/xe/regs/xe_lrc_regs.h
 create mode 100644 drivers/gpu/drm/xe/regs/xe_regs.h

-- 
2.39.0



More information about the Intel-xe mailing list