Enable compilation on non-Intel, non-DRM systems.

A few of the tools can be performed post-mortem from a different system,
so it is useful to be able to compile those tools on those foreign
systems. Obviously, any program to interact with the PCI device or talk
to GEM will fail on a non-Intel system.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

9 files changed, 213 insertions, 114 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index eb3eba76..0c9380d5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,16 +1,25 @@
+NULL=#
+
+AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/..
 libintel_tools_la_SOURCES = \
-	intel_batchbuffer.c \
 	intel_batchbuffer.h \
 	intel_chipset.h \
-	intel_gpu_tools.c \
 	intel_gpu_tools.h \
+	intel_mmio.c \
+	intel_pci.c \
 	intel_reg.h \
 	instdone.c \
 	instdone.h \
-	drmtest.c \
 	drmtest.h
 
+if HAVE_DRM
+libintel_tools_la_SOURCES += \
+	intel_batchbuffer.c \
+	intel_drm.c \
+	drmtest.c \
+	$(NULL)
+AM_CFLAGS += $(DRM_CFLAGS)
+endif
+
 noinst_LTLIBRARIES = libintel_tools.la
 
-AM_CFLAGS = $(DRM_CFLAGS) $(WARN_CFLAGS) \
-	-I$(srcdir)/..
diff --git a/lib/instdone.c b/lib/instdone.c
index d77061fa..722fb039 100644
--- a/lib/instdone.c
+++ b/lib/instdone.c
@@ -25,9 +25,11 @@
  *
  */
 
-#include "intel_gpu_tools.h"
 #include "instdone.h"
 
+#include "intel_chipset.h"
+#include "intel_reg.h"
+
 struct instdone_bit instdone_bits[MAX_INSTDONE_BITS];
 int num_instdone_bits = 0;
 
@@ -133,7 +135,7 @@ init_g4x_instdone1(void)
 }
 
 void
