* [PATCH 00/10] drm: move Intel drm headers to a subdirectory
@ 2024-04-10 10:05 Jani Nikula
2024-04-10 10:05 ` [PATCH 01/10] drm/i915: use system include for drm headers Jani Nikula
` (12 more replies)
0 siblings, 13 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Bjorn Helgaas, Daniel Vetter, Dave Airlie,
Hans de Goede, Ilpo Järvinen, Jaroslav Kysela,
Lucas De Marchi, Takashi Iwai, Tomas Winkler
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%)
--
2.39.2
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH 01/10] drm/i915: use system include for drm headers
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 14:06 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
` (11 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel; +Cc: jani.nikula
Use <> instead of "" for including headers from include/, even if the
file is in the same directory.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
include/drm/i915_component.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/drm/i915_component.h b/include/drm/i915_component.h
index 56a84ee1c64c..4ea3b17aa143 100644
--- a/include/drm/i915_component.h
+++ b/include/drm/i915_component.h
@@ -24,7 +24,7 @@
#ifndef _I915_COMPONENT_H_
#define _I915_COMPONENT_H_
-#include "drm_audio_component.h"
+#include <drm/drm_audio_component.h>
enum i915_component_type {
I915_COMPONENT_AUDIO = 1,
--
2.39.2
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
2024-04-10 10:05 ` [PATCH 01/10] drm/i915: use system include for drm headers Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 14:15 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
` (10 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi
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>
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 580b5141ce1e..bab805ca4f0d 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] 28+ messages in thread
* [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
2024-04-10 10:05 ` [PATCH 01/10] drm/i915: use system include for drm headers Jani Nikula
2024-04-10 10:05 ` [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-11 14:11 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 04/10] drm: move i915_component.h " Jani Nikula
` (9 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi, Tomas Winkler
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>
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 35e397b68dfc..ea7b5ffb8954 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] 28+ messages in thread
* [PATCH 04/10] drm: move i915_component.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (2 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-11 14:14 ` Andi Shyti
2024-04-11 15:34 ` [PATCH v2] " Jani Nikula
2024-04-10 10:05 ` [PATCH 05/10] drm: move intel_lpe_audio.h " Jani Nikula
` (8 subsequent siblings)
12 siblings, 2 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
Tomas Winkler, Jaroslav Kysela, Takashi Iwai
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>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
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 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename include/drm/{ => intel}/i915_component.h (100%)
diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i915/display/intel_audio.c
index 07e0c73204f3..53951c50b504 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 d5ed4c7dfbc0..183ea437d623 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 ea7b5ffb8954..a278d08b343c 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 b1e4c23b31a3..5a7a4d8b0e23 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 a73d7f34f4e5..00d1ab6936dd 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] 28+ messages in thread
* [PATCH 05/10] drm: move intel_lpe_audio.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (3 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 04/10] drm: move i915_component.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-11 14:19 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 06/10] drm: move i915_drm.h " Jani Nikula
` (7 subsequent siblings)
12 siblings, 1 reply; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
Jaroslav Kysela, Takashi Iwai
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>
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 5f6deceaf8ba..959aa1143a7d 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 5863763de530..4e3f78d1d4f9 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] 28+ messages in thread
* [PATCH 06/10] drm: move i915_drm.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (4 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 05/10] drm: move intel_lpe_audio.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 10:19 ` Ilpo Järvinen
2024-04-10 10:26 ` [PATCH v2] " Jani Nikula
2024-04-10 10:05 ` [PATCH 07/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
` (6 subsequent siblings)
12 siblings, 2 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi,
Bjorn Helgaas, Hans de Goede, Ilpo Järvinen
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>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.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/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
8 files changed, 7 insertions(+), 7 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 59f4aefc6bc1..5b867c02d2b5 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/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 ff2239c0eda5..7af1a48f3b59 100644
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -9,7 +9,7 @@
#include <linux/sizes.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 ba38649cc142..2a88012958eb 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] 28+ messages in thread
* [PATCH 07/10] drm: move i915_pxp_tee_interface.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (5 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 06/10] drm: move i915_drm.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 10:05 ` [PATCH 08/10] drm: move i915_pciids.h " Jani Nikula
` (5 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi, Tomas Winkler
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>
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 5a7a4d8b0e23..4268a868255f 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] 28+ messages in thread
* [PATCH 08/10] drm: move i915_pciids.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (6 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 07/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 10:05 ` [PATCH 09/10] drm: move xe_pciids.h " Jani Nikula
` (4 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi, Bjorn Helgaas
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>
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 5b867c02d2b5..6019949a3f68 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 b8903bd0e82a..15525fbf91c1 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 405ca17a990b..983848e5b5b4 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 a0a43ea07f11..12948d586143 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] 28+ messages in thread
* [PATCH 09/10] drm: move xe_pciids.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (7 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 08/10] drm: move i915_pciids.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 10:05 ` [PATCH 10/10] drm: move i915_hdcp_interface.h " Jani Nikula
` (3 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi
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>
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 3b30353dbc09..46b3ee310ee7 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] 28+ messages in thread
* [PATCH 10/10] drm: move i915_hdcp_interface.h under include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (8 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 09/10] drm: move xe_pciids.h " Jani Nikula
@ 2024-04-10 10:05 ` Jani Nikula
2024-04-10 22:25 ` [PATCH 00/10] drm: move Intel drm headers to a subdirectory Lucas De Marchi
` (2 subsequent siblings)
12 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:05 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Daniel Vetter, Dave Airlie, Lucas De Marchi, Tomas Winkler
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>
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 0f4bd5710796..98d3b6a57b82 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 ac4b870f73fa..378ee3f426dc 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] 28+ messages in thread
* Re: [PATCH 06/10] drm: move i915_drm.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 06/10] drm: move i915_drm.h " Jani Nikula
@ 2024-04-10 10:19 ` Ilpo Järvinen
2024-04-10 10:23 ` Jani Nikula
2024-04-10 10:26 ` [PATCH v2] " Jani Nikula
1 sibling, 1 reply; 28+ messages in thread
From: Ilpo Järvinen @ 2024-04-10 10:19 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Bjorn Helgaas, Hans de Goede
[-- Attachment #1: Type: text/plain, Size: 4524 bytes --]
On Wed, 10 Apr 2024, Jani Nikula wrote:
> 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>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Ilpo Järvinen <ilpo.jarvinen@linux.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/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
> 8 files changed, 7 insertions(+), 7 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 59f4aefc6bc1..5b867c02d2b5 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/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 ff2239c0eda5..7af1a48f3b59 100644
> --- a/drivers/gpu/drm/xe/xe_ggtt.c
> +++ b/drivers/gpu/drm/xe/xe_ggtt.c
> @@ -9,7 +9,7 @@
> #include <linux/sizes.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 ba38649cc142..2a88012958eb 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
Could you please also address the comment in
drivers/gpu/drm/i915/intel_pci_config.h.
--
i.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 06/10] drm: move i915_drm.h under include/drm/intel
2024-04-10 10:19 ` Ilpo Järvinen
@ 2024-04-10 10:23 ` Jani Nikula
0 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:23 UTC (permalink / raw)
To: Ilpo Järvinen
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Bjorn Helgaas, Hans de Goede
On Wed, 10 Apr 2024, Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> wrote:
> Could you please also address the comment in
> drivers/gpu/drm/i915/intel_pci_config.h.
Ack.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2] drm: move i915_drm.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 06/10] drm: move i915_drm.h " Jani Nikula
2024-04-10 10:19 ` Ilpo Järvinen
@ 2024-04-10 10:26 ` Jani Nikula
2024-04-11 14:21 ` Andi Shyti
1 sibling, 1 reply; 28+ messages in thread
From: Jani Nikula @ 2024-04-10 10:26 UTC (permalink / raw)
To: Jani Nikula, intel-gfx, intel-xe, dri-devel
Cc: Daniel Vetter, Dave Airlie, Lucas De Marchi, Bjorn Helgaas,
Hans de Goede, Ilpo Järvinen
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>
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 59f4aefc6bc1..5b867c02d2b5 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 ff2239c0eda5..7af1a48f3b59 100644
--- a/drivers/gpu/drm/xe/xe_ggtt.c
+++ b/drivers/gpu/drm/xe/xe_ggtt.c
@@ -9,7 +9,7 @@
#include <linux/sizes.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 ba38649cc142..2a88012958eb 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] 28+ messages in thread
* Re: [PATCH 01/10] drm/i915: use system include for drm headers
2024-04-10 10:05 ` [PATCH 01/10] drm/i915: use system include for drm headers Jani Nikula
@ 2024-04-10 14:06 ` Andi Shyti
0 siblings, 0 replies; 28+ messages in thread
From: Andi Shyti @ 2024-04-10 14:06 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, intel-xe, dri-devel
Hi Jani,
On Wed, Apr 10, 2024 at 01:05:08PM +0300, Jani Nikula wrote:
> Use <> instead of "" for including headers from include/, even if the
> file is in the same directory.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
@ 2024-04-10 14:15 ` Andi Shyti
0 siblings, 0 replies; 28+ messages in thread
From: Andi Shyti @ 2024-04-10 14:15 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi
On Wed, Apr 10, 2024 at 01:05:09PM +0300, Jani Nikula wrote:
> 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>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 00/10] drm: move Intel drm headers to a subdirectory
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (9 preceding siblings ...)
2024-04-10 10:05 ` [PATCH 10/10] drm: move i915_hdcp_interface.h " Jani Nikula
@ 2024-04-10 22:25 ` Lucas De Marchi
2024-04-11 15:45 ` [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
2024-04-15 13:08 ` [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
12 siblings, 0 replies; 28+ messages in thread
From: Lucas De Marchi @ 2024-04-10 22:25 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Bjorn Helgaas, Daniel Vetter,
Dave Airlie, Hans de Goede, Ilpo Järvinen, Jaroslav Kysela,
Takashi Iwai, Tomas Winkler
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
@ 2024-04-11 14:11 ` Andi Shyti
0 siblings, 0 replies; 28+ messages in thread
From: Andi Shyti @ 2024-04-11 14:11 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Tomas Winkler
Hi Jani,
On Wed, Apr 10, 2024 at 01:05:10PM +0300, Jani Nikula wrote:
> 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>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 04/10] drm: move i915_component.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 04/10] drm: move i915_component.h " Jani Nikula
@ 2024-04-11 14:14 ` Andi Shyti
2024-04-11 15:34 ` [PATCH v2] " Jani Nikula
1 sibling, 0 replies; 28+ messages in thread
From: Andi Shyti @ 2024-04-11 14:14 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Tomas Winkler, Jaroslav Kysela, Takashi Iwai
Hi Jani,
On Wed, Apr 10, 2024 at 01:05:11PM +0300, Jani Nikula wrote:
> 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>
> Cc: Jaroslav Kysela <perex@perex.cz>
> Cc: Takashi Iwai <tiwai@suse.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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 +-
Please update also Documentation/gpu/i915.rst.
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 05/10] drm: move intel_lpe_audio.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 05/10] drm: move intel_lpe_audio.h " Jani Nikula
@ 2024-04-11 14:19 ` Andi Shyti
2024-04-11 15:25 ` Jani Nikula
0 siblings, 1 reply; 28+ messages in thread
From: Andi Shyti @ 2024-04-11 14:19 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Jaroslav Kysela, Takashi Iwai
Hi Jani,
On Wed, Apr 10, 2024 at 01:05:12PM +0300, Jani Nikula wrote:
> 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>
> 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
strange thing here is that we have two different
intel_lpe_audio.h. Can't they be merged?
And, perhaps, we could also think of dropping the intel_ prefix
for the files inside drm/intel/.
In any case,
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2] drm: move i915_drm.h under include/drm/intel
2024-04-10 10:26 ` [PATCH v2] " Jani Nikula
@ 2024-04-11 14:21 ` Andi Shyti
2024-04-11 15:33 ` Jani Nikula
0 siblings, 1 reply; 28+ messages in thread
From: Andi Shyti @ 2024-04-11 14:21 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Bjorn Helgaas, Hans de Goede,
Ilpo Järvinen
Hi Jani,
On Wed, Apr 10, 2024 at 01:26:15PM +0300, Jani Nikula wrote:
> 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>
> 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%)
Am I seeing wrong or are you missing a bunch of them, like
Documentation, MAINTAINERS and many more?
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 05/10] drm: move intel_lpe_audio.h under include/drm/intel
2024-04-11 14:19 ` Andi Shyti
@ 2024-04-11 15:25 ` Jani Nikula
0 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-11 15:25 UTC (permalink / raw)
To: Andi Shyti
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Jaroslav Kysela, Takashi Iwai
On Thu, 11 Apr 2024, Andi Shyti <andi.shyti@linux.intel.com> wrote:
> Hi Jani,
>
> On Wed, Apr 10, 2024 at 01:05:12PM +0300, Jani Nikula wrote:
>> 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>
>> 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
>
> strange thing here is that we have two different
> intel_lpe_audio.h. Can't they be merged?
Not so strange. The one in i915 is internal to i915, and the one in
include/drm is shared with sound/x86/intel_hdmi_audio.c.
> And, perhaps, we could also think of dropping the intel_ prefix
> for the files inside drm/intel/.
This series was scripted, so I didn't go into manual stuff like that
(yet). :)
BR,
Jani.
>
> In any case,
>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
>
> Thanks,
> Andi
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2] drm: move i915_drm.h under include/drm/intel
2024-04-11 14:21 ` Andi Shyti
@ 2024-04-11 15:33 ` Jani Nikula
0 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-11 15:33 UTC (permalink / raw)
To: Andi Shyti
Cc: intel-gfx, intel-xe, dri-devel, Daniel Vetter, Dave Airlie,
Lucas De Marchi, Bjorn Helgaas, Hans de Goede,
Ilpo Järvinen
On Thu, 11 Apr 2024, Andi Shyti <andi.shyti@linux.intel.com> wrote:
> Hi Jani,
>
> On Wed, Apr 10, 2024 at 01:26:15PM +0300, Jani Nikula wrote:
>> 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>
>> 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%)
>
> Am I seeing wrong or are you missing a bunch of them, like
> Documentation, MAINTAINERS and many more?
uapi/drm/i915_drm.h is different!
But good point about MAINTAINERS, I'll add a separate patch on top.
BR,
Jani.
>
> Andi
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2] drm: move i915_component.h under include/drm/intel
2024-04-10 10:05 ` [PATCH 04/10] drm: move i915_component.h " Jani Nikula
2024-04-11 14:14 ` Andi Shyti
@ 2024-04-11 15:34 ` Jani Nikula
1 sibling, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-11 15:34 UTC (permalink / raw)
To: Jani Nikula, intel-gfx, intel-xe, dri-devel
Cc: Daniel Vetter, Dave Airlie, Lucas De Marchi, Tomas Winkler,
Jaroslav Kysela, Takashi Iwai
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>
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 0ca1550fd9dc..fcb7a74506a2 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 07e0c73204f3..53951c50b504 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 d5ed4c7dfbc0..183ea437d623 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 ea7b5ffb8954..a278d08b343c 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 b1e4c23b31a3..5a7a4d8b0e23 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 a73d7f34f4e5..00d1ab6936dd 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] 28+ messages in thread
* [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (10 preceding siblings ...)
2024-04-10 22:25 ` [PATCH 00/10] drm: move Intel drm headers to a subdirectory Lucas De Marchi
@ 2024-04-11 15:45 ` Jani Nikula
2024-04-11 18:00 ` Rodrigo Vivi
2024-04-11 18:09 ` Andi Shyti
2024-04-15 13:08 ` [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
12 siblings, 2 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-11 15:45 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: jani.nikula, Joonas Lahtinen, Lucas De Marchi, Oded Gabbay,
Rodrigo Vivi, Thomas Hellström, Tvrtko Ursulin
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>
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 e7a511b443af..a71254fdbf4c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10841,6 +10841,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>
@@ -10858,7 +10859,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)
@@ -10875,7 +10876,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] 28+ messages in thread
* Re: [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel
2024-04-11 15:45 ` [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
@ 2024-04-11 18:00 ` Rodrigo Vivi
2024-04-11 18:09 ` Andi Shyti
1 sibling, 0 replies; 28+ messages in thread
From: Rodrigo Vivi @ 2024-04-11 18:00 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Joonas Lahtinen, Lucas De Marchi,
Oded Gabbay, Thomas Hellström, Tvrtko Ursulin
On Thu, Apr 11, 2024 at 06:45:03PM +0300, Jani Nikula wrote:
> 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>
> 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 e7a511b443af..a71254fdbf4c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -10841,6 +10841,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>
> @@ -10858,7 +10859,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
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
on the whole series
>
> INTEL DRM XE DRIVER (Lunar Lake and newer)
> @@ -10875,7 +10876,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 [flat|nested] 28+ messages in thread
* Re: [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel
2024-04-11 15:45 ` [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
2024-04-11 18:00 ` Rodrigo Vivi
@ 2024-04-11 18:09 ` Andi Shyti
1 sibling, 0 replies; 28+ messages in thread
From: Andi Shyti @ 2024-04-11 18:09 UTC (permalink / raw)
To: Jani Nikula
Cc: intel-gfx, intel-xe, dri-devel, Joonas Lahtinen, Lucas De Marchi,
Oded Gabbay, Rodrigo Vivi, Thomas Hellström, Tvrtko Ursulin
Hi Jani,
On Thu, Apr 11, 2024 at 06:45:03PM +0300, Jani Nikula wrote:
> 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>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH 00/10] drm: move Intel drm headers to a subdirectory
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
` (11 preceding siblings ...)
2024-04-11 15:45 ` [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
@ 2024-04-15 13:08 ` Jani Nikula
12 siblings, 0 replies; 28+ messages in thread
From: Jani Nikula @ 2024-04-15 13:08 UTC (permalink / raw)
To: intel-gfx, intel-xe, dri-devel
Cc: Bjorn Helgaas, Daniel Vetter, Dave Airlie, Hans de Goede,
Ilpo Järvinen, Jaroslav Kysela, Lucas De Marchi,
Takashi Iwai, Tomas Winkler
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%)
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2024-04-15 13:12 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-10 10:05 [PATCH 00/10] drm: move Intel drm headers to a subdirectory Jani Nikula
2024-04-10 10:05 ` [PATCH 01/10] drm/i915: use system include for drm headers Jani Nikula
2024-04-10 14:06 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 02/10] drm: move intel-gtt.h under include/drm/intel Jani Nikula
2024-04-10 14:15 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 03/10] drm: move i915_gsc_proxy_mei_interface.h " Jani Nikula
2024-04-11 14:11 ` Andi Shyti
2024-04-10 10:05 ` [PATCH 04/10] drm: move i915_component.h " Jani Nikula
2024-04-11 14:14 ` Andi Shyti
2024-04-11 15:34 ` [PATCH v2] " Jani Nikula
2024-04-10 10:05 ` [PATCH 05/10] drm: move intel_lpe_audio.h " Jani Nikula
2024-04-11 14:19 ` Andi Shyti
2024-04-11 15:25 ` Jani Nikula
2024-04-10 10:05 ` [PATCH 06/10] drm: move i915_drm.h " Jani Nikula
2024-04-10 10:19 ` Ilpo Järvinen
2024-04-10 10:23 ` Jani Nikula
2024-04-10 10:26 ` [PATCH v2] " Jani Nikula
2024-04-11 14:21 ` Andi Shyti
2024-04-11 15:33 ` Jani Nikula
2024-04-10 10:05 ` [PATCH 07/10] drm: move i915_pxp_tee_interface.h " Jani Nikula
2024-04-10 10:05 ` [PATCH 08/10] drm: move i915_pciids.h " Jani Nikula
2024-04-10 10:05 ` [PATCH 09/10] drm: move xe_pciids.h " Jani Nikula
2024-04-10 10:05 ` [PATCH 10/10] drm: move i915_hdcp_interface.h " Jani Nikula
2024-04-10 22:25 ` [PATCH 00/10] drm: move Intel drm headers to a subdirectory Lucas De Marchi
2024-04-11 15:45 ` [PATCH 11/10] MAINTAINERS: update i915 and xe entries for include/drm/intel Jani Nikula
2024-04-11 18:00 ` Rodrigo Vivi
2024-04-11 18:09 ` Andi Shyti
2024-04-15 13:08 ` [PATCH 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).