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

dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed

* [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory
@ 2024-05-30 13:19 Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe; +Cc: jani.nikula

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%)

-- 
2.39.2


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 02/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Andi Shyti, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/char/agp/intel-agp.c              | 2 +-
 drivers/char/agp/intel-gtt.c              | 2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c      | 2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 2 +-
 drivers/gpu/drm/i915/gt/intel_gt.c        | 2 +-
 include/drm/{ => intel}/intel-gtt.h       | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/drm/{ => intel}/intel-gtt.h (100%)

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index c518b3a9db04..eec80db6402d 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -12,7 +12,7 @@
 #include <asm/smp.h>
 #include "agp.h"
 #include "intel-agp.h"
-#include <drm/intel-gtt.h>
+#include <drm/intel/intel-gtt.h>
 
 static int intel_fetch_size(void)
 {
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index bf6716ff863b..11f5cf853c46 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -25,7 +25,7 @@
 #include <asm/smp.h>
 #include "agp.h"
 #include "intel-agp.h"
-#include <drm/intel-gtt.h>
+#include <drm/intel/intel-gtt.h>
 #include <asm/set_memory.h>
 
 /*
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 0d0a0dc9f610..2717699c6591 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -10,7 +10,7 @@
 
 #include <drm/drm_managed.h>
 #include <drm/i915_drm.h>
-#include <drm/intel-gtt.h>
+#include <drm/intel/intel-gtt.h>
 
 #include "display/intel_display.h"
 #include "gem/i915_gem_lmem.h"
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c b/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c
index 866c416afb73..59eed0a0ce90 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c
@@ -5,7 +5,7 @@
 
 #include "intel_ggtt_gmch.h"
 
-#include <drm/intel-gtt.h>
+#include <drm/intel/intel-gtt.h>
 
 #include <linux/agp_backend.h>
 
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
index 626b166e67ef..a6c69a706fd7 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -4,7 +4,7 @@
  */
 
 #include <drm/drm_managed.h>
-#include <drm/intel-gtt.h>
+#include <drm/intel/intel-gtt.h>
 
 #include "gem/i915_gem_internal.h"
 #include "gem/i915_gem_lmem.h"
diff --git a/include/drm/intel-gtt.h b/include/drm/intel/intel-gtt.h
similarity index 100%
rename from include/drm/intel-gtt.h
rename to include/drm/intel/intel-gtt.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 02/10] drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 03/10] drm: move i915_component.h " Jani Nikula
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Tomas Winkler, Andi Shyti, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c           | 2 +-
 drivers/gpu/drm/xe/xe_gsc_proxy.c                      | 2 +-
 drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c             | 2 +-
 include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h (100%)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
index a7d5465655f9..e7619d81353c 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
@@ -6,7 +6,7 @@
 #include <linux/component.h>
 
 #include <drm/i915_component.h>
-#include <drm/i915_gsc_proxy_mei_interface.h>
+#include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_print.h"
diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c
index 6d6d1068cf23..cc3426fcfa89 100644
--- a/drivers/gpu/drm/xe/xe_gsc_proxy.c
+++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c
@@ -10,7 +10,7 @@
 
 #include <drm/drm_managed.h>
 #include <drm/i915_component.h>
-#include <drm/i915_gsc_proxy_mei_interface.h>
+#include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 #include "abi/gsc_proxy_commands_abi.h"
 #include "regs/xe_gsc_regs.h"
diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
index 89364bdbb129..d5fbaf5d0c8e 100644
--- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
+++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
@@ -18,7 +18,7 @@
 #include <linux/uuid.h>
 #include <drm/drm_connector.h>
 #include <drm/i915_component.h>
-#include <drm/i915_gsc_proxy_mei_interface.h>
+#include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 /**
  * mei_gsc_proxy_send - Sends a proxy message to ME FW.
diff --git a/include/drm/i915_gsc_proxy_mei_interface.h b/include/drm/intel/i915_gsc_proxy_mei_interface.h
similarity index 100%
rename from include/drm/i915_gsc_proxy_mei_interface.h
rename to include/drm/intel/i915_gsc_proxy_mei_interface.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 03/10] drm: move i915_component.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 02/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 04/10] drm: move intel_lpe_audio.h " Jani Nikula
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Tomas Winkler, Jaroslav Kysela, Takashi Iwai, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

