From 1ee68e5c1330129349282f0ce65805ddf19afabc Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 25 May 2012 10:13:31 +0200 Subject: [PATCH] --- yaml --- r: 309377 b: refs/heads/master c: ef12dab779acdb907eb4c3fa723e1c6f035ee13c h: refs/heads/master i: 309375: e94504f4400576b4551cf2724a14f520544c31b7 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_pm.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae5737e449a2..6f7a62c68fb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31d8d651eb646498413abe5f17acc7fa2b68b2fc +refs/heads/master: ef12dab779acdb907eb4c3fa723e1c6f035ee13c diff --git a/trunk/drivers/gpu/drm/i915/intel_pm.c b/trunk/drivers/gpu/drm/i915/intel_pm.c index 00462ef96627..d0ce2a5b1d3f 100644 --- a/trunk/drivers/gpu/drm/i915/intel_pm.c +++ b/trunk/drivers/gpu/drm/i915/intel_pm.c @@ -3603,8 +3603,9 @@ static void gen6_sanitize_pm(struct drm_device *dev) limits |= (dev_priv->min_delay & 0x3f) << 16; if (old != limits) { - DRM_ERROR("Power management discrepancy: GEN6_RP_INTERRUPT_LIMITS expected %08x, was %08x\n", - limits, old); + /* Note that the known failure case is to read back 0. */ + DRM_DEBUG_DRIVER("Power management discrepancy: GEN6_RP_INTERRUPT_LIMITS " + "expected %08x, was %08x\n", limits, old); I915_WRITE(GEN6_RP_INTERRUPT_LIMITS, limits); }