[PATCH 4.1, 4.2] drm/i915: Silence DDR DVFS errors on CHV

ville.syrjala
2015-09-28T19:09:14Z

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

commit 58590c14d80defc94e900308a9d8fa55284de6f2 upstream.

58590c1 drm/i915: Don't try to use DDR DVFS on CHV when disabled in the BIOS
can't be backported as is because proper DDR DVFS support didn't even
exist before
6f9c784 drm/i915: Don't do PM5/DDR DVFS with multiple pipes

However we still want to get rid of the error messages. The simplest thing
is to just suppress them, so let's do that instead.

Cc: <stable@vger.kernel.org> # 4.1, 4.2
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/intel_pm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index eadc15c..4a904f2 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -303,7 +303,7 @@ static void chv_set_memory_dvfs(struct drm_i915_private *dev_priv, bool enable)

if (wait_for((vlv_punit_read(dev_priv, PUNIT_REG_DDR_SETUP2) &
FORCE_DDR_FREQ_REQ_ACK) == 0, 3))
- DRM_ERROR("timed out waiting for Punit DDR DVFS request\n");
+ DRM_DEBUG_DRIVER("timed out waiting for Punit DDR DVFS request\n");

mutex_unlock(&dev_priv->rps.hw_lock);
}
--
2.4.6