v2: Also change Documentation/gpu/i915.rst (Andi)

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 Documentation/gpu/i915.rst                   | 2 +-
 drivers/gpu/drm/i915/display/intel_audio.c   | 2 +-
 drivers/gpu/drm/i915/display/intel_hdcp.c    | 2 +-
 drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 2 +-
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c     | 2 +-
 drivers/gpu/drm/xe/xe_gsc_proxy.c            | 2 +-
 drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c   | 2 +-
 drivers/misc/mei/hdcp/mei_hdcp.c             | 2 +-
 drivers/misc/mei/pxp/mei_pxp.c               | 2 +-
 include/drm/{ => intel}/i915_component.h     | 0
 include/sound/hdaudio.h                      | 2 +-
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename include/drm/{ => intel}/i915_component.h (100%)

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 3113e36f14cf..ad59ae579237 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -150,7 +150,7 @@ High Definition Audio
 .. kernel-doc:: drivers/gpu/drm/i915/display/intel_audio.c
    :internal:
 
-.. kernel-doc:: include/drm/i915_component.h
+.. kernel-doc:: include/drm/intel/i915_component.h
    :internal:
 
 Intel HDMI LPE Audio Support
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 4c031e97f9a5..b9bafec06fb8 100644
--- a/drivers/gpu/drm/i915/display/intel_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_audio.c
@@ -26,7 +26,7 @@
 
 #include <drm/drm_edid.h>
 #include <drm/drm_eld.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 
 #include "i915_drv.h"
 #include "intel_atomic.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 5767070248bb..ba3eca919900 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -13,7 +13,7 @@
 #include <linux/random.h>
 
 #include <drm/display/drm_hdcp_helper.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 
 #include "i915_drv.h"
 #include "i915_reg.h"
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
index e7619d81353c..d8edd7c054c8 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c
@@ -5,7 +5,7 @@
 
 #include <linux/component.h>
 
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 #include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 #include "gt/intel_gt.h"
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
index b00d6c280159..051b6cdcf721 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@ -6,7 +6,7 @@
 #include <linux/component.h>
 
 #include <drm/i915_pxp_tee_interface.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 
 #include "gem/i915_gem_lmem.h"
 #include "gt/intel_gt_print.h"
diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c
index cc3426fcfa89..aa812a2bc3ed 100644
--- a/drivers/gpu/drm/xe/xe_gsc_proxy.c
+++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c
@@ -9,7 +9,7 @@
 #include <linux/delay.h>
 
 #include <drm/drm_managed.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 #include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 #include "abi/gsc_proxy_commands_abi.h"
diff --git a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
index d5fbaf5d0c8e..f52fe23a6c0b 100644
--- a/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
+++ b/drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/uuid.h>
 #include <drm/drm_connector.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 #include <drm/intel/i915_gsc_proxy_mei_interface.h>
 
 /**
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index f8759a6c9ed3..e43ea536c947 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -23,7 +23,7 @@
 #include <linux/mei_cl_bus.h>
 #include <linux/component.h>
 #include <drm/drm_connector.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 #include <drm/i915_hdcp_interface.h>
 
 #include "mei_hdcp.h"
diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c
index 49abc95677cd..ed88d6df4397 100644
--- a/drivers/misc/mei/pxp/mei_pxp.c
+++ b/drivers/misc/mei/pxp/mei_pxp.c
@@ -19,7 +19,7 @@
 #include <linux/mei_cl_bus.h>
 #include <linux/component.h>
 #include <drm/drm_connector.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 #include <drm/i915_pxp_tee_interface.h>
 
 #include "mei_pxp.h"
diff --git a/include/drm/i915_component.h b/include/drm/intel/i915_component.h
similarity index 100%
rename from include/drm/i915_component.h
rename to include/drm/intel/i915_component.h
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h
index 1d10939e40af..7e39d486374a 100644
--- a/include/sound/hdaudio.h
+++ b/include/sound/hdaudio.h
@@ -18,7 +18,7 @@
 #include <sound/pcm.h>
 #include <sound/memalloc.h>
 #include <sound/hda_verbs.h>
-#include <drm/i915_component.h>
+#include <drm/intel/i915_component.h>
 
 /* codec node id */
 typedef u16 hda_nid_t;
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 04/10] drm: move intel_lpe_audio.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (2 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 03/10] drm: move i915_component.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 05/10] drm: move i915_drm.h " Jani Nikula
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Jaroslav Kysela, Takashi Iwai, Andi Shyti, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_hdmi.c      | 2 +-
 drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +-
 include/drm/{ => intel}/intel_lpe_audio.h      | 0
 sound/x86/intel_hdmi_audio.c                   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename include/drm/{ => intel}/intel_lpe_audio.h (100%)

diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 3767be0bdba8..06ec9ce7fe1c 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -38,7 +38,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_crtc.h>
 #include <drm/drm_edid.h>
-#include <drm/intel_lpe_audio.h>
+#include <drm/intel/intel_lpe_audio.h>
 
 #include "g4x_hdmi.h"
 #include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/display/intel_lpe_audio.c b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
index 93e6cac9a4ed..f11626176fe2 100644
--- a/drivers/gpu/drm/i915/display/intel_lpe_audio.c
+++ b/drivers/gpu/drm/i915/display/intel_lpe_audio.c
@@ -68,7 +68,7 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
-#include <drm/intel_lpe_audio.h>
+#include <drm/intel/intel_lpe_audio.h>
 
 #include "i915_drv.h"
 #include "i915_irq.h"
diff --git a/include/drm/intel_lpe_audio.h b/include/drm/intel/intel_lpe_audio.h
similarity index 100%
rename from include/drm/intel_lpe_audio.h
rename to include/drm/intel/intel_lpe_audio.h
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index 02f5a7f9b728..d41ea09ffbe5 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -31,7 +31,7 @@
 #include <sound/jack.h>
 #include <drm/drm_edid.h>
 #include <drm/drm_eld.h>
-#include <drm/intel_lpe_audio.h>
+#include <drm/intel/intel_lpe_audio.h>
 #include "intel_hdmi_audio.h"
 
 #define INTEL_HDMI_AUDIO_SUSPEND_DELAY_MS  5000
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 05/10] drm: move i915_drm.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (3 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 04/10] drm: move intel_lpe_audio.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 06/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Bjorn Helgaas, Hans de Goede, Ilpo Järvinen, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

v2: Also fix comment in intel_pci_config.h (Ilpo)

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 arch/x86/kernel/early-quirks.c             | 2 +-
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +-
 drivers/gpu/drm/i915/gt/intel_ggtt.c       | 2 +-
 drivers/gpu/drm/i915/gt/intel_rps.c        | 2 +-
 drivers/gpu/drm/i915/intel_pci_config.h    | 2 +-
 drivers/gpu/drm/i915/soc/intel_gmch.c      | 2 +-
 drivers/gpu/drm/xe/xe_ggtt.c               | 2 +-
 drivers/platform/x86/intel_ips.c           | 2 +-
 include/drm/{ => intel}/i915_drm.h         | 0
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename include/drm/{ => intel}/i915_drm.h (100%)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 1c137771c5d2..ec1a7943c228 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -17,7 +17,7 @@
 #include <linux/bcma/bcma.h>
 #include <linux/bcma/bcma_regs.h>
 #include <linux/platform_data/x86/apple.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 #include <drm/i915_pciids.h>
 #include <asm/pci-direct.h>
 #include <asm/dma.h>
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index ad6dd7f3259b..30595b2b63e1 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -8,7 +8,7 @@
 #include <linux/mutex.h>
 
 #include <drm/drm_mm.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 
 #include "gem/i915_gem_lmem.h"
 #include "gem/i915_gem_region.h"
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 2717699c6591..206a5e0fedf1 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -9,7 +9,7 @@
 #include <linux/stop_machine.h>
 
 #include <drm/drm_managed.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 #include <drm/intel/intel-gtt.h>
 
 #include "display/intel_display.h"
diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
index c9cb2a391942..70176be269d3 100644
--- a/drivers/gpu/drm/i915/gt/intel_rps.c
+++ b/drivers/gpu/drm/i915/gt/intel_rps.c
@@ -5,7 +5,7 @@
 
 #include <linux/string_helpers.h>
 
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 
 #include "display/intel_display.h"
 #include "display/intel_display_irq.h"
diff --git a/drivers/gpu/drm/i915/intel_pci_config.h b/drivers/gpu/drm/i915/intel_pci_config.h
index 23b8e519f333..ebe040828e20 100644
--- a/drivers/gpu/drm/i915/intel_pci_config.h
+++ b/drivers/gpu/drm/i915/intel_pci_config.h
@@ -31,7 +31,7 @@ static inline int intel_mmio_bar(int graphics_ver)
 	}
 }
 
