summaryrefslogtreecommitdiff
path: root/lib/intel_device_info.c
diff options
context:
space:
mode:
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2016-12-20 13:45:25 +0200
committerAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>2017-01-03 13:42:37 +0200
commit770fd185eb7c878d7d1e16af4aa4f456a264d148 (patch)
tree7e4d439a9237d5b497f15d33bd4842e339d7f338 /lib/intel_device_info.c
parente5e8b7cecc5a03f4db5ec4a63e9bea28fd125e9b (diff)
lib/i915_pciids.h: Update to latest version wich includes GLK ids
Copy the include/drm/i915_pciids.h file from following kernel commit, which includes Geminilake PCI IDs. commit 8363e3c3947d0e22955f94a6a87e4f17ce5087b4 Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Date: Thu Nov 10 17:23:08 2016 +0200 drm/i915/glk: Add Geminilake PCI IDs Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Diffstat (limited to 'lib/intel_device_info.c')
-rw-r--r--lib/intel_device_info.c27
1 files changed, 3 insertions, 24 deletions
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 5aab6846..5805b5e1 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -138,36 +138,18 @@ static const struct intel_device_info intel_valleyview_info = {
.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),
@@ -222,14 +204,11 @@ static const struct pci_id_match intel_device_match[] = {
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_HSW_IDS(&intel_haswell_info),
- INTEL_VLV_D_IDS(&intel_valleyview_info),
- INTEL_VLV_M_IDS(&intel_valleyview_m_info),
+ INTEL_VLV_IDS(&intel_valleyview_info),
- INTEL_BDW_D_IDS(&intel_broadwell_info),
- INTEL_BDW_M_IDS(&intel_broadwell_m_info),
+ INTEL_BDW_IDS(&intel_broadwell_info),
INTEL_CHV_IDS(&intel_cherryview_info),