Re: [PATCH v2] drm: move i915_drm.h under include/drm/intel

2024-04-11 Thread Jani Nikula 
On Thu, 11 Apr 2024, Andi Shyti  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 
>> Cc: Dave Airlie 
>> Cc: Lucas De Marchi 
>> Cc: Bjorn Helgaas 
>> Cc: Hans de Goede 
>> Cc: Ilpo Järvinen 
>> Signed-off-by: Jani Nikula 
>> ---
>>  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

Re: [PATCH v2] drm: move i915_drm.h under include/drm/intel

2024-04-11 Thread Andi Shyti 
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 
> Cc: Dave Airlie 
> Cc: Lucas De Marchi 
> Cc: Bjorn Helgaas 
> Cc: Hans de Goede 
> Cc: Ilpo Järvinen 
> Signed-off-by: Jani Nikula 
> ---
>  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

[PATCH v2] drm: move i915_drm.h under include/drm/intel

2024-04-10 Thread Jani Nikula 
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 
Cc: Dave Airlie 
Cc: Lucas De Marchi 
Cc: Bjorn Helgaas 
Cc: Hans de Goede 
Cc: Ilpo Järvinen 
Signed-off-by: Jani Nikula 
---
 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 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
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 
 
 #include 
-#include 
+#include 
 
 #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 
 
 #include 
-#include 
+#include 
 #include 
 
 #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 
 
-#include 
+#include 
 
 #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_I9150x44
 #define MCHBAR_I9650x48
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 
 
 #include 
-#include 
+#include 
 
 #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 
 
 #include 
-#include 
+#include 
 
 #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 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #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