From: Ben Widawsky <benjamin.widawsky@intel.com>
Date: Wed, 29 Jan 2014 04:25:39 +0000 (-0800)
Subject: drm/i915: Stop pretending VLV has rc6+
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bade1adc7459a9283eb93a4b312289ecdad1690;p=linux-beck.git

drm/i915: Stop pretending VLV has rc6+

It wasn't ever used by the caller anyway with the exception of what we
show in sysfs.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Deepak S <deepak.s@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
[danvet: Apply Deepak's suggestion.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 01b399fafe74..8f8d84005779 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -3222,10 +3222,10 @@ int intel_enable_rc6(const struct drm_device *dev)
 	if (INTEL_INFO(dev)->gen == 5)
 		return 0;
 
-	if (IS_IVYBRIDGE(dev) || IS_VALLEYVIEW(dev))
+	if (IS_IVYBRIDGE(dev))
 		return (INTEL_RC6_ENABLE | INTEL_RC6p_ENABLE);
-	else
-		return INTEL_RC6_ENABLE;
+
+	return INTEL_RC6_ENABLE;
 }
 
 static void gen6_enable_rps_interrupts(struct drm_device *dev)