Commit 03c7918d authored by Jani Nikula's avatar Jani Nikula

drm: move i915_drm.h under include/drm/intel

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

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

Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Dave Airlie <airlied@gmail.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/0e344a72e9be596ac2b8b55a26fd674a96f03cdc.1717075103.git.jani.nikula@intel.com
parent a1ed6865
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/bcma/bcma.h> #include <linux/bcma/bcma.h>
#include <linux/bcma/bcma_regs.h> #include <linux/bcma/bcma_regs.h>
#include <linux/platform_data/x86/apple.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 <drm/i915_pciids.h>
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <drm/drm_mm.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_lmem.h"
#include "gem/i915_gem_region.h" #include "gem/i915_gem_region.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/stop_machine.h> #include <linux/stop_machine.h>
#include <drm/drm_managed.h> #include <drm/drm_managed.h>
#include <drm/i915_drm.h> #include <drm/intel/i915_drm.h>
#include <drm/intel/intel-gtt.h> #include <drm/intel/intel-gtt.h>
#include "display/intel_display.h" #include "display/intel_display.h"
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/string_helpers.h> #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.h"
#include "display/intel_display_irq.h" #include "display/intel_display_irq.h"
......
...@@ -31,7 +31,7 @@ static inline int intel_mmio_bar(int graphics_ver) ...@@ -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_I915 0x44
#define MCHBAR_I965 0x48 #define MCHBAR_I965 0x48
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/vgaarb.h> #include <linux/vgaarb.h>
#include <drm/drm_managed.h> #include <drm/drm_managed.h>
#include <drm/i915_drm.h> #include <drm/intel/i915_drm.h>
#include "i915_drv.h" #include "i915_drv.h"
#include "intel_gmch.h" #include "intel_gmch.h"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <drm/drm_managed.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_gt_regs.h"
#include "regs/xe_gtt_defs.h" #include "regs/xe_gtt_defs.h"
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <drm/i915_drm.h> #include <drm/intel/i915_drm.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/processor.h> #include <asm/processor.h>
#include "intel_ips.h" #include "intel_ips.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment