diff options
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 12 | ||||
-rw-r--r-- | include/drm/i915_pciids.h | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 4024e16ae63d..6868bc0eabd3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -299,6 +299,15 @@ static const struct intel_device_info intel_broadwell_gt3m_info = { | |||
299 | GEN_DEFAULT_PIPEOFFSETS, | 299 | GEN_DEFAULT_PIPEOFFSETS, |
300 | }; | 300 | }; |
301 | 301 | ||
302 | static const struct intel_device_info intel_cherryview_info = { | ||
303 | .is_preliminary = 1, | ||
304 | .gen = 8, .num_pipes = 2, | ||
305 | .need_gfx_hws = 1, .has_hotplug = 1, | ||
306 | .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING, | ||
307 | .is_valleyview = 1, | ||
308 | .display_mmio_offset = VLV_DISPLAY_BASE, | ||
309 | }; | ||
310 | |||
302 | /* | 311 | /* |
303 | * Make sure any device matches here are from most specific to most | 312 | * Make sure any device matches here are from most specific to most |
304 | * general. For example, since the Quanta match is based on the subsystem | 313 | * general. For example, since the Quanta match is based on the subsystem |
@@ -334,7 +343,8 @@ static const struct intel_device_info intel_broadwell_gt3m_info = { | |||
334 | INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info), \ | 343 | INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info), \ |
335 | INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info), \ | 344 | INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info), \ |
336 | INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \ | 345 | INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \ |
337 | INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info) | 346 | INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info), \ |
347 | INTEL_CHV_IDS(&intel_cherryview_info) | ||
338 | 348 | ||
339 | static const struct pci_device_id pciidlist[] = { /* aka */ | 349 | static const struct pci_device_id pciidlist[] = { /* aka */ |
340 | INTEL_PCI_IDS, | 350 | INTEL_PCI_IDS, |
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h index 24f3cad045db..d18f31a77987 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h | |||
@@ -245,4 +245,10 @@ | |||
245 | INTEL_BDW_GT12D_IDS(info), \ | 245 | INTEL_BDW_GT12D_IDS(info), \ |
246 | INTEL_BDW_GT3D_IDS(info) | 246 | INTEL_BDW_GT3D_IDS(info) |
247 | 247 | ||
248 | #define INTEL_CHV_IDS(info) \ | ||
249 | INTEL_VGA_DEVICE(0x22b0, info), \ | ||
250 | INTEL_VGA_DEVICE(0x22b1, info), \ | ||
251 | INTEL_VGA_DEVICE(0x22b2, info), \ | ||
252 | INTEL_VGA_DEVICE(0x22b3, info) | ||
253 | |||
248 | #endif /* _I915_PCIIDS_H */ | 254 | #endif /* _I915_PCIIDS_H */ |