move i915 files to a subdir, except the userland facing header

35 files changed, 123 insertions, 123 deletions

diff --git a/sys/dev/pci/drm/files.drm b/sys/dev/pci/drm/files.drm
index 325279bf3ba..c12c2028648 100644
--- a/sys/dev/pci/drm/files.drm
+++ b/sys/dev/pci/drm/files.drm
@@ -23,34 +23,34 @@ file   dev/pci/drm/drm_fb_helper.c	drm
 
 device	inteldrm: drmbase, wsemuldisplaydev, rasops32
 attach	inteldrm at drmdev
-file	dev/pci/drm/i915_dma.c		inteldrm
-file	dev/pci/drm/i915_drv.c		inteldrm
-file	dev/pci/drm/i915_gem.c		inteldrm
-file	dev/pci/drm/i915_gem_evict.c	inteldrm
-file	dev/pci/drm/i915_gem_execbuffer.c	inteldrm
-file	dev/pci/drm/i915_gem_gtt.c	inteldrm
-file	dev/pci/drm/i915_gem_tiling.c	inteldrm
-file	dev/pci/drm/i915_irq.c		inteldrm
-file	dev/pci/drm/i915_suspend.c	inteldrm
-file	dev/pci/drm/intel_bios.c	inteldrm
-file	dev/pci/drm/intel_crt.c		inteldrm
-file	dev/pci/drm/intel_ddi.c		inteldrm
-file	dev/pci/drm/intel_display.c	inteldrm
-file	dev/pci/drm/intel_dp.c		inteldrm
-file	dev/pci/drm/intel_dvo.c		inteldrm
-file	dev/pci/drm/intel_fb.c		inteldrm
-file	dev/pci/drm/intel_hdmi.c	inteldrm
-file	dev/pci/drm/intel_i2c.c		inteldrm
-file	dev/pci/drm/intel_lvds.c	inteldrm
-file	dev/pci/drm/intel_modes.c	inteldrm
-file	dev/pci/drm/intel_opregion.c	inteldrm
-file	dev/pci/drm/intel_overlay.c	inteldrm
-file	dev/pci/drm/intel_panel.c	inteldrm
-file	dev/pci/drm/intel_pm.c		inteldrm
-file	dev/pci/drm/intel_ringbuffer.c	inteldrm
-file	dev/pci/drm/intel_sdvo.c	inteldrm
-file	dev/pci/drm/intel_sprite.c	inteldrm
-file	dev/pci/drm/intel_tv.c		inteldrm
+file	dev/pci/drm/i915/i915_dma.c		inteldrm
+file	dev/pci/drm/i915/i915_drv.c		inteldrm
+file	dev/pci/drm/i915/i915_gem.c		inteldrm
+file	dev/pci/drm/i915/i915_gem_evict.c	inteldrm
+file	dev/pci/drm/i915/i915_gem_execbuffer.c	inteldrm
+file	dev/pci/drm/i915/i915_gem_gtt.c		inteldrm
+file	dev/pci/drm/i915/i915_gem_tiling.c	inteldrm
+file	dev/pci/drm/i915/i915_irq.c		inteldrm
+file	dev/pci/drm/i915/i915_suspend.c		inteldrm
+file	dev/pci/drm/i915/intel_bios.c		inteldrm
+file	dev/pci/drm/i915/intel_crt.c		inteldrm
+file	dev/pci/drm/i915/intel_ddi.c		inteldrm
+file	dev/pci/drm/i915/intel_display.c	inteldrm
+file	dev/pci/drm/i915/intel_dp.c		inteldrm
+file	dev/pci/drm/i915/intel_dvo.c		inteldrm
+file	dev/pci/drm/i915/intel_fb.c		inteldrm
+file	dev/pci/drm/i915/intel_hdmi.c		inteldrm
+file	dev/pci/drm/i915/intel_i2c.c		inteldrm
+file	dev/pci/drm/i915/intel_lvds.c		inteldrm
+file	dev/pci/drm/i915/intel_modes.c		inteldrm
+file	dev/pci/drm/i915/intel_opregion.c	inteldrm
+file	dev/pci/drm/i915/intel_overlay.c	inteldrm
+file	dev/pci/drm/i915/intel_panel.c		inteldrm
+file	dev/pci/drm/i915/intel_pm.c		inteldrm
+file	dev/pci/drm/i915/intel_ringbuffer.c	inteldrm
+file	dev/pci/drm/i915/intel_sdvo.c		inteldrm
+file	dev/pci/drm/i915/intel_sprite.c		inteldrm
+file	dev/pci/drm/i915/intel_tv.c		inteldrm
 
 device	radeondrm: drmbase
 attach	radeondrm at drmdev