-/* BSM in include/drm/i915_drm.h */
+/* BSM in include/drm/intel/i915_drm.h */
 
 #define MCHBAR_I915				0x44
 #define MCHBAR_I965				0x48
diff --git a/drivers/gpu/drm/i915/soc/intel_gmch.c b/drivers/gpu/drm/i915/soc/intel_gmch.c
index 40874ebfb64c..734e9f2801ea 100644
--- a/drivers/gpu/drm/i915/soc/intel_gmch.c
+++ b/drivers/gpu/drm/i915/soc/intel_gmch.c
@@ -8,7 +8,7 @@
 #include <linux/vgaarb.h>
 
 #include <drm/drm_managed.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 
 #include "i915_drv.h"
 #include "intel_gmch.h"
diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c
index b01a670fecb8..8ff91fd1b7c8 100644
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -10,7 +10,7 @@
 
 #include <drm/drm_drv.h>
 #include <drm/drm_managed.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 
 #include "regs/xe_gt_regs.h"
 #include "regs/xe_gtt_defs.h"
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c
index 73ec4460a151..523fb18a7ace 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel_ips.c
@@ -59,7 +59,7 @@
 #include <linux/tick.h>
 #include <linux/timer.h>
 #include <linux/dmi.h>
-#include <drm/i915_drm.h>
+#include <drm/intel/i915_drm.h>
 #include <asm/msr.h>
 #include <asm/processor.h>
 #include "intel_ips.h"
diff --git a/include/drm/i915_drm.h b/include/drm/intel/i915_drm.h
similarity index 100%
rename from include/drm/i915_drm.h
rename to include/drm/intel/i915_drm.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 06/10] drm: move i915_pxp_tee_interface.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (4 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 05/10] drm: move i915_drm.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 07/10] drm: move i915_pciids.h " Jani Nikula
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Tomas Winkler, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/pxp/intel_pxp_tee.c         | 2 +-
 drivers/misc/mei/pxp/mei_pxp.c                   | 2 +-
 include/drm/{ => intel}/i915_pxp_tee_interface.h | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename include/drm/{ => intel}/i915_pxp_tee_interface.h (100%)

diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
index 051b6cdcf721..1784153f0cf8 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_tee.c
@@ -5,7 +5,7 @@
 
 #include <linux/component.h>
 
-#include <drm/i915_pxp_tee_interface.h>
+#include <drm/intel/i915_pxp_tee_interface.h>
 #include <drm/intel/i915_component.h>
 
 #include "gem/i915_gem_lmem.h"
diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c
index ed88d6df4397..2820d389c88e 100644
--- a/drivers/misc/mei/pxp/mei_pxp.c
+++ b/drivers/misc/mei/pxp/mei_pxp.c
@@ -20,7 +20,7 @@
 #include <linux/component.h>
 #include <drm/drm_connector.h>
 #include <drm/intel/i915_component.h>
-#include <drm/i915_pxp_tee_interface.h>
+#include <drm/intel/i915_pxp_tee_interface.h>
 
 #include "mei_pxp.h"
 
diff --git a/include/drm/i915_pxp_tee_interface.h b/include/drm/intel/i915_pxp_tee_interface.h
similarity index 100%
rename from include/drm/i915_pxp_tee_interface.h
rename to include/drm/intel/i915_pxp_tee_interface.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 07/10] drm: move i915_pciids.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (5 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 06/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 08/10] drm: move xe_pciids.h " Jani Nikula
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Bjorn Helgaas, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 arch/x86/kernel/early-quirks.c                      | 2 +-
 drivers/gpu/drm/i915/display/intel_display_device.c | 2 +-
 drivers/gpu/drm/i915/i915_pci.c                     | 2 +-
 drivers/gpu/drm/i915/intel_device_info.c            | 2 +-
 include/drm/{ => intel}/i915_pciids.h               | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename include/drm/{ => intel}/i915_pciids.h (100%)

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index ec1a7943c228..29d1f9104e94 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -18,7 +18,7 @@
 #include <linux/bcma/bcma_regs.h>
 #include <linux/platform_data/x86/apple.h>
 #include <drm/intel/i915_drm.h>
-#include <drm/i915_pciids.h>
+#include <drm/intel/i915_pciids.h>
 #include <asm/pci-direct.h>
 #include <asm/dma.h>
 #include <asm/io_apic.h>
diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index cf093bc0cb28..11e6edc03358 100644
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -3,7 +3,7 @@
  * Copyright © 2023 Intel Corporation
  */
 
