lib: Start weaning off defunct intel_chipset.h

Several years ago we made the plan of only having one canonical source
for i915_pciids.h, the kernel and everyone importing their definitions
from that. For consistency, we style the intel_device_info after the
kernel, most notably using a generation mask and a per-codename bitfield.

This first step converts looking up the generation for a devid tree from
a massive if(devid)-chain to a (cached) table lookup.

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

1 files changed, 288 insertions, 0 deletions

diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
new file mode 100644
index 00000000..9e194945
--- /dev/null
+++ b/lib/intel_device_info.c
@@ -0,0 +1,288 @@
+#include "intel_chipset.h"
+#include "i915_pciids.h"
+
+#include <strings.h> /* ffs() */
+
+#define BIT(x) (1<<(x))
+
+static const struct intel_device_info intel_generic_info = {
+	.gen = 0,
+};
+
+static const struct intel_device_info intel_i81x_info = {
+	.gen = BIT(0),
+	.is_whitney = true,
+	.codename = "solano" /* 815 == "whitney" ? or vice versa? */
+};
+
+static const struct intel_device_info intel_i830_info = {
+	.gen = BIT(1),
+	.is_almador = true,
+	.codename = "almador"
+};
+static const struct intel_device_info intel_i845_info = {
+	.gen = BIT(1),
+	.is_brookdale = true,
+	.codename = "brookdale"
+};
+static const struct intel_device_info intel_i855_info = {
+	.gen = BIT(1),
+	.is_mobile = true,
+	.is_montara = true,
+	.codename = "montara"
+};
+static const struct intel_device_info intel_i865_info = {
+	.gen = BIT(1),
+	.is_springdale = true,
+	.codename = "spingdale"
+};
+
+static const struct intel_device_info intel_i915_info = {
+	.gen = BIT(2),
+	.is_grantsdale = true,
+	.codename = "grantsdale"
+};
+static const struct intel_device_info intel_i915m_info = {
+	.gen = BIT(2),
+	.is_mobile = true,
+	.is_alviso = true,
+	.codename = "alviso"
+};
+static const struct intel_device_info intel_i945_info = {
+	.gen = BIT(2),
+	.is_lakeport = true,
+	.codename = "lakeport"
+};
+static const struct intel_device_info intel_i945m_info = {
+	.gen = BIT(2),
+	.is_mobile = true,
+	.is_calistoga = true,
+	.codename = "calistoga"
+};
+
+static const struct intel_device_info intel_g33_info = {
+	.gen = BIT(2),
+	.is_bearlake = true,
+	.codename = "bearlake"
+};
+static const struct intel_device_info intel_pineview_info = {
+	.gen = BIT(2),
+	.is_mobile = true,
+	.is_pineview = true,
+	.codename = "pineview"
+};
+
+static const struct intel_device_info intel_i965_info = {
+	.gen = BIT(3),
+	.is_broadwater = true,
+	.codename = "broadwater"
+};
+
+static const struct intel_device_info intel_i965m_info = {
+	.gen = BIT(3),
+	.is_mobile = true,
+	.is_crestline = true,
+	.codename = "crestline"
+};
+
+static const struct intel_device_info intel_g45_info = {
+	.gen = BIT(3),
+	.is_eaglelake = true,
+	.codename = "aaglelake"
+};
+static const struct intel_device_info intel_gm45_info = {
+	.gen = BIT(3),
+	.is_mobile = true,
+	.is_cantiga = true,
+	.codename = "cantiga"
+};
+
+static const struct intel_device_info intel_ironlake_info = {
+	.gen = BIT(4),
+	.is_ironlake = true,
+	.codename = "ironlake"
+};
+static const struct intel_device_info intel_ironlake_m_info = {
+	.gen = BIT(4),
+	.is_mobile = true,
+	.is_arrandale = true,
+	.codename = "arrandale"
+};
+
+static const struct intel_device_info intel_sandybridge_info = {
+	.gen = BIT(5),
+	.is_sandybridge = true,
+	.codename = "sandybridge"
+};
+static const struct intel_device_info intel_sandybridge_m_info = {
+	.gen = BIT(5),
+	.is_mobile = true,
+	.is_sandybridge = true,
+	.codename = "sandybridge"
+};
+
+static const struct intel_device_info intel_ivybridge_info = {
+	.gen = BIT(6),
+	.is_ivybridge = true,
+	.codename = "ivybridge"
+};
+static const struct intel_device_info intel_ivybridge_m_info = {
+	.gen = BIT(6),
+	.is_mobile = true,
+	.is_ivybridge = true,
+	.codename = "ivybridge"
+};
+
+static const struct intel_device_info intel_valleyview_info = {
+	.gen = BIT(6),
+	.is_valleyview = true,
+	.codename = "valleyview"
+};
+static const struct intel_device_info intel_valleyview_m_info = {
+	.gen = BIT(6),
+	.is_mobile = true,
+	.is_valleyview = true,
+	.codename = "valleyview"
+};
+
+static const struct intel_device_info intel_haswell_info = {
+	.gen = BIT(6),
+	.is_haswell = true,
+	.codename = "haswell"
+};
+static const struct intel_device_info intel_haswell_m_info = {
+	.gen = BIT(6),
+	.is_mobile = true,
+	.is_haswell = true,
+	.codename = "haswell"
+};
+
+static const struct intel_device_info intel_broadwell_info = {
+	.gen = BIT(7),
+	.is_broadwell = true,
+	.codename = "broadwell"
+};
+static const struct intel_device_info intel_broadwell_m_info = {
+	.gen = BIT(7),
+	.is_mobile = true,
+	.is_broadwell = true,
+	.codename = "broadwell"
+};
+
+static const struct intel_device_info intel_cherryview_info = {
+	.gen = BIT(7),
+	.is_cherryview = true,
+	.codename = "cherryview"
+};
+
+static const struct intel_device_info intel_skylake_info = {
+	.gen = BIT(8),
+	.is_skylake = true,
+	.codename = "skylake"
+};
+
+static const struct intel_device_info intel_broxton_info = {
+	.gen = BIT(8),
+	.is_broxton = true,
+	.codename = "broxton"
+};
+
+static const struct intel_device_info intel_kabylake_info = {
+	.gen = BIT(8),
+	.is_kabylake = true,
+	.codename = "kabylake"
+};
+
+static const struct pci_id_match intel_device_match[] = {
+	INTEL_I830_IDS(&intel_i830_info),
+	INTEL_I845G_IDS(&intel_i845_info),
+	INTEL_I85X_IDS(&intel_i855_info),
+	INTEL_I865G_IDS(&intel_i865_info),
+
+	INTEL_I915G_IDS(&intel_i915_info),
+	INTEL_I915GM_IDS(&intel_i915m_info),
+	INTEL_I945G_IDS(&intel_i945_info),
+	INTEL_I945GM_IDS(&intel_i945m_info),
+
+	INTEL_G33_IDS(&intel_g33_info),
+	INTEL_PINEVIEW_IDS(&intel_pineview_info),
+
+	INTEL_I965G_IDS(&intel_i965_info),
+	INTEL_I965GM_IDS(&intel_i965m_info),
+
+	INTEL_G45_IDS(&intel_g45_info),
+	INTEL_GM45_IDS(&intel_gm45_info),
+
+	INTEL_IRONLAKE_D_IDS(&intel_ironlake_info),
+	INTEL_IRONLAKE_M_IDS(&intel_ironlake_m_info),
+
+	INTEL_SNB_D_IDS(&intel_sandybridge_info),
+	INTEL_SNB_M_IDS(&intel_sandybridge_m_info),
+
+	INTEL_IVB_D_IDS(&intel_ivybridge_info),
+	INTEL_IVB_M_IDS(&intel_ivybridge_m_info),
+
+	INTEL_HSW_D_IDS(&intel_haswell_info),
+	INTEL_HSW_M_IDS(&intel_haswell_m_info),
+
+	INTEL_VLV_D_IDS(&intel_valleyview_info),
+	INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+
+	INTEL_BDW_D_IDS(&intel_broadwell_info),
+	INTEL_BDW_M_IDS(&intel_broadwell_m_info),
+
+	INTEL_CHV_IDS(&intel_cherryview_info),
+
+	INTEL_SKL_IDS(&intel_skylake_info),
+
+	INTEL_BXT_IDS(&intel_broxton_info),
+
+	INTEL_KBL_IDS(&intel_kabylake_info),
+
+	INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info),
+};
+
+/**
+ * intel_device_info:
+ * @devid: pci device id
+ *
+ * Looks up the Intel GFX device info for the given device id.
+ *
+ * Returns:
+ * The associated intel_device_info
+ */
+const struct intel_device_info *intel_device_info(uint16_t devid)
+{
+	static const struct intel_device_info *cache = &intel_generic_info;
+	static uint16_t cached_devid;
+	int i;
+
+	if (cached_devid == devid)
+		goto out;
+
+	/* XXX Presort table and bsearch! */
+	for (i = 0; intel_device_match[i].device_id != PCI_MATCH_ANY; i++) {
+		if (devid == intel_device_match[i].device_id)
+			break;
+	}
+
+	cached_devid = devid;
+	cache = (void *)intel_device_match[i].match_data;
+
+out:
+	return cache;
+}
+
+/**
+ * intel_gen:
+ * @devid: pci device id
+ *
+ * Computes the Intel GFX generation for the given device id.
+ *
+ * Returns:
+ * The GFX generation on successful lookup, 0 on failure.
+ */
+unsigned intel_gen(uint16_t devid)
+{
+	return ffs(intel_device_info(devid)->gen);
+}