Commit 219f4fdb authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter

drm/i915: Introduce GEN7_FEATURES for device info

Recommended by Chris.

v2: Make it GEN7_FEATURES, and use it for vlv and hsw also (Ben)

Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7eb552ae
...@@ -248,63 +248,49 @@ static const struct intel_device_info intel_sandybridge_m_info = { ...@@ -248,63 +248,49 @@ static const struct intel_device_info intel_sandybridge_m_info = {
.has_force_wake = 1, .has_force_wake = 1,
}; };
#define GEN7_FEATURES \
.gen = 7, .num_pipes = 3, \
.need_gfx_hws = 1, .has_hotplug = 1, \
.has_bsd_ring = 1, \
.has_blt_ring = 1, \
.has_llc = 1, \
.has_force_wake = 1
static const struct intel_device_info intel_ivybridge_d_info = { static const struct intel_device_info intel_ivybridge_d_info = {
.is_ivybridge = 1, .gen = 7, .num_pipes = 3, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .is_ivybridge = 1,
.has_bsd_ring = 1,
.has_blt_ring = 1,
.has_llc = 1,
.has_force_wake = 1,
}; };
static const struct intel_device_info intel_ivybridge_m_info = { static const struct intel_device_info intel_ivybridge_m_info = {
.is_ivybridge = 1, .gen = 7, .is_mobile = 1, .num_pipes = 3, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .is_ivybridge = 1,
.has_fbc = 0, /* FBC is not enabled on Ivybridge mobile yet */ .is_mobile = 1,
.has_bsd_ring = 1,
.has_blt_ring = 1,
.has_llc = 1,
.has_force_wake = 1,
}; };
static const struct intel_device_info intel_valleyview_m_info = { static const struct intel_device_info intel_valleyview_m_info = {
.gen = 7, .is_mobile = 1, .num_pipes = 2, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .is_mobile = 1,
.has_fbc = 0, .num_pipes = 2,
.has_bsd_ring = 1,
.has_blt_ring = 1,
.is_valleyview = 1, .is_valleyview = 1,
.display_mmio_offset = VLV_DISPLAY_BASE, .display_mmio_offset = VLV_DISPLAY_BASE,
.has_force_wake = 1,
}; };
static const struct intel_device_info intel_valleyview_d_info = { static const struct intel_device_info intel_valleyview_d_info = {
.gen = 7, .num_pipes = 2, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .num_pipes = 2,
.has_fbc = 0,
.has_bsd_ring = 1,
.has_blt_ring = 1,
.is_valleyview = 1, .is_valleyview = 1,
.display_mmio_offset = VLV_DISPLAY_BASE, .display_mmio_offset = VLV_DISPLAY_BASE,
.has_force_wake = 1,
}; };
static const struct intel_device_info intel_haswell_d_info = { static const struct intel_device_info intel_haswell_d_info = {
.is_haswell = 1, .gen = 7, .num_pipes = 3, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .is_haswell = 1,
.has_bsd_ring = 1,
.has_blt_ring = 1,
.has_llc = 1,
.has_force_wake = 1,
}; };
static const struct intel_device_info intel_haswell_m_info = { static const struct intel_device_info intel_haswell_m_info = {
.is_haswell = 1, .gen = 7, .is_mobile = 1, .num_pipes = 3, GEN7_FEATURES,
.need_gfx_hws = 1, .has_hotplug = 1, .is_haswell = 1,
.has_bsd_ring = 1, .is_mobile = 1,
.has_blt_ring = 1,
.has_llc = 1,
.has_force_wake = 1,
}; };
static const struct pci_device_id pciidlist[] = { /* aka */ static const struct pci_device_id pciidlist[] = { /* aka */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment