mbox series

[00/10] drm: move Intel drm headers to a subdirectory

Message ID cover.1712743191.git.jani.nikula@intel.com (mailing list archive)
Headers show
Series drm: move Intel drm headers to a subdirectory | expand

Message

Jani Nikula April 10, 2024, 10:05 a.m. UTC
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.


Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>

Jani Nikula (10):
  drm/i915: use system include for drm headers
  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

 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/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               | 2 +-
 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 +-
 40 files changed, 40 insertions(+), 40 deletions(-)
 rename include/drm/{ => intel}/i915_component.h (98%)
 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%)

Comments

Lucas De Marchi April 10, 2024, 10:25 p.m. UTC | #1
On Wed, Apr 10, 2024 at 01:05:07PM +0300, Jani Nikula wrote:
>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.


Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>

Lucas De Marchi
Jani Nikula April 15, 2024, 1:08 p.m. UTC | #2
On Wed, 10 Apr 2024, Jani Nikula <jani.nikula@intel.com> wrote:
> 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.

While all of this is trivial, merely changing some includes, please
consider acking the changes to your corner of the kernel.

Thanks,
Jani.


>
> BR,
> Jani.
>
>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Dave Airlie <airlied@gmail.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Lucas De Marchi <lucas.demarchi@intel.com>
> Cc: Takashi Iwai <tiwai@suse.com>
> Cc: Tomas Winkler <tomas.winkler@intel.com>
>
> Jani Nikula (10):
>   drm/i915: use system include for drm headers
>   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
>
>  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/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               | 2 +-
>  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 +-
>  40 files changed, 40 insertions(+), 40 deletions(-)
>  rename include/drm/{ => intel}/i915_component.h (98%)
>  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%)