Add intel_stepping from the 2D driver.

6 files changed, 256 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index be3a5180c..488bc22e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ tests/gem_basic
 tests/gem_flink
 tests/gem_mmap
 tests/gem_readwrite
+tools/intel_stepping
\ No newline at end of file
diff --git a/Makefile.am b/Makefile.am
index 9b4bd5621..172213ac2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,4 +22,4 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = lib tests benchmarks
+SUBDIRS = lib tests tools benchmarks
diff --git a/configure.ac b/configure.ac
index 185669824..52938d7fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,4 +68,5 @@ AC_OUTPUT([
 	benchmarks/Makefile
 	lib/Makefile
 	tests/Makefile
+	tools/Makefile
 ])
diff --git a/lib/intel_chipset.h b/lib/intel_chipset.h
new file mode 100755
index 000000000..4593d90df
--- /dev/null
+++ b/lib/intel_chipset.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2007 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>
+ *
+ */
+
+#define PCI_CHIP_I810			0x7121
+#define PCI_CHIP_I810_DC100		0x7123
+#define PCI_CHIP_I810_E			0x7125
+#define PCI_CHIP_I815			0x1132
+
+#define PCI_CHIP_I830_M			0x3577
+#define PCI_CHIP_845_G			0x2562
+#define PCI_CHIP_I855_GM		0x3582
+#define PCI_CHIP_I865_G			0x2572
+
+#define PCI_CHIP_I915_G			0x2582
+#define PCI_CHIP_E7221_G		0x258A
+#define PCI_CHIP_I915_GM		0x2592
+#define PCI_CHIP_I945_G			0x2772
+#define PCI_CHIP_I945_GM		0x27A2
+#define PCI_CHIP_I945_GME		0x27AE
+
+#define PCI_CHIP_Q35_G			0x29B2
+#define PCI_CHIP_G33_G			0x29C2
+#define PCI_CHIP_Q33_G			0x29D2
+
+#define PCI_CHIP_IGD_GM			0xA011
+#define PCI_CHIP_IGD_G			0xA001
+
+#define IS_IGDGM(devid)	(devid == PCI_CHIP_IGD_GM)
+#define IS_IGDG(devid)	(devid == PCI_CHIP_IGD_G)
+#define IS_IGD(devid) (IS_IGDG(devid) || IS_IGDGM(devid))
+
+#define PCI_CHIP_I965_G			0x29A2
+#define PCI_CHIP_I965_Q			0x2992
+#define PCI_CHIP_I965_G_1		0x2982
+#define PCI_CHIP_I946_GZ		0x2972
+#define PCI_CHIP_I965_GM                0x2A02
+#define PCI_CHIP_I965_GME               0x2A12
+
+#define PCI_CHIP_GM45_GM                0x2A42
+
+#define PCI_CHIP_IGD_E_G                0x2E02
+#define PCI_CHIP_Q45_G                  0x2E12
+#define PCI_CHIP_G45_G                  0x2E22
+#define PCI_CHIP_G41_G                  0x2E32
+
+#define IS_MOBILE(devid)	(devid == PCI_CHIP_I855_GM || \
+				 devid == PCI_CHIP_I915_GM || \
+				 devid == PCI_CHIP_I945_GM || \
+				 devid == PCI_CHIP_I945_GME || \
+				 devid == PCI_CHIP_I965_GM || \
+				 devid == PCI_CHIP_I965_GME || \
+				 devid == PCI_CHIP_GM45_GM || IS_IGD(devid))
+
+#define IS_G45(devid)           (devid == PCI_CHIP_IGD_E_G || \
+                                 devid == PCI_CHIP_Q45_G || \
+                                 devid == PCI_CHIP_G45_G || \
+                                 devid == PCI_CHIP_G41_G)
+#define IS_GM45(devid)          (devid == PCI_CHIP_GM45_GM)
+#define IS_G4X(devid)		(IS_G45(devid) || IS_GM45(devid))
+
+#define IS_915(devid)		(devid == PCI_CHIP_I915_G || \
+				 devid == PCI_CHIP_E7221_G || \
+				 devid == PCI_CHIP_I915_GM)
+
+#define IS_945(devid)		(devid == PCI_CHIP_I945_G || \
+				 devid == PCI_CHIP_I945_GM || \
+				 devid == PCI_CHIP_I945_GME || \
+				 devid == PCI_CHIP_G33_G || \
+				 devid == PCI_CHIP_Q33_G || \
+				 devid == PCI_CHIP_Q35_G || IS_IGD(devid))
+
+#define IS_965(devid)		(devid == PCI_CHIP_I965_G || \
+				 devid == PCI_CHIP_I965_Q || \
+				 devid == PCI_CHIP_I965_G_1 || \
+				 devid == PCI_CHIP_I965_GM || \
+				 devid == PCI_CHIP_I965_GME || \
+				 devid == PCI_CHIP_I946_GZ || \
+				 IS_G4X(devid))
+
+#define IS_9XX(devid)		(IS_915(devid) || \
+				 IS_945(devid) || \
+				 IS_965(devid))
diff --git a/tools/Makefile.am b/tools/Makefile.am
new file mode 100644
index 000000000..23e10705e
--- /dev/null
+++ b/tools/Makefile.am
@@ -0,0 +1,7 @@
+bin_PROGRAMS = intel_stepping
+
+intel_stepping_LDADD = $(PCIACCESS_LIBS)
+
+AM_CFLAGS = $(DRM_CFLAGS) $(PCIACCESS_CFLAGS) $(WARN_CFLAGS) \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../lib
diff --git a/tools/intel_stepping.c b/tools/intel_stepping.c
new file mode 100644
index 000000000..a48480e22
--- /dev/null
+++ b/tools/intel_stepping.c
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2007 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <pciaccess.h>
+#include <err.h>
+#include "intel_chipset.h"
+
+int main(int argc, char **argv)
+{
+	struct pci_device *dev, *bridge;
+	int err;
+	uint8_t stepping;
+	char *step_desc = "??";
+
+	err = pci_system_init();
+	if (err != 0) {
+		fprintf(stderr, "Couldn't initialize PCI system: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	/* Grab the graphics card */
+	dev = pci_device_find_by_slot(0, 0, 2, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't find graphics card");
+
+	err = pci_device_probe(dev);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't probe graphics card: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	if (dev->vendor_id != 0x8086)
+		errx(1, "Graphics card is non-intel");
+
+	bridge = pci_device_find_by_slot(0, 0, 0, 0);
+	if (dev == NULL)
+		errx(1, "Couldn't bridge");
+
+	err = pci_device_cfg_read_u8(bridge, &stepping, 8);
+	if (err != 0) {
+		fprintf(stderr, "Couldn't read revision ID: %s\n",
+			strerror(err));
+		exit(1);
+	}
+
+	switch (dev->device_id) {
+	case PCI_CHIP_I915_G:
+		if (stepping < 0x04)
+			step_desc = "<B1";
+		else if (stepping == 0x04)
+			step_desc = "B1";
+		else if (stepping == 0x0e)
+			step_desc = "C2";
+		else if (stepping > 0x0e)
+			step_desc = ">C2";
+		else
+			step_desc = ">B1 <C2";
+		break;
+	case PCI_CHIP_I915_GM:
+		if (stepping < 0x03)
+			step_desc = "<B1";
+		else if (stepping == 0x03)
+			step_desc = "B1/C0";
+		else if (stepping == 0x04)
+			step_desc = "C1/C2";
+		else
+			step_desc = ">C2";
+		break;
+	case PCI_CHIP_I945_GM:
+		if (stepping < 0x03)
+			step_desc = "<A3";
+		else if (stepping == 0x03)
+			step_desc = "A3";
+		else
+			step_desc = ">A3";
+		break;
+	case PCI_CHIP_I965_G:
+	case PCI_CHIP_I965_Q:
+		if (stepping < 0x02)
+			step_desc = "<C1";
+		else if (stepping == 0x02)
+			step_desc = "C1/C2";
+		else
+			step_desc = ">C2";
+		break;
+	case PCI_CHIP_I965_GM:
+		if (stepping < 0x03)
+			step_desc = "<C0";
+		else if (stepping == 0x03)
+			step_desc = "C0";
+		else
+			step_desc = ">C0";
+		break;
+	case PCI_CHIP_I965_G_1:
+		if (stepping < 0x03)
+			step_desc = "<E0";
+		else if (stepping == 0x03)
+			step_desc = "E0";
+		else
+			step_desc = ">E0";
+		break;
+	}
+
+	printf("Vendor: 0x%04x, Device: 0x%04x, Revision: 0x%02x (%s)\n",
+	       dev->vendor_id,
+	       dev->device_id,
+	       stepping,
+	       step_desc);
+	return 0;
+}