Skip to content

drm/i915: clean up i915_drv.h

Jani Nikula intel-gfx 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest21 patches 3 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21drm/i915: split out i915_getparam.h from i915_drv.hdrivers/gpu/drm/i915/i915_driver.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_getparam.c +2 more+18 -40 replies
2/21drm/i915: split out i915_cmd_parser.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c drivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/i915_cmd_parser.c +3 more+30 -130 replies
3/21drm/i915: split out i915_gem_evict.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_execbuffer.c drivers/gpu/drm/i915/gt/selftest_hangcheck.c drivers/gpu/drm/i915/i915_drv.h +4 more+29 -112 replies
4/21drm/i915: split out gem/i915_gem_userptr.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_userptr.c drivers/gpu/drm/i915/gem/i915_gem_userptr.h drivers/gpu/drm/i915/i915_drv.h +1 more+16 -20 replies
5/21drm/i915: split out gem/i915_gem_tiling.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_tiling.c drivers/gpu/drm/i915/gem/i915_gem_tiling.h drivers/gpu/drm/i915/i915_drv.h +1 more+20 -60 replies
6/21drm/i915: split out i915_gem.h declarations from i915_drv.hdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.h+36 -320 replies
7/21drm/i915: split out i915_gem_internal.h from i915_drv.hdrivers/gpu/drm/i915/display/intel_dsb.c drivers/gpu/drm/i915/display/intel_overlay.c drivers/gpu/drm/i915/gem/i915_gem_internal.c +28 more+67 -160 replies
8/21drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.hdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c+1 -40 replies
9/21drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_dmabuf.c drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h drivers/gpu/drm/i915/gem/i915_gem_object.c +3 more+24 -50 replies
10/21drm/i915: split out gem/i915_gem_create.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_create.c drivers/gpu/drm/i915/gem/i915_gem_create.h drivers/gpu/drm/i915/i915_driver.c +1 more+19 -40 replies
11/21drm/i915: split out gem/i915_gem_domain.h from i915_drv.hdrivers/gpu/drm/i915/display/intel_dpt.c drivers/gpu/drm/i915/display/intel_fb_pin.c drivers/gpu/drm/i915/gem/i915_gem_domain.c +2 more+22 -60 replies
12/21drm/i915: move i915_cache_level_str() static in i915_debugfs.cdrivers/gpu/drm/i915/gt/intel_engine_cs.c drivers/gpu/drm/i915/i915_debugfs.c drivers/gpu/drm/i915/i915_drv.h+11 -130 replies
13/21drm/i915: move i915_gem_vm_lookup() where it's useddrivers/gpu/drm/i915/gem/i915_gem_context.c drivers/gpu/drm/i915/i915_drv.h+15 -140 replies
14/21drm/i915: move i915_reset_count()/i915_reset_engine_count() out of i915_drv.hdrivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gpu_error.h+11 -110 replies
15/21drm/i915: split out i915_file_private.h from i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_context.c drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c drivers/gpu/drm/i915/gem/i915_gem_object.c +8 more+117 -940 replies
16/21drm/i915: don't include drm_cache.h in i915_drv.hdrivers/gpu/drm/i915/gem/i915_gem_clflush.c drivers/gpu/drm/i915/gem/i915_gem_context.c drivers/gpu/drm/i915/gem/i915_gem_mman.c +11 more+25 -20 replies
17/21drm/i915: include shmem_fs.h only where neededdrivers/gpu/drm/i915/gem/i915_gem_shmem.c drivers/gpu/drm/i915/gem/i915_gem_ttm.c drivers/gpu/drm/i915/i915_drv.h+3 -10 replies
18/21drm/i915: include some drm headers only where neededdrivers/gpu/drm/i915/gem/i915_gem_create.c drivers/gpu/drm/i915/gvt/dmabuf.c drivers/gpu/drm/i915/i915_drv.h +1 more+6 -20 replies
19/21drm/i915: axe lots of unnecessary includes from i915_drv.hdrivers/gpu/drm/i915/i915_drv.h+0 -180 replies
20/21drm/i915: fix drm_i915.h include grouping and sortingdrivers/gpu/drm/i915/i915_drv.h+8 -110 replies
21/21drm/i915: group drm_i915.h forward declarations togetherdrivers/gpu/drm/i915/i915_drv.h+20 -250 replies

