Skip to content

drm: make headers self-contained and drop drmP.h

Sam Ravnborg dri-devel intel-gfx 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/27 patches 5 repliesIn review
  2. v2 posting 1/22 patches 3 repliesSuperseded
  3. v16 patches 2 repliesSuperseded

Changes in v2 from the cover letter

- use same ordering af blocks
- move includes down below license text
- added patch with actual drmP.h removal
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)

Patches in v2 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/7drm: make drm/drm_auth.h self containedinclude/drm/drm_auth.h+9 -22 replies
2/7drm: make drm/drm_legacy.h self-containedinclude/drm/drm_legacy.h+6 -60 replies
3/7drm: make drm_crtc_internal.h self-containeddrivers/gpu/drm/drm_crtc_internal.h+20 -40 replies
4/7drm: make drm_internal.h self-containeddrivers/gpu/drm/drm_internal.h+9 -10 replies
5/7drm: make drm_legacy.h self-containeddrivers/gpu/drm/drm_legacy.h+4 -00 replies
6/7drm: make drm_trace.h self-containeddrivers/gpu/drm/drm_trace.h+2 -00 replies
7/7drm: drop use of drmP.h in drm/*drivers/gpu/drm/ati_pcigart.c drivers/gpu/drm/drm_agpsupport.c drivers/gpu/drm/drm_atomic.c +56 more+356 -1500 replies

Reviews trailers per patch

None of the 7 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDaniel Vetter
SeriesA-b
1/7
2/7
3/7
4/7
5/7
6/7
7/7

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

Read the v2 thread

Cover letter [PATCH v2 0/7] drm: make headers self-contained and drop drmP.h

While removing use of drmP.h from files in drm/* I noticed that I had to add the same include files due to dependencies in the header files.

It is better to let the header files be self-contained and let the users pull in only the additional headers files required. So I went ahead and made the relevant header files self-contained. (I did not check if this made any includes redundant in some files, I do not have tooling in place to do so).

Daniel suggested to add support for testing that they stay self contained.
Jani Nikula has sent a patch to kbuild to make this part of the kbuild machinery. I have used it locally and as soon as it lands in kbuild I will start using it for drm.
We could have duplicated the infrastructure now but that seemed too much code chrunch.

This patchset include the actual removal of drmP.h as one big patch. This is build tested on alpha (always interesting), arm, arm64, x86 etc.

For all files touched the following was done:
- include files divided up in blocks in following order:

    	linux/*
	video/*
	drm/*
	""

- within each block the include files are sorted alphabetically

v2:
- use same ordering af blocks
- move includes down below license text
- added patch with actual drmP.h removal
- reworded some subjects to make them more descriptive
- fixed a few spelling erros in changelogs (but a few may remain)

Sam

Sam Ravnborg (7):
drm: make drm/drm_auth.h self contained
drm: make drm/drm_legacy.h self-contained
drm: make drm_crtc_internal.h self-contained
drm: make drm_internal.h self-contained
drm: make drm_legacy.h self-contained
drm: make drm_trace.h self-contained
drm: drop use of drmP.h in drm/*

 drivers/gpu/drm/ati_pcigart.c                |  5 ++++-
 drivers/gpu/drm/drm_agpsupport.c             | 11 +++++++++--
 drivers/gpu/drm/drm_atomic.c                 |  9 +++++++--
 drivers/gpu/drm/drm_atomic_helper.c          | 11 +++++++----
 drivers/gpu/drm/drm_atomic_state_helper.c    |  7 ++++---
 drivers/gpu/drm/drm_auth.c                   | 10 ++++++++--
 drivers/gpu/drm/drm_blend.c                  |  9 ++++++---
 drivers/gpu/drm/drm_bufs.c                   | 21 ++++++++++++++++-----
 drivers/gpu/drm/drm_client.c                 |  2 +-
 drivers/gpu/drm/drm_color_mgmt.c             |  8 ++++++--
 drivers/gpu/drm/drm_context.c                |  8 +++++++-
 drivers/gpu/drm/drm_crtc_helper.c            | 14 ++++++++------
 drivers/gpu/drm/drm_crtc_internal.h          | 24 ++++++++++++++++++++----
 drivers/gpu/drm/drm_debugfs.c                | 13 ++++++++-----
 drivers/gpu/drm/drm_debugfs_crc.c            |  9 ++++++++-
 drivers/gpu/drm/drm_dma.c                    |  6 +++++-
 drivers/gpu/drm/drm_drv.c                    |  9 ++++++---
 drivers/gpu/drm/drm_dumb_buffers.c           |  4 +++-
 drivers/gpu/drm/drm_encoder.c                |  4 +++-
 drivers/gpu/drm/drm_fb_helper.c              | 19 ++++++++++++-------
 drivers/gpu/drm/drm_file.c                   | 11 +++++++----
 drivers/gpu/drm/drm_flip_work.c              |  6 ++++--
 drivers/gpu/drm/drm_fourcc.c                 |  2 +-
 drivers/gpu/drm/drm_framebuffer.c            | 13 +++++++++----
 drivers/gpu/drm/drm_gem.c                    |  8 ++++++--
 drivers/gpu/drm/drm_gem_cma_helper.c         | 11 ++++++-----
 drivers/gpu/drm/drm_gem_framebuffer_helper.c |  1 -
 drivers/gpu/drm/drm_hashtab.c                | 10 +++++++---
 drivers/gpu/drm/drm_internal.h               | 10 +++++++++-
 drivers/gpu/drm/drm_ioc32.c                  |  9 ++++++---
 drivers/gpu/drm/drm_ioctl.c                  | 22 ++++++++++++++--------
 drivers/gpu/drm/drm_irq.c                    | 13 +++++++++----
 drivers/gpu/drm/drm_kms_helper_common.c      |  3 ++-
 drivers/gpu/drm/drm_lease.c                  | 15 ++++++++++-----
 drivers/gpu/drm/drm_legacy.h                 |  4 ++++
 drivers/gpu/drm/drm_legacy_misc.c            |  7 ++++++-
 drivers/gpu/drm/drm_lock.c                   |  8 ++++++--
 drivers/gpu/drm/drm_memory.c                 |  9 +++++++--
 drivers/gpu/drm/drm_mm.c                     |  9 +++++----
 drivers/gpu/drm/drm_mode_config.c            |  6 +++++-
 drivers/gpu/drm/drm_mode_object.c            |  9 +++++++--
 drivers/gpu/drm/drm_modes.c                  |  7 +++++--
 drivers/gpu/drm/drm_modeset_lock.c           |  2 +-
 drivers/gpu/drm/drm_of.c                     |  5 +++--
 drivers/gpu/drm/drm_pci.c                    | 11 ++++++++---
 drivers/gpu/drm/drm_plane_helper.c           |  9 +++++----
 drivers/gpu/drm/drm_prime.c                  |  7 +++++--
 drivers/gpu/drm/drm_print.c                  |  7 ++++++-
 drivers/gpu/drm/drm_probe_helper.c           |  7 ++++---
 drivers/gpu/drm/drm_property.c               |  7 ++++++-
 drivers/gpu/drm/drm_rect.c                   |  4 +++-
 drivers/gpu/drm/drm_scatter.c                |  9 +++++++--
 drivers/gpu/drm/drm_scdc_helper.c            |  2 +-
 drivers/gpu/drm/drm_simple_kms_helper.c      |  5 +++--
 drivers/gpu/drm/drm_syncobj.c                | 13 +++++++++----
 drivers/gpu/drm/drm_sysfs.c                  | 15 +++++++++++----
 drivers/gpu/drm/drm_trace.h                  |  2 ++
 drivers/gpu/drm/drm_trace_points.c           |  3 ++-
 drivers/gpu/drm/drm_vblank.c                 | 12 +++++++++---
 drivers/gpu/drm/drm_vm.c                     | 14 +++++++++++++-
 drivers/gpu/drm/drm_vma_manager.c            |  6 +++---
 drivers/gpu/drm/drm_vram_mm_helper.c         |  4 +++-
 drivers/gpu/drm/drm_writeback.c              |  6 ++++--
 include/drm/drm_auth.h                       | 11 +++++++++--
 include/drm/drm_legacy.h                     | 12 ++++++------
 65 files changed, 406 insertions(+), 163 deletions(-)

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel