4 files changed, 80 insertions, 4 deletions
diff --git a/usr/src/cmd/mdb/i915/Makefile b/usr/src/cmd/mdb/i915/Makefile
new file mode 100644
index 0000000..732cc08
--- /dev/null
+++ b/usr/src/cmd/mdb/i915/Makefile
@@ -0,0 +1,19 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 <XXX Contributor>
+#
+
+include $(SRC)/Makefile.master
+SUBDIRS =		ia32
+$(BUILD64)SUBDIRS += 	$(MACH64)
+include ../Makefile.subdirs
diff --git a/usr/src/cmd/mdb/i915/amd64/Makefile b/usr/src/cmd/mdb/i915/amd64/Makefile
new file mode 100644
index 0000000..d8c55b1
--- /dev/null
+++ b/usr/src/cmd/mdb/i915/amd64/Makefile
@@ -0,0 +1,29 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Joyent, Inc.
+#
+
+MODULE = i915.so
+MDBTGT = kvm
+
+MODSRCS = i915.c
+
+include ../../../Makefile.cmd
+include ../../../Makefile.cmd.64
+include ../../Makefile.amd64
+include ../../Makefile.module
+
+CPPFLAGS += -I$(SRC)/uts/intel/io/i915
+CPPFLAGS += -I$(SRC)/uts/common/io/drm
+CPPFLAGS += -I$(SRC)/uts/common/drm
+CPPFLAGS += -I$(SRC)/uts/common
diff --git a/usr/src/cmd/mdb/i915/i915.c b/usr/src/cmd/mdb/i915/i915.c
index 706b937..ad094df 100644
--- a/usr/src/cmd/mdb/i915/i915.c
+++ b/usr/src/cmd/mdb/i915/i915.c
@@ -28,10 +28,10 @@
 #include <sys/mdb_modapi.h>
 #include <sys/proc.h>
 
-#include <sys/drm/drmP.h>
-#include <i915/src/i915_drv.h>
-#include <i915/src/i915_drm.h>
-#include <i915/src/intel_drv.h>
+#include <drm/drmP.h>
+#include <drm/i915_drm.h>
+#include "i915_drv.h"
+#include "intel_drv.h"
 
 
 /*
diff --git a/usr/src/cmd/mdb/i915/ia32/Makefile b/usr/src/cmd/mdb/i915/ia32/Makefile
new file mode 100644
index 0000000..125c5b5
--- /dev/null
+++ b/usr/src/cmd/mdb/i915/ia32/Makefile
@@ -0,0 +1,28 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2016 Joyent, Inc.
+#
+
+MODULE = i915.so
+MDBTGT = kvm
+
+MODSRCS = i915.c
+
+include ../../../Makefile.cmd
+include ../../Makefile.ia32
+include ../../Makefile.module
+
+CPPFLAGS += -I$(SRC)/uts/intel/io/i915
+CPPFLAGS += -I$(SRC)/uts/common/io/drm
+CPPFLAGS += -I$(SRC)/uts/common/drm
+CPPFLAGS += -I$(SRC)/uts/common