Reviews trailers per patch

1 of 21 patches has a Reviewed-by or Acked-by.

PatchTvrtko Ursulin
1/21
2/21
3/21A-b
4/21
5/21
6/21
7/21
8/21
9/21
10/21
11/21
12/21
13/21
14/21
15/21
16/21
17/21
18/21
19/21
20/21
21/21

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-gfx] [PATCH 00/21] drm/i915: clean up i915_drv.h

In a long overdue cleanup, split out a bunch of headers and declarations out of i915_drv.h, and reduce includes all over the place.

I feel pretty strongly that declarations for functions in some_file.c need to be placed in some_file.h. This does not generally seem to be the case in gem/gt land. I create a number of such files here to place the declarations extracted from i915_drv.h in them. I limit myself to i915_drv.h cleanup here, and leave further cleanup for follow-up.

i915_drv.h is a painful file to deal with. Due to the massive amount of headers it includes, and the massive amount of files it gets included from, it basically causes the entire driver to be rebuilt whenever almost any header gets changed in include/linux, include/drm, or i915 itself. Just build and sparse testing each commit takes eons.

This series is far from fixing everything, but it moves things forward a few strides.

BR,
Jani.

Jani Nikula (21):
drm/i915: split out i915_getparam.h from i915_drv.h drm/i915: split out i915_cmd_parser.h from i915_drv.h drm/i915: split out i915_gem_evict.h from i915_drv.h drm/i915: split out gem/i915_gem_userptr.h from i915_drv.h drm/i915: split out gem/i915_gem_tiling.h from i915_drv.h drm/i915: split out i915_gem.h declarations from i915_drv.h drm/i915: split out i915_gem_internal.h from i915_drv.h drm/i915: remove leftover i915_gem_pm.h declarations from i915_drv.h drm/i915: split out gem/i915_gem_dmabuf.h from i915_drv.h drm/i915: split out gem/i915_gem_create.h from i915_drv.h drm/i915: split out gem/i915_gem_domain.h from i915_drv.h drm/i915: move i915_cache_level_str() static in i915_debugfs.c drm/i915: move i915_gem_vm_lookup() where it's used drm/i915: move i915_reset_count()/i915_reset_engine_count() out of

    i915_drv.h

drm/i915: split out i915_file_private.h from i915_drv.h drm/i915: don't include drm_cache.h in i915_drv.h drm/i915: include shmem_fs.h only where needed drm/i915: include some drm headers only where needed drm/i915: axe lots of unnecessary includes from i915_drv.h drm/i915: fix drm_i915.h include grouping and sorting drm/i915: group drm_i915.h forward declarations together

 drivers/gpu/drm/i915/display/intel_dpt.c      |   4 +-
 drivers/gpu/drm/i915/display/intel_dsb.c      |   2 +
 drivers/gpu/drm/i915/display/intel_fb_pin.c   |   1 +
 drivers/gpu/drm/i915/display/intel_overlay.c  |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_clflush.c   |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_context.c   |  17 +
 drivers/gpu/drm/i915/gem/i915_gem_create.c    |   3 +
 drivers/gpu/drm/i915/gem/i915_gem_create.h    |  17 +
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c    |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h    |  18 ++
 drivers/gpu/drm/i915/gem/i915_gem_domain.c    |   5 +-
 drivers/gpu/drm/i915/gem/i915_gem_domain.h    |  15 +
 .../gpu/drm/i915/gem/i915_gem_execbuffer.c    |   3 +
 drivers/gpu/drm/i915/gem/i915_gem_internal.c  |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_internal.h  |  23 ++
 drivers/gpu/drm/i915/gem/i915_gem_mman.c      |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_object.c    |   5 +
 drivers/gpu/drm/i915/gem/i915_gem_pages.c     |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_shmem.c     |   3 +
 drivers/gpu/drm/i915/gem/i915_gem_throttle.c  |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_tiling.c    |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_tiling.h    |  18 ++
 drivers/gpu/drm/i915/gem/i915_gem_ttm.c       |   2 +
 drivers/gpu/drm/i915/gem/i915_gem_userptr.c   |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_userptr.h   |  14 +
 .../gpu/drm/i915/gem/selftests/huge_pages.c   |   3 +-
 .../drm/i915/gem/selftests/i915_gem_context.c |   1 +
 .../drm/i915/gem/selftests/i915_gem_mman.c    |   4 +-
 .../drm/i915/gem/selftests/igt_gem_utils.c    |   1 +
 .../gpu/drm/i915/gem/selftests/mock_context.c |   1 +
 drivers/gpu/drm/i915/gt/gen6_ppgtt.c          |   2 +
 drivers/gpu/drm/i915/gt/intel_engine_cs.c     |  14 +-
 drivers/gpu/drm/i915/gt/intel_gt.c            |   7 +-
 .../gpu/drm/i915/gt/intel_gt_buffer_pool.c    |   1 +
 drivers/gpu/drm/i915/gt/intel_gtt.c           |   1 +
 drivers/gpu/drm/i915/gt/intel_renderstate.c   |   2 +
 drivers/gpu/drm/i915/gt/intel_reset.c         |   1 +
 drivers/gpu/drm/i915/gt/intel_ring.c          |   1 +
 .../gpu/drm/i915/gt/intel_ring_submission.c   |   4 +
 drivers/gpu/drm/i915/gt/intel_timeline.c      |   5 +-
 drivers/gpu/drm/i915/gt/selftest_execlists.c  |   1 +
 drivers/gpu/drm/i915/gt/selftest_hangcheck.c  |   2 +
 drivers/gpu/drm/i915/gt/selftest_lrc.c        |   2 +
 drivers/gpu/drm/i915/gt/selftest_migrate.c    |   2 +
 drivers/gpu/drm/i915/gt/selftest_rps.c        |   2 +
 .../gpu/drm/i915/gt/selftest_workarounds.c    |   1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c   |   2 +
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c      |   2 +
 drivers/gpu/drm/i915/gvt/dmabuf.c             |   5 +
 drivers/gpu/drm/i915/i915_cmd_parser.c        |   3 +
 drivers/gpu/drm/i915/i915_cmd_parser.h        |  26 ++
 drivers/gpu/drm/i915/i915_debugfs.c           |  11 +
 drivers/gpu/drm/i915/i915_driver.c            |   4 +
 drivers/gpu/drm/i915/i915_drv.h               | 297 ++----------------
 drivers/gpu/drm/i915/i915_file_private.h      | 108 +++++++
 drivers/gpu/drm/i915/i915_gem.c               |   8 +-
 drivers/gpu/drm/i915/i915_gem.h               |  36 +++
 drivers/gpu/drm/i915/i915_gem_evict.c         |   1 +
 drivers/gpu/drm/i915/i915_gem_evict.h         |  24 ++
 drivers/gpu/drm/i915/i915_gem_gtt.c           |   1 +
 drivers/gpu/drm/i915/i915_getparam.c          |   2 +
 drivers/gpu/drm/i915/i915_getparam.h          |  15 +
 drivers/gpu/drm/i915/i915_gpu_error.c         |   1 +
 drivers/gpu/drm/i915/i915_gpu_error.h         |  11 +
 drivers/gpu/drm/i915/i915_ioc32.c             |   1 +
 drivers/gpu/drm/i915/i915_pci.c               |   1 +
 drivers/gpu/drm/i915/i915_perf.c              |   2 +
 drivers/gpu/drm/i915/i915_vma.c               |   3 +-
 drivers/gpu/drm/i915/selftests/i915_gem.c     |   3 +-
 .../gpu/drm/i915/selftests/i915_gem_evict.c   |   1 +
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c |   1 +
 drivers/gpu/drm/i915/selftests/i915_request.c |   1 +
 drivers/gpu/drm/i915/selftests/i915_vma.c     |   1 +
 drivers/gpu/drm/i915/selftests/igt_spinner.c  |   1 +
 74 files changed, 498 insertions(+), 294 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_create.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_dmabuf.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_domain.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_internal.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_tiling.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_userptr.h
 create mode 100644 drivers/gpu/drm/i915/i915_cmd_parser.h
 create mode 100644 drivers/gpu/drm/i915/i915_file_private.h
 create mode 100644 drivers/gpu/drm/i915/i915_gem_evict.h
 create mode 100644 drivers/gpu/drm/i915/i915_getparam.h
Signature · 1 line
2.30.2