[Intel-gfx] [PATCH v2 05/21] drm/i915: Make GEN7_FEATURES inherit from GEN6

[Carlos Santa]

By making GEN7_FEATURES inherit from GEN6_FEATURES we can reduce
code duplication.

Also, disable Runtime PM for IVB and add a FIXME comment.

Signed-off-by: Carlos Santa <carlos.santa at intel.com>
---
 drivers/gpu/drm/i915/i915_pci.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 674b298..b605e52 100644
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -215,13 +215,10 @@ static const struct intel_device_info intel_sandybridge_m_info = {
 };
 
 #define GEN7_FEATURES  \
+	GEN6_FEATURES, \
 	.gen = 7, .num_pipes = 3, \
-	.need_gfx_hws = 1, .has_hotplug = 1, \
-	.has_fbc = 1, \
-	.has_core_ring_freq = 1, \
-	.ring_mask = RENDER_RING | BSD_RING | BLT_RING, \
-	.has_llc = 1, \
-	GEN_DEFAULT_PIPEOFFSETS, \
+	/* FIXME: IVB has no RPM for now  */\
+	.has_runtime_pm = 0, \
 	IVB_CURSOR_OFFSETS
 
 static const struct intel_device_info intel_ivybridge_d_info = {
-- 
1.9.1