diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2016-08-02 07:07:33 -0400 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2016-08-10 17:56:58 -0400 |
| commit | d8b6161f7294b63180da443c9ff48c7efce182eb (patch) | |
| tree | df352548ed330dbfa402f8c4c8e35a287d8431d1 | |
| parent | 7ff9a55614712adf13ce7990565be0263e620f5e (diff) | |
drm/i915: Clean up the extra RPM ref on CHV with i915.enable_rc6=0
Remove the CHV early bail out from intel_cleanup_gt_powersave() so that
we'll clean up the extra RPM reference held due to i915.enable_rc6=0.
Cc: Imre Deak <imre.deak@intel.com>
Fixes: b268c699aca5 ("drm/i915: refactor RPM disabling due to RC6 being disabled")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470136053-23276-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Imre Deak <imre.deak@intel.com>
(cherry picked from commit 8dac1e1f2068321fb4b7062d3c5408971f7a7e35)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index f4f3fcc8b3be..1ff5c63f1728 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c | |||
| @@ -6573,9 +6573,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv) | |||
| 6573 | 6573 | ||
| 6574 | void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv) | 6574 | void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv) |
| 6575 | { | 6575 | { |
| 6576 | if (IS_CHERRYVIEW(dev_priv)) | 6576 | if (IS_VALLEYVIEW(dev_priv)) |
| 6577 | return; | ||
| 6578 | else if (IS_VALLEYVIEW(dev_priv)) | ||
| 6579 | valleyview_cleanup_gt_powersave(dev_priv); | 6577 | valleyview_cleanup_gt_powersave(dev_priv); |
| 6580 | 6578 | ||
| 6581 | if (!i915.enable_rc6) | 6579 | if (!i915.enable_rc6) |