aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2011-04-28 17:32:07 -0400
committerKeith Packard <keithp@keithp.com>2011-05-13 21:12:48 -0400
commitc76b615c43a1189c32058ff3ab5634fc3fa97ae5 (patch)
tree6b362d70396f1c0c7069fe392a291e1d2ee769b8
parentc792513bd1760c364b36391028512fbf2a4eb903 (diff)
drm/i915: add Ivy Bridge PCI IDs and driver feature structs
There are several variants, set feature bits appropriately for both mobile and desktop parts. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3930c77ac4ac..dc2c1a294668 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -188,6 +188,21 @@ static const struct intel_device_info intel_sandybridge_m_info = {
188 .has_blt_ring = 1, 188 .has_blt_ring = 1,
189}; 189};
190 190
191static const struct intel_device_info intel_ivybridge_d_info = {
192 .is_ivybridge = 1, .gen = 7,
193 .need_gfx_hws = 1, .has_hotplug = 1,
194 .has_bsd_ring = 1,
195 .has_blt_ring = 1,
196};
197
198static const struct intel_device_info intel_ivybridge_m_info = {
199 .is_ivybridge = 1, .gen = 7, .is_mobile = 1,
200 .need_gfx_hws = 1, .has_hotplug = 1,
201 .has_fbc = 0, /* FBC is not enabled on Ivybridge mobile yet */
202 .has_bsd_ring = 1,
203 .has_blt_ring = 1,
204};
205
191static const struct pci_device_id pciidlist[] = { /* aka */ 206static const struct pci_device_id pciidlist[] = { /* aka */
192 INTEL_VGA_DEVICE(0x3577, &intel_i830_info), /* I830_M */ 207 INTEL_VGA_DEVICE(0x3577, &intel_i830_info), /* I830_M */
193 INTEL_VGA_DEVICE(0x2562, &intel_845g_info), /* 845_G */ 208 INTEL_VGA_DEVICE(0x2562, &intel_845g_info), /* 845_G */
@@ -227,6 +242,11 @@ static const struct pci_device_id pciidlist[] = { /* aka */
227 INTEL_VGA_DEVICE(0x0116, &intel_sandybridge_m_info), 242 INTEL_VGA_DEVICE(0x0116, &intel_sandybridge_m_info),
228 INTEL_VGA_DEVICE(0x0126, &intel_sandybridge_m_info), 243 INTEL_VGA_DEVICE(0x0126, &intel_sandybridge_m_info),
229 INTEL_VGA_DEVICE(0x010A, &intel_sandybridge_d_info), 244 INTEL_VGA_DEVICE(0x010A, &intel_sandybridge_d_info),
245 INTEL_VGA_DEVICE(0x0156, &intel_ivybridge_m_info), /* GT1 mobile */
246 INTEL_VGA_DEVICE(0x0166, &intel_ivybridge_m_info), /* GT2 mobile */
247 INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */
248 INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
249 INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
230 {0, 0, 0} 250 {0, 0, 0}
231}; 251};
232 252