Skip to content

drm: move Intel drm headers to a subdirectory

Jani Nikula dri-devel intel-gfx intel-xe 2 versions – Applied

Status from this message: Pushed to drm-intel-next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest10 patches 1 replyApplied
  2. v110 patches 13 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/10drm: move intel-gtt.h under include/drm/inteldrivers/char/agp/intel-agp.c drivers/char/agp/intel-gtt.c drivers/gpu/drm/i915/gt/intel_ggtt.c +3 more+5 -50 replies
2/10drm: move i915_gsc_proxy_mei_interface.h under include/drm/inteldrivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c drivers/gpu/drm/xe/xe_gsc_proxy.c drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c +1 more+3 -30 replies
3/10drm: move i915_component.h under include/drm/intelDocumentation/gpu/i915.rst drivers/gpu/drm/i915/display/intel_audio.c drivers/gpu/drm/i915/display/intel_hdcp.c +8 more+10 -100 replies
4/10drm: move intel_lpe_audio.h under include/drm/inteldrivers/gpu/drm/i915/display/intel_hdmi.c drivers/gpu/drm/i915/display/intel_lpe_audio.c include/drm/intel/intel_lpe_audio.h +1 more+3 -30 replies
5/10drm: move i915_drm.h under include/drm/intelarch/x86/kernel/early-quirks.c drivers/gpu/drm/i915/gem/i915_gem_stolen.c drivers/gpu/drm/i915/gt/intel_ggtt.c +6 more+8 -80 replies
6/10drm: move i915_pxp_tee_interface.h under include/drm/inteldrivers/gpu/drm/i915/pxp/intel_pxp_tee.c drivers/misc/mei/pxp/mei_pxp.c include/drm/intel/i915_pxp_tee_interface.h+2 -20 replies
7/10drm: move i915_pciids.h under include/drm/intelarch/x86/kernel/early-quirks.c drivers/gpu/drm/i915/display/intel_display_device.c drivers/gpu/drm/i915/i915_pci.c +2 more+4 -40 replies
8/10drm: move xe_pciids.h under include/drm/inteldrivers/gpu/drm/xe/xe_pci.c include/drm/intel/xe_pciids.h+1 -10 replies
9/10drm: move i915_hdcp_interface.h under include/drm/inteldrivers/gpu/drm/i915/display/intel_display_types.h drivers/gpu/drm/i915/display/intel_hdcp_gsc.c drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c +3 more+5 -50 replies
10/10MAINTAINERS: update i915 and xe entries for include/drm/intelMAINTAINERS+3 -20 replies

Reviews trailers per patch

All 10 patches have a Reviewed-by or Acked-by.

PatchAndi ShytiLucas De MarchiRodrigo Vivi
1/10R-b A-b A-b
2/10R-b A-b A-b
3/10A-b A-b
4/10R-b A-b A-b
5/10A-b A-b
6/10A-b A-b
7/10A-b A-b
8/10A-b A-b
9/10A-b A-b
10/10R-b A-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.

Read the v2 thread

Cover letter [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory

We've accumulated enough Intel specific header files under include/drm that they warrant a subdirectory of their own. Clean up the top drm header directory by moving the Intel files under include/drm/intel.

Since i915 is most impacted, I suggest merging the lot via drm-intel-next. Please ack if this is fine for you.

BR,
Jani.

Jani Nikula (10):
drm: move intel-gtt.h under include/drm/intel
drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel
drm: move i915_component.h under include/drm/intel
drm: move intel_lpe_audio.h under include/drm/intel
drm: move i915_drm.h under include/drm/intel
drm: move i915_pxp_tee_interface.h under include/drm/intel
drm: move i915_pciids.h under include/drm/intel
drm: move xe_pciids.h under include/drm/intel
drm: move i915_hdcp_interface.h under include/drm/intel
MAINTAINERS: update i915 and xe entries for include/drm/intel

 Documentation/gpu/i915.rst                             | 2 +-
 MAINTAINERS                                            | 5 +++--
 arch/x86/kernel/early-quirks.c                         | 4 ++--
 drivers/char/agp/intel-agp.c                           | 2 +-
 drivers/char/agp/intel-gtt.c                           | 2 +-
 drivers/gpu/drm/i915/display/intel_audio.c             | 2 +-
 drivers/gpu/drm/i915/display/intel_display_device.c    | 2 +-
 drivers/gpu/drm/i915/display/intel_display_types.h     | 2 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c              | 2 +-
 drivers/gpu/drm/i915/display/intel_hdcp_gsc.c          | 2 +-
 drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c  | 2 +-
 drivers/gpu/drm/i915/display/intel_hdmi.c              | 2 +-
 drivers/gpu/drm/i915/display/intel_lpe_audio.c         | 2 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c             | 2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c                   | 4 ++--
 drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c              | 2 +-
 drivers/gpu/drm/i915/gt/intel_gt.c                     | 2 +-
 drivers/gpu/drm/i915/gt/intel_rps.c                    | 2 +-
 drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c           | 4 ++--
 drivers/gpu/drm/i915/i915_pci.c                        | 2 +-
 drivers/gpu/drm/i915/intel_device_info.c               | 2 +-
 drivers/gpu/drm/i915/intel_pci_config.h                | 2 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c               | 4 ++--
 drivers/gpu/drm/i915/soc/intel_gmch.c                  | 2 +-
 drivers/gpu/drm/xe/display/xe_hdcp_gsc.c               | 2 +-
 drivers/gpu/drm/xe/xe_ggtt.c                           | 2 +-
 drivers/gpu/drm/xe/xe_gsc_proxy.c                      | 4 ++--
 drivers/gpu/drm/xe/xe_pci.c                            | 2 +-
 drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c             | 4 ++--
 drivers/misc/mei/hdcp/mei_hdcp.c                       | 4 ++--
 drivers/misc/mei/pxp/mei_pxp.c                         | 4 ++--
 drivers/platform/x86/intel_ips.c                       | 2 +-
 include/drm/{ => intel}/i915_component.h               | 0
 include/drm/{ => intel}/i915_drm.h                     | 0
 include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h | 0
 include/drm/{ => intel}/i915_hdcp_interface.h          | 0
 include/drm/{ => intel}/i915_pciids.h                  | 0
 include/drm/{ => intel}/i915_pxp_tee_interface.h       | 0
 include/drm/{ => intel}/intel-gtt.h                    | 0
 include/drm/{ => intel}/intel_lpe_audio.h              | 0
 include/drm/{ => intel}/xe_pciids.h                    | 0
 include/sound/hdaudio.h                                | 2 +-
 sound/x86/intel_hdmi_audio.c                           | 2 +-
 43 files changed, 44 insertions(+), 43 deletions(-)
 rename include/drm/{ => intel}/i915_component.h (100%)
 rename include/drm/{ => intel}/i915_drm.h (100%)
 rename include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h (100%)
 rename include/drm/{ => intel}/i915_hdcp_interface.h (100%)
 rename include/drm/{ => intel}/i915_pciids.h (100%)
 rename include/drm/{ => intel}/i915_pxp_tee_interface.h (100%)
 rename include/drm/{ => intel}/intel-gtt.h (100%)
 rename include/drm/{ => intel}/intel_lpe_audio.h (100%)
 rename include/drm/{ => intel}/xe_pciids.h (100%)
Signature · 1 line
2.39.2