diff options
| author | Ben Widawsky | 2014-01-29 05:25:39 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-02-12 18:53:12 +0100 |
| commit | 8bade1adc7459a9283eb93a4b312289ecdad1690 (patch) | |
| tree | 7fc6f54f6b607c0190979f55795054939309be80 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Clarify RC6 enabling (diff) | |
| download | kernel-qcow2-linux-8bade1adc7459a9283eb93a4b312289ecdad1690.tar.gz kernel-qcow2-linux-8bade1adc7459a9283eb93a4b312289ecdad1690.tar.xz kernel-qcow2-linux-8bade1adc7459a9283eb93a4b312289ecdad1690.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |