aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_drv.c26
-rw-r--r--include/drm/i915_pciids.h22
2 files changed, 41 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f2ca3e929cd7..9f47aab7915f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -279,6 +279,26 @@ static const struct intel_device_info intel_broadwell_m_info = {
279 GEN_DEFAULT_PIPEOFFSETS, 279 GEN_DEFAULT_PIPEOFFSETS,
280}; 280};
281 281
282static const struct intel_device_info intel_broadwell_gt3d_info = {
283 .gen = 8, .num_pipes = 3,
284 .need_gfx_hws = 1, .has_hotplug = 1,
285 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
286 .has_llc = 1,
287 .has_ddi = 1,
288 .has_fbc = 1,
289 GEN_DEFAULT_PIPEOFFSETS,
290};
291
292static const struct intel_device_info intel_broadwell_gt3m_info = {
293 .gen = 8, .is_mobile = 1, .num_pipes = 3,
294 .need_gfx_hws = 1, .has_hotplug = 1,
295 .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
296 .has_llc = 1,
297 .has_ddi = 1,
298 .has_fbc = 1,
299 GEN_DEFAULT_PIPEOFFSETS,
300};
301
282/* 302/*
283 * Make sure any device matches here are from most specific to most 303 * Make sure any device matches here are from most specific to most
284 * general. For example, since the Quanta match is based on the subsystem 304 * general. For example, since the Quanta match is based on the subsystem
@@ -311,8 +331,10 @@ static const struct intel_device_info intel_broadwell_m_info = {
311 INTEL_HSW_M_IDS(&intel_haswell_m_info), \ 331 INTEL_HSW_M_IDS(&intel_haswell_m_info), \
312 INTEL_VLV_M_IDS(&intel_valleyview_m_info), \ 332 INTEL_VLV_M_IDS(&intel_valleyview_m_info), \
313 INTEL_VLV_D_IDS(&intel_valleyview_d_info), \ 333 INTEL_VLV_D_IDS(&intel_valleyview_d_info), \
314 INTEL_BDW_M_IDS(&intel_broadwell_m_info), \ 334 INTEL_BDW_GT12M_IDS(&intel_broadwell_m_info), \
315 INTEL_BDW_D_IDS(&intel_broadwell_d_info) 335 INTEL_BDW_GT12D_IDS(&intel_broadwell_d_info), \
336 INTEL_BDW_GT3M_IDS(&intel_broadwell_gt3m_info), \
337 INTEL_BDW_GT3D_IDS(&intel_broadwell_gt3d_info)
316 338
317static const struct pci_device_id pciidlist[] = { /* aka */ 339static const struct pci_device_id pciidlist[] = { /* aka */
318 INTEL_PCI_IDS, 340 INTEL_PCI_IDS,
diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index 940ece4934ba..24f3cad045db 100644
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -223,14 +223,26 @@
223 _INTEL_BDW_D(gt, 0x160A, info), /* Server */ \ 223 _INTEL_BDW_D(gt, 0x160A, info), /* Server */ \
224 _INTEL_BDW_D(gt, 0x160D, info) /* Workstation */ 224 _INTEL_BDW_D(gt, 0x160D, info) /* Workstation */
225 225
226#define INTEL_BDW_M_IDS(info) \ 226#define INTEL_BDW_GT12M_IDS(info) \
227 _INTEL_BDW_M_IDS(1, info), \ 227 _INTEL_BDW_M_IDS(1, info), \
228 _INTEL_BDW_M_IDS(2, info), \ 228 _INTEL_BDW_M_IDS(2, info)
229 _INTEL_BDW_M_IDS(3, info)
230 229
231#define INTEL_BDW_D_IDS(info) \ 230#define INTEL_BDW_GT12D_IDS(info) \
232 _INTEL_BDW_D_IDS(1, info), \ 231 _INTEL_BDW_D_IDS(1, info), \
233 _INTEL_BDW_D_IDS(2, info), \ 232 _INTEL_BDW_D_IDS(2, info)
233
234#define INTEL_BDW_GT3M_IDS(info) \
235 _INTEL_BDW_M_IDS(3, info)
236
237#define INTEL_BDW_GT3D_IDS(info) \
234 _INTEL_BDW_D_IDS(3, info) 238 _INTEL_BDW_D_IDS(3, info)
235 239
240#define INTEL_BDW_M_IDS(info) \
241 INTEL_BDW_GT12M_IDS(info), \
242 INTEL_BDW_GT3M_IDS(info)
243
244#define INTEL_BDW_D_IDS(info) \
245 INTEL_BDW_GT12D_IDS(info), \
246 INTEL_BDW_GT3D_IDS(info)
247
236#endif /* _I915_PCIIDS_H */ 248#endif /* _I915_PCIIDS_H */