| Message ID | 63e199dec91cc2e717d81ab00e28f68b9bec8461.1712743191.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: move Intel drm headers to a subdirectory | expand |
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.
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.
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
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%)