From: Paulo Zanoni Date: Tue, 27 Oct 2015 16:54:22 +0000 (-0200) Subject: drm/i915: get rid of FBC {,de}activation messages X-Git-Tag: MMI-PSA29.97-13-9~7427^2~45^2~1021 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=820bcabbf0acce7f3e7b72ed5e51b0a1d9c2046d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: get rid of FBC {,de}activation messages When running Cinnamon I see way too many pairs of these messages: many per second. Get rid of them as they're just telling us FBC is working as expected. We already have the messages for enable/disable, so we don't really need messages for activation/deactivation. v2: Rebase after changing the patch order. Reviewed-by: Chris Wilson Signed-off-by: Paulo Zanoni Link: http://patchwork.freedesktop.org/patch/msgid/ --- diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c index 0ad9585b0487..af621de700fb 100644 --- a/drivers/gpu/drm/i915/intel_fbc.c +++ b/drivers/gpu/drm/i915/intel_fbc.c @@ -128,8 +128,6 @@ static void i8xx_fbc_deactivate(struct drm_i915_private *dev_priv) DRM_DEBUG_KMS("FBC idle timed out\n"); return; } - - DRM_DEBUG_KMS("deactivated FBC\n"); } static void i8xx_fbc_activate(struct intel_crtc *crtc) @@ -177,9 +175,6 @@ static void i8xx_fbc_activate(struct intel_crtc *crtc) fbc_ctl |= (cfb_pitch & 0xff) << FBC_CTL_STRIDE_SHIFT; fbc_ctl |= obj->fence_reg; I915_WRITE(FBC_CONTROL, fbc_ctl); - - DRM_DEBUG_KMS("activated FBC, pitch %d, yoff %d, plane %c\n", - cfb_pitch, crtc->base.y, plane_name(crtc->plane)); } static bool i8xx_fbc_is_active(struct drm_i915_private *dev_priv) @@ -207,8 +202,6 @@ static void g4x_fbc_activate(struct intel_crtc *crtc) /* enable it... */ I915_WRITE(DPFC_CONTROL, dpfc_ctl | DPFC_CTL_EN); - - DRM_DEBUG_KMS("activated fbc on plane %c\n", plane_name(crtc->plane)); } static void g4x_fbc_deactivate(struct drm_i915_private *dev_priv) @@ -222,8 +215,6 @@ static void g4x_fbc_deactivate(struct drm_i915_private *dev_priv) if (dpfc_ctl & DPFC_CTL_EN) { dpfc_ctl &= ~DPFC_CTL_EN; I915_WRITE(DPFC_CONTROL, dpfc_ctl); - - DRM_DEBUG_KMS("deactivated FBC\n"); } } @@ -283,8 +274,6 @@ static void ilk_fbc_activate(struct intel_crtc *crtc) } intel_fbc_recompress(dev_priv); - - DRM_DEBUG_KMS("activated fbc on plane %c\n", plane_name(crtc->plane)); } static void ilk_fbc_deactivate(struct drm_i915_private *dev_priv) @@ -298,8 +287,6 @@ static void ilk_fbc_deactivate(struct drm_i915_private *dev_priv) if (dpfc_ctl & DPFC_CTL_EN) { dpfc_ctl &= ~DPFC_CTL_EN; I915_WRITE(ILK_DPFC_CONTROL, dpfc_ctl); - - DRM_DEBUG_KMS("deactivated FBC\n"); } } @@ -362,8 +349,6 @@ static void gen7_fbc_activate(struct intel_crtc *crtc) I915_WRITE(DPFC_CPU_FENCE_OFFSET, get_crtc_fence_y_offset(crtc)); intel_fbc_recompress(dev_priv); - - DRM_DEBUG_KMS("activated fbc on plane %c\n", plane_name(crtc->plane)); } /**