From 07c52fca7d3d0d8f5af19feacd27c9b1e8bfd8f7 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Fri, 13 Nov 2015 13:45:14 +0200 Subject: [PATCH 1/3] drm/i915: remove redundant assert_can_disable_dc6 We do want to disable DC6 even when it was already disabled. For example to sanitize the state inherited from BIOS we simply call the disable function to make sure DC6 is disabled, without checking if it was enabled or not. So remove the corresponding assert. Signed-off-by: Imre Deak --- drivers/gpu/drm/i915/intel_runtime_pm.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index c0dddff..166c3e9 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c @@ -545,19 +545,6 @@ static void assert_can_enable_dc6(struct drm_i915_private *dev_priv) assert_csr_loaded(dev_priv); } -static void assert_can_disable_dc6(struct drm_i915_private *dev_priv) -{ - /* - * During initialization, the firmware may not be loaded yet. - * We still want to make sure that the DC enabling flag is cleared. - */ - if (dev_priv->power_domains.initializing) - return; - - WARN_ONCE(!(I915_READ(DC_STATE_EN) & DC_STATE_EN_UPTO_DC6), - "DC6 already programmed to be disabled.\n"); -} - void skl_enable_dc6(struct drm_i915_private *dev_priv) { uint32_t val; @@ -579,8 +566,6 @@ void skl_disable_dc6(struct drm_i915_private *dev_priv) { uint32_t val; - assert_can_disable_dc6(dev_priv); - DRM_DEBUG_KMS("Disabling DC6\n"); val = I915_READ(DC_STATE_EN); -- 2.5.0