From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [Intel-gfx] [PATCH 00/21] drm/i915: clean up i915_drv.h
Date: Wed, 5 Jan 2022 21:56:16 +0200 [thread overview]
Message-ID: <cover.1641411696.git.jani.nikula@intel.com> (raw)
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
--
2.30.2
next reply other threads:[~2022-01-05 19:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-05 19:56 Jani Nikula [this message]
2022-01-05 19:56 ` [Intel-gfx] [PATCH 01/21] drm/i915: split out i915_getparam.h from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 02/21] drm/i915: split out i915_cmd_parser.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 03/21] drm/i915: split out i915_gem_evict.h " Jani Nikula
2022-01-06 8:55 ` Tvrtko Ursulin
2022-01-07 13:22 ` Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 04/21] drm/i915: split out gem/i915_gem_userptr.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 05/21] drm/i915: split out gem/i915_gem_tiling.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 06/21] drm/i915: split out i915_gem.h declarations " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 07/21] drm/i915: split out i915_gem_internal.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 08/21] drm/i915: remove leftover i915_gem_pm.h declarations " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 09/21] drm/i915: split out gem/i915_gem_dmabuf.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 10/21] drm/i915: split out gem/i915_gem_create.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 11/21] drm/i915: split out gem/i915_gem_domain.h " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 12/21] drm/i915: move i915_cache_level_str() static in i915_debugfs.c Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 13/21] drm/i915: move i915_gem_vm_lookup() where it's used Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 14/21] drm/i915: move i915_reset_count()/i915_reset_engine_count() out of i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 15/21] drm/i915: split out i915_file_private.h from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 16/21] drm/i915: don't include drm_cache.h in i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 17/21] drm/i915: include shmem_fs.h only where needed Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 18/21] drm/i915: include some drm headers " Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 19/21] drm/i915: axe lots of unnecessary includes from i915_drv.h Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 20/21] drm/i915: fix drm_i915.h include grouping and sorting Jani Nikula
2022-01-05 19:56 ` [Intel-gfx] [PATCH 21/21] drm/i915: group drm_i915.h forward declarations together Jani Nikula
2022-01-05 20:10 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915: clean up i915_drv.h Patchwork
2022-01-05 20:28 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1641411696.git.jani.nikula@intel.com \
--to=jani.nikula@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.