From: Paulo Zanoni Date: Tue, 7 Oct 2014 19:11:11 +0000 (-0300) Subject: drm/i915: only run hsw_power_well_post_enable when really needed X-Git-Tag: v3.19-rc1~73^2~78^2~19 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6d729bff304f3b81062e21cd333a639fda4244b3;p=~emulex%2Finfiniband.git drm/i915: only run hsw_power_well_post_enable when really needed Only run it after we actually enable the power well. When we're booting the machine there are cases where we run hsw_power_well_post_enable without really needing, and even though this is not causing any real bugs, it is unneeded and causes confusion to people debugging interrupts. Signed-off-by: Paulo Zanoni Reviewed-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index 36749b91d28..39c33e0a753 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -221,9 +221,9 @@ static void hsw_set_power_well(struct drm_i915_private *dev_priv, if (wait_for((I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED), 20)) DRM_ERROR("Timeout enabling power well\n"); + hsw_power_well_post_enable(dev_priv); } - hsw_power_well_post_enable(dev_priv); } else { if (enable_requested) { I915_WRITE(HSW_PWR_WELL_DRIVER, 0);