diff options
author | Imre Deak <imre.deak@intel.com> | 2014-04-28 05:03:59 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-05-05 03:09:21 -0400 |
commit | f033579f7759bfb34c082aacbd19a830f1e587cc (patch) | |
tree | bc4075ea105cf7b36b0f15a36a7acb21eee1c5b1 | |
parent | 1c8562f66567807236c225d1518b0f034396f38a (diff) |
drm/i915: bdw: fix RC6 enabled status reporting and disable runtime PM
On BDW we don't enable RC6 at the moment, but this isn't reflected in
the (sanitized) i915.enable_rc6 option. So make enable_rc6 report
correctly that RC6 is disabled, which will also effectively disable RPM
on BDW (since RPM depends on RC6).
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77565
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index d49ec02ef39b..19020e5e914b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
@@ -3260,6 +3260,10 @@ static int sanitize_rc6_option(const struct drm_device *dev, int enable_rc6) | |||
3260 | if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev)) | 3260 | if (INTEL_INFO(dev)->gen == 5 && !IS_IRONLAKE_M(dev)) |
3261 | return 0; | 3261 | return 0; |
3262 | 3262 | ||
3263 | /* Disable RC6 on Broadwell for now */ | ||
3264 | if (IS_BROADWELL(dev)) | ||
3265 | return 0; | ||
3266 | |||
3263 | /* Respect the kernel parameter if it is set */ | 3267 | /* Respect the kernel parameter if it is set */ |
3264 | if (enable_rc6 >= 0) { | 3268 | if (enable_rc6 >= 0) { |
3265 | int mask; | 3269 | int mask; |