-#include <drm/i915_pciids.h>
+#include <drm/intel/i915_pciids.h>
 #include <drm/drm_color_mgmt.h>
 #include <linux/pci.h>
 
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 84cd2f0343a2..ce4dfd65fafa 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -24,7 +24,7 @@
 
 #include <drm/drm_color_mgmt.h>
 #include <drm/drm_drv.h>
-#include <drm/i915_pciids.h>
+#include <drm/intel/i915_pciids.h>
 
 #include "display/intel_display.h"
 #include "display/intel_display_driver.h"
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 862f4b705227..d26de37719a7 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -25,7 +25,7 @@
 #include <linux/string_helpers.h>
 
 #include <drm/drm_print.h>
-#include <drm/i915_pciids.h>
+#include <drm/intel/i915_pciids.h>
 
 #include "gt/intel_gt_regs.h"
 #include "i915_drv.h"
diff --git a/include/drm/i915_pciids.h b/include/drm/intel/i915_pciids.h
similarity index 100%
rename from include/drm/i915_pciids.h
rename to include/drm/intel/i915_pciids.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 08/10] drm: move xe_pciids.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (6 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 07/10] drm: move i915_pciids.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 09/10] drm: move i915_hdcp_interface.h " Jani Nikula
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/xe/xe_pci.c         | 2 +-
 include/drm/{ => intel}/xe_pciids.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename include/drm/{ => intel}/xe_pciids.h (100%)

diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
index 1385d68c12c9..5655222aa4e1 100644
--- a/drivers/gpu/drm/xe/xe_pci.c
+++ b/drivers/gpu/drm/xe/xe_pci.c
@@ -13,7 +13,7 @@
 
 #include <drm/drm_color_mgmt.h>
 #include <drm/drm_drv.h>
-#include <drm/xe_pciids.h>
+#include <drm/intel/xe_pciids.h>
 
 #include "display/xe_display.h"
 #include "regs/xe_gt_regs.h"