diff --git a/sys/dev/pci/drm/i915_dma.c b/sys/dev/pci/drm/i915/i915_dma.c
index e79443ec32b..415508b5a62 100644
--- a/sys/dev/pci/drm/i915_dma.c
+++ b/sys/dev/pci/drm/i915/i915_dma.c
@@ -27,12 +27,12 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
-#include "drm_crtc_helper.h"
+#include <dev/pci/drm/drm_crtc_helper.h>
 
 void
 i915_kernel_lost_context(struct drm_device * dev)
diff --git a/sys/dev/pci/drm/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c
index cee3cb83174..f09895c5cee 100644
--- a/sys/dev/pci/drm/i915_drv.c
+++ b/sys/dev/pci/drm/i915/i915_drv.c
@@ -45,9 +45,9 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/i915_drv.h b/sys/dev/pci/drm/i915/i915_drv.h
index 559187d6de0..042e3ad87d9 100644
--- a/sys/dev/pci/drm/i915_drv.h
+++ b/sys/dev/pci/drm/i915/i915_drv.h
@@ -32,7 +32,7 @@
 #define _I915_DRV_H_
 
 #include "i915_reg.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "intel_bios.h"
 #include "intel_ringbuffer.h"
 
diff --git a/sys/dev/pci/drm/i915_gem.c b/sys/dev/pci/drm/i915/i915_gem.c
index 61a6fa1241e..9f81a75a1fb 100644
--- a/sys/dev/pci/drm/i915_gem.c
+++ b/sys/dev/pci/drm/i915/i915_gem.c
@@ -41,9 +41,9 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/i915_gem_evict.c b/sys/dev/pci/drm/i915/i915_gem_evict.c
index 9c30a9b1975..a480729d10e 100644
--- a/sys/dev/pci/drm/i915_gem_evict.c
+++ b/sys/dev/pci/drm/i915/i915_gem_evict.c
@@ -42,9 +42,9 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 #include <machine/pmap.h>
diff --git a/sys/dev/pci/drm/i915_gem_execbuffer.c b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c
index 42ad8fb820e..55943afa9f5 100644
--- a/sys/dev/pci/drm/i915_gem_execbuffer.c
+++ b/sys/dev/pci/drm/i915/i915_gem_execbuffer.c
@@ -42,9 +42,9 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/i915_gem_gtt.c b/sys/dev/pci/drm/i915/i915_gem_gtt.c
index 3c730802d92..1fba0daaaa2 100644
--- a/sys/dev/pci/drm/i915_gem_gtt.c
+++ b/sys/dev/pci/drm/i915/i915_gem_gtt.c
@@ -23,8 +23,8 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/i915_gem_tiling.c b/sys/dev/pci/drm/i915/i915_gem_tiling.c
index a0ee13dac50..e95feb06bfd 100644
--- a/sys/dev/pci/drm/i915_gem_tiling.c
+++ b/sys/dev/pci/drm/i915/i915_gem_tiling.c
@@ -41,9 +41,9 @@
  *
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 #include <machine/pmap.h>
diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c
index 699bd53870b..f550d346774 100644
--- a/sys/dev/pci/drm/i915_irq.c
+++ b/sys/dev/pci/drm/i915/i915_irq.c
@@ -29,8 +29,8 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include "drmP.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/i915_reg.h b/sys/dev/pci/drm/i915/i915_reg.h
index 761eb12b999..761eb12b999 100644
--- a/sys/dev/pci/drm/i915_reg.h
+++ b/sys/dev/pci/drm/i915/i915_reg.h
diff --git a/sys/dev/pci/drm/i915_suspend.c b/sys/dev/pci/drm/i915/i915_suspend.c
index f148a492158..11fcf7bc63b 100644
--- a/sys/dev/pci/drm/i915_suspend.c
+++ b/sys/dev/pci/drm/i915/i915_suspend.c
@@ -25,9 +25,9 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 bool	i915_pipe_enabled(struct drm_device *, enum pipe);
diff --git a/sys/dev/pci/drm/intel_bios.c b/sys/dev/pci/drm/i915/intel_bios.c
index ab2e2e7a1e1..718b97f30c2 100644
--- a/sys/dev/pci/drm/intel_bios.c
+++ b/sys/dev/pci/drm/i915/intel_bios.c
@@ -25,9 +25,9 @@
  *    Eric Anholt <eric@anholt.net>
  *
  */