-init_instdone_definitions(void)
+init_instdone_definitions(uint32_t devid)
 {
 	if (IS_GEN6(devid)) {
 		/* Now called INSTDONE_1 in the docs. */
diff --git a/lib/instdone.h b/lib/instdone.h
index ed34f833..c86a54a7 100644
--- a/lib/instdone.h
+++ b/lib/instdone.h
@@ -25,6 +25,8 @@
  *
  */
 
+#include <stdint.h>
+
 #define MAX_INSTDONE_BITS            100
 
 struct instdone_bit {
@@ -36,4 +38,4 @@ struct instdone_bit {
 extern struct instdone_bit instdone_bits[MAX_INSTDONE_BITS];
 extern int num_instdone_bits;
 
-void init_instdone_definitions(void);
+void init_instdone_definitions(uint32_t devid);
diff --git a/lib/intel_batchbuffer.c b/lib/intel_batchbuffer.c
index 1e3148ab..ae5150e9 100644
--- a/lib/intel_batchbuffer.c
+++ b/lib/intel_batchbuffer.c
@@ -30,9 +30,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+
 #include "drm.h"
 #include "intel_batchbuffer.h"
 #include "intel_bufmgr.h"
+#include "intel_chipset.h"
+#include "intel_reg.h"
+#include <i915_drm.h>
 
 void
 intel_batchbuffer_reset(struct intel_batchbuffer *batch)
@@ -137,3 +141,46 @@ intel_batchbuffer_data(struct intel_batchbuffer *batch,
 	memcpy(batch->ptr, data, bytes);
 	batch->ptr += bytes;
 }
+
+void
+intel_copy_bo(struct intel_batchbuffer *batch,
+	      drm_intel_bo *dst_bo, drm_intel_bo *src_bo,
+	      int width, int height, uint32_t devid)
+{
+	uint32_t src_tiling, dst_tiling, swizzle;
+	uint32_t src_pitch, dst_pitch;
+	uint32_t cmd_bits = 0;
+
+	drm_intel_bo_get_tiling(src_bo, &src_tiling, &swizzle);
+	drm_intel_bo_get_tiling(dst_bo, &dst_tiling, &swizzle);
+
+	src_pitch = width * 4;
+	if (IS_965(devid) && src_tiling != I915_TILING_NONE) {
+		src_pitch /= 4;
+		cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED;
+	}
+
+	dst_pitch = width * 4;
+	if (IS_965(devid) && dst_tiling != I915_TILING_NONE) {
+		dst_pitch /= 4;
+		cmd_bits |= XY_SRC_COPY_BLT_DST_TILED;
+	}
+
+	BEGIN_BATCH(8);
+	OUT_BATCH(XY_SRC_COPY_BLT_CMD |
+		  XY_SRC_COPY_BLT_WRITE_ALPHA |
+		  XY_SRC_COPY_BLT_WRITE_RGB |
+		  cmd_bits);
+	OUT_BATCH((3 << 24) | /* 32 bits */
+		  (0xcc << 16) | /* copy ROP */
+		  dst_pitch);
+	OUT_BATCH(0); /* dst x1,y1 */
+	OUT_BATCH((height << 16) | width); /* dst x2,y2 */
+	OUT_RELOC(dst_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
+	OUT_BATCH(0); /* src x1,y1 */
+	OUT_BATCH(src_pitch);
+	OUT_RELOC(src_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
+	ADVANCE_BATCH();
+
+	intel_batchbuffer_flush(batch);
+}
diff --git a/lib/intel_batchbuffer.h b/lib/intel_batchbuffer.h
index 5b4ab930..fcd9ceb6 100644
--- a/lib/intel_batchbuffer.h
+++ b/lib/intel_batchbuffer.h
@@ -115,4 +115,8 @@ intel_batchbuffer_emit_mi_flush(struct intel_batchbuffer *batch)
 	intel_batchbuffer_emit_dword(batch, MI_FLUSH);
 }
 
+void intel_copy_bo(struct intel_batchbuffer *batch,
+		   drm_intel_bo *dst_bo, drm_intel_bo *src_bo,
+		   int width, int height, uint32_t devid);
+
 #endif
diff --git a/lib/intel_drm.c b/lib/intel_drm.c
new file mode 100644
index 00000000..ca5e4738
--- /dev/null
+++ b/lib/intel_drm.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <err.h>
+#include <assert.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "intel_gpu_tools.h"
+#include "i915_drm.h"
+
+uint32_t
+intel_get_drm_devid(int fd)
+{
+	int ret;
+	struct drm_i915_getparam gp;
+	uint32_t devid;
+
+	gp.param = I915_PARAM_CHIPSET_ID;
+	gp.value = (int *)&devid;
+
+	ret = ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
+	assert(ret == 0);
+
+	return devid;
+}
diff --git a/lib/intel_gpu_tools.h b/lib/intel_gpu_tools.h
index 259fd9a9..0251031a 100644
--- a/lib/intel_gpu_tools.h
+++ b/lib/intel_gpu_tools.h
@@ -25,19 +25,18 @@
  *
  */
 
+#include <stdint.h>
 #include <sys/types.h>
 #include <pciaccess.h>
-#include "i915_drm.h"
-#include "intel_batchbuffer.h"
+
 #include "intel_chipset.h"
 #include "intel_reg.h"
 
-extern struct pci_device *pci_dev;
-extern uint32_t devid;
-extern void *mmio;
-
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
+extern void *mmio;
+void intel_get_mmio(struct pci_device *pci_dev);
+
 static inline uint32_t
 INREG(uint32_t reg)
 {
@@ -50,10 +49,8 @@ OUTREG(uint32_t reg, uint32_t val)
 	*(volatile uint32_t *)((volatile char *)mmio + reg) = val;
 }
 
-void intel_get_pci_device(void);
-void intel_get_mmio(void);
-void intel_get_drm_devid(int fd);
-void intel_copy_bo(struct intel_batchbuffer *batch,
-		   drm_intel_bo *dst_bo, drm_intel_bo *src_bo,
-		   int width, int height);
+struct pci_device *intel_get_pci_device(void);
+
+uint32_t intel_get_drm_devid(int fd);
+
 void intel_map_file(char *);
diff --git a/lib/intel_gpu_tools.c b/lib/intel_mmio.c
index a699ae82..faaeeef6 100644
--- a/lib/intel_gpu_tools.c
+++ b/lib/intel_mmio.c
@@ -36,58 +36,12 @@
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
+
 #include "intel_gpu_tools.h"
-#include "i915_drm.h"
-#include "intel_batchbuffer.h"
-#include "intel_chipset.h"
 
-struct pci_device *pci_dev;
-uint32_t devid;
 void *mmio;
 
 void
-intel_get_drm_devid(int fd)
-{
-	int ret;
-	struct drm_i915_getparam gp;
-
-	gp.param = I915_PARAM_CHIPSET_ID;
-	gp.value = (int *)&devid;
-
-	ret = ioctl(fd, DRM_IOCTL_I915_GETPARAM, &gp, sizeof(gp));
-	assert(ret == 0);
-}
-
-void
-intel_get_pci_device(void)
-{
-	int err;
-
-	err = pci_system_init();
-	if (err != 0) {
-		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	/* Grab the graphics card */
-	pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
-	if (pci_dev == NULL)
-		errx(1, "Couldn't find graphics card");
-
-	err = pci_device_probe(pci_dev);
-	if (err != 0) {
-		fprintf(stderr, "Couldn't probe graphics card: %s\n",
-			strerror(err));
-		exit(1);
-	}
-
-	if (pci_dev->vendor_id != 0x8086)
-		errx(1, "Graphics card is non-intel");
-	devid = pci_dev->device_id;
-}
-
-void
 intel_map_file(char *file)
 {
 	int fd;
@@ -110,13 +64,13 @@ intel_map_file(char *file)
 }
 
 void
-intel_get_mmio(void)
+intel_get_mmio(struct pci_device *pci_dev)
 {
+	uint32_t devid;
 	int mmio_bar;
 	int err;
 
-	intel_get_pci_device();
-
+	devid = pci_dev->device_id;
 	if (IS_9XX(devid))
 		mmio_bar = 0;
 	else
@@ -135,47 +89,3 @@ intel_get_mmio(void)
 	}
 }
 
-void
-intel_copy_bo(struct intel_batchbuffer *batch,
-	      drm_intel_bo *dst_bo, drm_intel_bo *src_bo,
-	      int width, int height)
-{
-	uint32_t src_tiling, dst_tiling, swizzle;
-	uint32_t src_pitch, dst_pitch;
-	uint32_t cmd_bits = 0;
-
-	drm_intel_bo_get_tiling(src_bo, &src_tiling, &swizzle);
-	drm_intel_bo_get_tiling(dst_bo, &dst_tiling, &swizzle);
-
-	src_pitch = width * 4;
-	if (IS_965(devid) && src_tiling != I915_TILING_NONE) {
-		src_pitch /= 4;
-		cmd_bits |= XY_SRC_COPY_BLT_SRC_TILED;
-	}
-
-	dst_pitch = width * 4;
-	if (IS_965(devid) && dst_tiling != I915_TILING_NONE) {
-		dst_pitch /= 4;
-		cmd_bits |= XY_SRC_COPY_BLT_DST_TILED;
-	}
-
-	BEGIN_BATCH(8);
-	OUT_BATCH(XY_SRC_COPY_BLT_CMD |
-		  XY_SRC_COPY_BLT_WRITE_ALPHA |
-		  XY_SRC_COPY_BLT_WRITE_RGB |
-		  cmd_bits);
-	OUT_BATCH((3 << 24) | /* 32 bits */
-		  (0xcc << 16) | /* copy ROP */
-		  dst_pitch);
-	OUT_BATCH(0); /* dst x1,y1 */
-	OUT_BATCH((height << 16) | width); /* dst x2,y2 */
-	OUT_RELOC(dst_bo, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
-	OUT_BATCH(0); /* src x1,y1 */
-	OUT_BATCH(src_pitch);
-	OUT_RELOC(src_bo, I915_GEM_DOMAIN_RENDER, 0, 0);
-	ADVANCE_BATCH();
-
-	intel_batchbuffer_flush(batch);
-}
-
-
diff --git a/lib/intel_pci.c b/lib/intel_pci.c
new file mode 100644
index 00000000..3bfacb53
--- /dev/null
+++ b/lib/intel_pci.c
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Eric Anholt <eric@anholt.net>
+ *
+ */
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <err.h>
+#include <assert.h>
+#include <sys/ioctl.h>
+#include <sys/fcntl.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "intel_gpu_tools.h"
+
+struct pci_device *
+intel_get_pci_device(void)
+{
+	struct pci_device *pci_dev;
+	int err;
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	pci_dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (pci_dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(pci_dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (pci_dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	return pci_dev;
+}