diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2013-04-05 16:12:45 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-04-08 14:53:06 -0400 |
commit | 999bcdea3206ea8a402c010f78060cd3da4f812c (patch) | |
tree | 98610ffe2b5df6579c64e8baabc9209bc636f444 /drivers/gpu/drm/i915/i915_drv.c | |
parent | ce1bb329795c3efc4bfd8846ee4ef1798536307a (diff) |
drm/i915: Add a pipeless ivybridge configuration
FIXME: This is based on some HW being used for a demo. We should
probably wait until we have confirmation on the IDs before upstreaming
this patch.
v2: Use GEN7_FEATURES (Chris)
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 88d78e39bf6d..bd92e7d47653 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -140,6 +140,16 @@ extern int intel_agp_enabled; | |||
140 | .subdevice = PCI_ANY_ID, \ | 140 | .subdevice = PCI_ANY_ID, \ |
141 | .driver_data = (unsigned long) info } | 141 | .driver_data = (unsigned long) info } |
142 | 142 | ||
143 | #define INTEL_QUANTA_VGA_DEVICE(info) { \ | ||
144 | .class = PCI_BASE_CLASS_DISPLAY << 16, \ | ||
145 | .class_mask = 0xff0000, \ | ||
146 | .vendor = 0x8086, \ | ||
147 | .device = 0x16a, \ | ||
148 | .subvendor = 0x152d, \ | ||
149 | .subdevice = 0x8990, \ | ||
150 | .driver_data = (unsigned long) info } | ||
151 | |||
152 | |||
143 | static const struct intel_device_info intel_i830_info = { | 153 | static const struct intel_device_info intel_i830_info = { |
144 | .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2, | 154 | .gen = 2, .is_mobile = 1, .cursor_needs_physical = 1, .num_pipes = 2, |
145 | .has_overlay = 1, .overlay_needs_physical = 1, | 155 | .has_overlay = 1, .overlay_needs_physical = 1, |
@@ -272,6 +282,12 @@ static const struct intel_device_info intel_ivybridge_m_info = { | |||
272 | .is_mobile = 1, | 282 | .is_mobile = 1, |
273 | }; | 283 | }; |
274 | 284 | ||
285 | static const struct intel_device_info intel_ivybridge_q_info = { | ||
286 | GEN7_FEATURES, | ||
287 | .is_ivybridge = 1, | ||
288 | .num_pipes = 0, /* legal, last one wins */ | ||
289 | }; | ||
290 | |||
275 | static const struct intel_device_info intel_valleyview_m_info = { | 291 | static const struct intel_device_info intel_valleyview_m_info = { |
276 | GEN7_FEATURES, | 292 | GEN7_FEATURES, |
277 | .is_mobile = 1, | 293 | .is_mobile = 1, |
@@ -342,6 +358,7 @@ static const struct pci_device_id pciidlist[] = { /* aka */ | |||
342 | INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */ | 358 | INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */ |
343 | INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */ | 359 | INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */ |
344 | INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */ | 360 | INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */ |
361 | INTEL_QUANTA_VGA_DEVICE(&intel_ivybridge_q_info), /* Quanta transcode */ | ||
345 | INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */ | 362 | INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */ |
346 | INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */ | 363 | INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */ |
347 | INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */ | 364 | INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */ |