diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-13 21:43:54 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-03-13 21:49:09 +0000 |
commit | 13d946ef2f92cdefc2fb5c493a14a438868d3a86 (patch) | |
tree | c9a5db0ac17271c7680e14eb02a87f6f1f604056 /lib | |
parent | 2c64f11f38f44d21419dc15adc7162bd83f65664 (diff) |
lib: Update i915_pciids.h
Sync to
commit 77a9e13b5a3c9c0cbd9e672e55970e7358a1a482
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Mar 13 11:26:09 2017 +0000
drm/i915: Add i810/i815 pci-ids for completeness
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/i915_pciids.h | 24 | ||||
-rw-r--r-- | lib/intel_device_info.c | 11 |
2 files changed, 24 insertions, 11 deletions
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h index 540be9ff..27e0dbaa 100644 --- a/lib/i915_pciids.h +++ b/lib/i915_pciids.h @@ -47,6 +47,14 @@ 0x030000, 0xff0000, \ (unsigned long) info } +#define INTEL_I810_IDS(info) \ + INTEL_VGA_DEVICE(0x7121, info), /* I810 */ \ + INTEL_VGA_DEVICE(0x7123, info), /* I810_DC100 */ \ + INTEL_VGA_DEVICE(0x7125, info) /* I810_E */ + +#define INTEL_I815_IDS(info) \ + INTEL_VGA_DEVICE(0x1132, info) /* I815*/ + #define INTEL_I830_IDS(info) \ INTEL_VGA_DEVICE(0x3577, info) @@ -226,23 +234,18 @@ INTEL_VGA_DEVICE(0x162A, info), /* Server */ \ INTEL_VGA_DEVICE(0x162D, info) /* Workstation */ -#define INTEL_BDW_RSVDM_IDS(info) \ +#define INTEL_BDW_RSVD_IDS(info) \ INTEL_VGA_DEVICE(0x1632, info), /* ULT */ \ INTEL_VGA_DEVICE(0x1636, info), /* ULT */ \ INTEL_VGA_DEVICE(0x163B, info), /* Iris */ \ - INTEL_VGA_DEVICE(0x163E, info) /* ULX */ - -#define INTEL_BDW_RSVDD_IDS(info) \ + INTEL_VGA_DEVICE(0x163E, info), /* ULX */ \ INTEL_VGA_DEVICE(0x163A, info), /* Server */ \ INTEL_VGA_DEVICE(0x163D, info) /* Workstation */ #define INTEL_BDW_IDS(info) \ INTEL_BDW_GT12_IDS(info), \ INTEL_BDW_GT3_IDS(info), \ - INTEL_BDW_RSVDM_IDS(info), \ - INTEL_BDW_GT12_IDS(info), \ - INTEL_BDW_GT3_IDS(info), \ - INTEL_BDW_RSVDD_IDS(info) + INTEL_BDW_RSVD_IDS(info) #define INTEL_CHV_IDS(info) \ INTEL_VGA_DEVICE(0x22b0, info), \ @@ -271,13 +274,14 @@ INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ - INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ + INTEL_VGA_DEVICE(0x192D, info) /* SRV GT3 */ #define INTEL_SKL_GT4_IDS(info) \ INTEL_VGA_DEVICE(0x1932, info), /* DT GT4 */ \ INTEL_VGA_DEVICE(0x193B, info), /* Halo GT4 */ \ INTEL_VGA_DEVICE(0x193D, info), /* WKS GT4 */ \ - INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4 */ + INTEL_VGA_DEVICE(0x192A, info), /* SRV GT4 */ \ + INTEL_VGA_DEVICE(0x193A, info) /* SRV GT4e */ #define INTEL_SKL_IDS(info) \ INTEL_SKL_GT1_IDS(info), \ diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c index db4f3831..2b0658c7 100644 --- a/lib/intel_device_info.c +++ b/lib/intel_device_info.c @@ -9,12 +9,18 @@ static const struct intel_device_info intel_generic_info = { .gen = 0, }; -static const struct intel_device_info intel_i81x_info = { +static const struct intel_device_info intel_i810_info = { .gen = BIT(0), .is_whitney = true, .codename = "solano" /* 815 == "whitney" ? or vice versa? */ }; +static const struct intel_device_info intel_i815_info = { + .gen = BIT(0), + .is_whitney = true, + .codename = "whitney" +}; + static const struct intel_device_info intel_i830_info = { .gen = BIT(1), .is_almador = true, @@ -182,6 +188,9 @@ static const struct intel_device_info intel_geminilake_info = { }; static const struct pci_id_match intel_device_match[] = { + INTEL_I810_IDS(&intel_i810_info), + INTEL_I815_IDS(&intel_i815_info), + INTEL_I830_IDS(&intel_i830_info), INTEL_I845G_IDS(&intel_i845_info), INTEL_I85X_IDS(&intel_i855_info), |