diff --git a/include/drm/xe_pciids.h b/include/drm/intel/xe_pciids.h
similarity index 100%
rename from include/drm/xe_pciids.h
rename to include/drm/intel/xe_pciids.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 09/10] drm: move i915_hdcp_interface.h under include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (7 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 08/10] drm: move xe_pciids.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-30 13:19 ` [PATCH v2 10/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
  2024-05-31 13:23 ` [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
	Tomas Winkler, Rodrigo Vivi

Clean up the top level include/drm directory by grouping all the Intel
specific files under a common subdirectory.

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_types.h    | 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/xe/display/xe_hdcp_gsc.c              | 2 +-
 drivers/misc/mei/hdcp/mei_hdcp.c                      | 2 +-
 include/drm/{ => intel}/i915_hdcp_interface.h         | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename include/drm/{ => intel}/i915_hdcp_interface.h (100%)

diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h
index 6fbfe8a18f45..9210643c9fdf 100644
--- a/drivers/gpu/drm/i915/display/intel_display_types.h
+++ b/drivers/gpu/drm/i915/display/intel_display_types.h
@@ -44,7 +44,7 @@
 #include <drm/drm_rect.h>
 #include <drm/drm_vblank.h>
 #include <drm/drm_vblank_work.h>
-#include <drm/i915_hdcp_interface.h>
+#include <drm/intel/i915_hdcp_interface.h>
 #include <media/cec-notifier.h>
 
 #include "i915_vma.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
index 35823e1f65d6..16afeb8a3a8d 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc.c
@@ -3,7 +3,7 @@
  * Copyright 2023, Intel Corporation.
  */
 
-#include <drm/i915_hdcp_interface.h>
+#include <drm/intel/i915_hdcp_interface.h>
 
 #include "gem/i915_gem_region.h"
 #include "gt/intel_gt.h"
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
index 240b00849f3d..6548e71b4c49 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c
@@ -4,7 +4,7 @@
  */
 
 #include <linux/err.h>
-#include <drm/i915_hdcp_interface.h>
+#include <drm/intel/i915_hdcp_interface.h>
 
 #include "i915_drv.h"
 #include "intel_hdcp_gsc_message.h"
diff --git a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
index eb67ecf08db2..14b8b4278317 100644
--- a/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
+++ b/drivers/gpu/drm/xe/display/xe_hdcp_gsc.c
@@ -4,7 +4,7 @@
  */
 
 #include <drm/drm_print.h>
-#include <drm/i915_hdcp_interface.h>
+#include <drm/intel/i915_hdcp_interface.h>
 #include <linux/delay.h>
 
 #include "abi/gsc_command_header_abi.h"
diff --git a/drivers/misc/mei/hdcp/mei_hdcp.c b/drivers/misc/mei/hdcp/mei_hdcp.c
index e43ea536c947..323f10620d90 100644
--- a/drivers/misc/mei/hdcp/mei_hdcp.c
+++ b/drivers/misc/mei/hdcp/mei_hdcp.c
@@ -24,7 +24,7 @@
 #include <linux/component.h>
 #include <drm/drm_connector.h>
 #include <drm/intel/i915_component.h>
-#include <drm/i915_hdcp_interface.h>
+#include <drm/intel/i915_hdcp_interface.h>
 
 #include "mei_hdcp.h"
 
diff --git a/include/drm/i915_hdcp_interface.h b/include/drm/intel/i915_hdcp_interface.h
similarity index 100%
rename from include/drm/i915_hdcp_interface.h
rename to include/drm/intel/i915_hdcp_interface.h
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v2 10/10] MAINTAINERS: update i915 and xe entries for include/drm/intel
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (8 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 09/10] drm: move i915_hdcp_interface.h " Jani Nikula
@ 2024-05-30 13:19 ` Jani Nikula
  2024-05-31 13:23 ` [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-30 13:19 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe
  Cc: jani.nikula, Joonas Lahtinen, Lucas De Marchi, Oded Gabbay,
	Rodrigo Vivi, Thomas Hellström, Tvrtko Ursulin, Andi Shyti

With all the Intel specific drm files under include/drm/intel, update
the i915, xe, and the shared display entries. Do not discriminate based
on file name pattern, just add the entire directory for all three
entries.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Oded Gabbay <ogabbay@kernel.org>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Cc: Tvrtko Ursulin <tursulin@ursulin.net>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 MAINTAINERS | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 21aad782f1ea..572be0546e21 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11013,6 +11013,7 @@ S:	Supported
 F:	drivers/gpu/drm/i915/display/
 F:	drivers/gpu/drm/xe/display/
 F:	drivers/gpu/drm/xe/compat-i915-headers
+F:	include/drm/intel/
 
 INTEL DRM I915 DRIVER (Meteor Lake, DG2 and older excluding Poulsbo, Moorestown and derivative)
 M:	Jani Nikula <jani.nikula@linux.intel.com>
@@ -11030,7 +11031,7 @@ F:	Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
 F:	Documentation/gpu/i915.rst
 F:	drivers/gpu/drm/ci/xfails/i915*
 F:	drivers/gpu/drm/i915/
-F:	include/drm/i915*
+F:	include/drm/intel/
 F:	include/uapi/drm/i915_drm.h
 
 INTEL DRM XE DRIVER (Lunar Lake and newer)
@@ -11046,7 +11047,7 @@ T:	git https://gitlab.freedesktop.org/drm/xe/kernel.git
 F:	Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon
 F:	Documentation/gpu/xe/
 F:	drivers/gpu/drm/xe/
-F:	include/drm/xe*
+F:	include/drm/intel/
 F:	include/uapi/drm/xe_drm.h
 
 INTEL ETHERNET DRIVERS
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory
  2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
                   ` (9 preceding siblings ...)
  2024-05-30 13:19 ` [PATCH v2 10/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
@ 2024-05-31 13:23 ` Jani Nikula
  10 siblings, 0 replies; 12+ messages in thread
From: Jani Nikula @ 2024-05-31 13:23 UTC (permalink / raw)
  To: dri-devel, intel-gfx, intel-xe

On Thu, 30 May 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.

Pushed to drm-intel-next.

BR,
Jani.

>
> 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%)

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-05-31 13:23 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-30 13:19 [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
2024-05-30 13:19 ` [PATCH v2 01/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
2024-05-30 13:19 ` [PATCH v2 02/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 03/10] drm: move i915_component.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 04/10] drm: move intel_lpe_audio.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 05/10] drm: move i915_drm.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 06/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 07/10] drm: move i915_pciids.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 08/10] drm: move xe_pciids.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 09/10] drm: move i915_hdcp_interface.h " Jani Nikula
2024-05-30 13:19 ` [PATCH v2 10/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
2024-05-31 13:23 ` [PATCH v2 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).