-#include "drmP.h"
-#include "drm_dp_helper.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_dp_helper.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_bios.h"
 #include <dev/isa/isareg.h>
diff --git a/sys/dev/pci/drm/intel_bios.h b/sys/dev/pci/drm/i915/intel_bios.h
index d36f6602f98..b19053a1af5 100644
--- a/sys/dev/pci/drm/intel_bios.h
+++ b/sys/dev/pci/drm/i915/intel_bios.h
@@ -29,7 +29,7 @@
 #ifndef _I830_BIOS_H_
 #define _I830_BIOS_H_
 
-#include "drmP.h"
+#include <dev/pci/drm/drmP.h>
 
 struct vbt_header {
 	u8 signature[20];		/**< Always starts with 'VBT$' */
diff --git a/sys/dev/pci/drm/intel_crt.c b/sys/dev/pci/drm/i915/intel_crt.c
index c0693109f59..e5569712658 100644
--- a/sys/dev/pci/drm/intel_crt.c
+++ b/sys/dev/pci/drm/i915/intel_crt.c
@@ -25,12 +25,12 @@
  *	Eric Anholt <eric@anholt.net>
  */
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_crtc_helper.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 /* Here's the desired hotplug mode */
diff --git a/sys/dev/pci/drm/intel_ddi.c b/sys/dev/pci/drm/i915/intel_ddi.c
index d3b9e1adaaa..d3b9e1adaaa 100644
--- a/sys/dev/pci/drm/intel_ddi.c
+++ b/sys/dev/pci/drm/i915/intel_ddi.c
diff --git a/sys/dev/pci/drm/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c
index 287db7dfc80..1ae0879dacf 100644
--- a/sys/dev/pci/drm/intel_display.c
+++ b/sys/dev/pci/drm/i915/intel_display.c
@@ -25,13 +25,13 @@
  *	Eric Anholt <eric@anholt.net>
  */
 
-#include "drmP.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
-#include "drm_dp_helper.h"
-#include "drm_crtc_helper.h"
+#include <dev/pci/drm/drm_dp_helper.h>
+#include <dev/pci/drm/drm_crtc_helper.h>
 
 typedef struct {
 	/* given values */
diff --git a/sys/dev/pci/drm/intel_dp.c b/sys/dev/pci/drm/i915/intel_dp.c
index 1a66d0f51b9..28abb4ba262 100644
--- a/sys/dev/pci/drm/intel_dp.c
+++ b/sys/dev/pci/drm/i915/intel_dp.c
@@ -26,12 +26,12 @@
  *
  */
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_crtc_helper.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 #define DP_LINK_CHECK_TIMEOUT	(10 * 1000)
diff --git a/sys/dev/pci/drm/intel_drv.h b/sys/dev/pci/drm/i915/intel_drv.h
index 0af434f66e1..d6053e4ab2d 100644
--- a/sys/dev/pci/drm/intel_drv.h
+++ b/sys/dev/pci/drm/i915/intel_drv.h
@@ -27,12 +27,12 @@
 #define __INTEL_DRV_H__
 
 #include <dev/i2c/i2cvar.h>
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
-#include "drm_crtc.h"
-#include "drm_crtc_helper.h"
-#include "drm_fb_helper.h"
-#include "drm_dp_helper.h"
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_crtc_helper.h>
+#include <dev/pci/drm/drm_fb_helper.h>
+#include <dev/pci/drm/drm_dp_helper.h>
 
 #define KHz(x) (1000*x)
 #define MHz(x) KHz(1000*x)
diff --git a/sys/dev/pci/drm/intel_dvo.c b/sys/dev/pci/drm/i915/intel_dvo.c
index 4b94678d524..fe22085e0d1 100644
--- a/sys/dev/pci/drm/intel_dvo.c
+++ b/sys/dev/pci/drm/i915/intel_dvo.c
@@ -26,10 +26,10 @@
  *	Eric Anholt <eric@anholt.net>
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "drm_crtc.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/intel_fb.c b/sys/dev/pci/drm/i915/intel_fb.c
index 4fb7a4335d4..0c5d206e07f 100644
--- a/sys/dev/pci/drm/intel_fb.c
+++ b/sys/dev/pci/drm/i915/intel_fb.c
@@ -25,11 +25,11 @@
  *     David Airlie
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "drm_crtc.h"
-#include "drm_fb_helper.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_fb_helper.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/intel_hdmi.c b/sys/dev/pci/drm/i915/intel_hdmi.c
index 200cfeac726..18e608142f1 100644
--- a/sys/dev/pci/drm/intel_hdmi.c
+++ b/sys/dev/pci/drm/i915/intel_hdmi.c
@@ -27,11 +27,11 @@
  *	Jesse Barnes <jesse.barnes@intel.com>
  */
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 struct intel_hdmi	*enc_to_intel_hdmi(struct drm_encoder *);
diff --git a/sys/dev/pci/drm/intel_i2c.c b/sys/dev/pci/drm/i915/intel_i2c.c
index 7ce76448eff..23e183fceb1 100644
--- a/sys/dev/pci/drm/intel_i2c.c
+++ b/sys/dev/pci/drm/i915/intel_i2c.c
@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "drmP.h"
-#include "drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
 #include "i915_drv.h"
 #include "i915_reg.h"
 
diff --git a/sys/dev/pci/drm/intel_lvds.c b/sys/dev/pci/drm/i915/intel_lvds.c
index 50e80ac84eb..243b0840d8c 100644
--- a/sys/dev/pci/drm/intel_lvds.c
+++ b/sys/dev/pci/drm/i915/intel_lvds.c
@@ -28,11 +28,11 @@
  *      Jesse Barnes <jesse.barnes@intel.com>
  */
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 /* Private structure for the integrated LVDS support */
diff --git a/sys/dev/pci/drm/intel_modes.c b/sys/dev/pci/drm/i915/intel_modes.c
index 35bca2e30d9..cf15724ab4c 100644
--- a/sys/dev/pci/drm/intel_modes.c
+++ b/sys/dev/pci/drm/i915/intel_modes.c
@@ -24,13 +24,13 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "drmP.h"
-#include "drm.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
-#include "drm_edid.h"
-#include "drm_crtc.h"
+#include <dev/pci/drm/drm_edid.h>
+#include <dev/pci/drm/drm_crtc.h>
 
 /**
  * intel_connector_update_modes - update connector from edid
diff --git a/sys/dev/pci/drm/intel_opregion.c b/sys/dev/pci/drm/i915/intel_opregion.c
index 5acbffaac03..d5a252e9429 100644
--- a/sys/dev/pci/drm/intel_opregion.c
+++ b/sys/dev/pci/drm/i915/intel_opregion.c
@@ -26,8 +26,8 @@
  *
  */
 
-#include "drmP.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_drv.h"
 
diff --git a/sys/dev/pci/drm/intel_overlay.c b/sys/dev/pci/drm/i915/intel_overlay.c
index 645dd68539b..d20ec9165df 100644
--- a/sys/dev/pci/drm/intel_overlay.c
+++ b/sys/dev/pci/drm/i915/intel_overlay.c
@@ -26,8 +26,8 @@
  *
  * Derived from Xorg ddx, xf86-video-intel, src/i830_video.c
  */
-#include "drmP.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_drv.h"
diff --git a/sys/dev/pci/drm/intel_panel.c b/sys/dev/pci/drm/i915/intel_panel.c
index f8473eb38f2..91f220117c9 100644
--- a/sys/dev/pci/drm/intel_panel.c
+++ b/sys/dev/pci/drm/i915/intel_panel.c
@@ -31,7 +31,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
-#include "drmP.h"
+#include <dev/pci/drm/drmP.h>
 #include "intel_drv.h"
 
 #define PCI_LBPC 0xf4 /* legacy/combination backlight modes */
diff --git a/sys/dev/pci/drm/intel_pm.c b/sys/dev/pci/drm/i915/intel_pm.c
index 95b42a29256..95b42a29256 100644
--- a/sys/dev/pci/drm/intel_pm.c
+++ b/sys/dev/pci/drm/i915/intel_pm.c
diff --git a/sys/dev/pci/drm/intel_ringbuffer.c b/sys/dev/pci/drm/i915/intel_ringbuffer.c
index 8baaefda351..5fb7365666d 100644
--- a/sys/dev/pci/drm/intel_ringbuffer.c
+++ b/sys/dev/pci/drm/i915/intel_ringbuffer.c
@@ -28,9 +28,9 @@
  *
  */
 
-#include "drmP.h"
+#include <dev/pci/drm/drmP.h>
 #include "i915_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "intel_drv.h"
 
 /*
diff --git a/sys/dev/pci/drm/intel_ringbuffer.h b/sys/dev/pci/drm/i915/intel_ringbuffer.h
index e14a6aad747..bfb1164a438 100644
--- a/sys/dev/pci/drm/intel_ringbuffer.h
+++ b/sys/dev/pci/drm/i915/intel_ringbuffer.h
@@ -3,7 +3,7 @@
 #ifndef _INTEL_RINGBUFFER_H_
 #define _INTEL_RINGBUFFER_H_
 
-#include "drm_linux_list.h"
+#include <dev/pci/drm/drm_linux_list.h>
 
 /*
  * Gen2 BSpec "1. Programming Environment" / 1.4.4.6 "Ring Buffer Use"
diff --git a/sys/dev/pci/drm/intel_sdvo.c b/sys/dev/pci/drm/i915/intel_sdvo.c
index 7253248a43d..7059667127a 100644
--- a/sys/dev/pci/drm/intel_sdvo.c
+++ b/sys/dev/pci/drm/i915/intel_sdvo.c
@@ -26,11 +26,11 @@
  * Authors:
  *	Eric Anholt <eric@anholt.net>
  */
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 #include "intel_sdvo_regs.h"
 
diff --git a/sys/dev/pci/drm/intel_sdvo_regs.h b/sys/dev/pci/drm/i915/intel_sdvo_regs.h
index dd1646a0108..dd1646a0108 100644
--- a/sys/dev/pci/drm/intel_sdvo_regs.h
+++ b/sys/dev/pci/drm/i915/intel_sdvo_regs.h
diff --git a/sys/dev/pci/drm/intel_sprite.c b/sys/dev/pci/drm/i915/intel_sprite.c
index 7ed7c64fc9d..68321cc4209 100644
--- a/sys/dev/pci/drm/intel_sprite.c
+++ b/sys/dev/pci/drm/i915/intel_sprite.c
@@ -30,11 +30,11 @@
  * registers; newer ones are much simpler and we can use the new DRM plane
  * support.
  */
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_fourcc.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_fourcc.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 void	 ivb_disable_plane(struct drm_plane *);
diff --git a/sys/dev/pci/drm/intel_tv.c b/sys/dev/pci/drm/i915/intel_tv.c
index 991d4991090..d5fd75a23da 100644
--- a/sys/dev/pci/drm/intel_tv.c
+++ b/sys/dev/pci/drm/i915/intel_tv.c
@@ -31,11 +31,11 @@
  * Integrated TV-out support for the 915GM and 945GM.
  */
 
-#include "drmP.h"
-#include "drm_crtc.h"
-#include "drm_edid.h"
+#include <dev/pci/drm/drmP.h>
+#include <dev/pci/drm/drm_crtc.h>
+#include <dev/pci/drm/drm_edid.h>
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include <dev/pci/drm/i915_drm.h>
 #include "i915_drv.h"
 
 enum tv_margin {