From patchwork Thu Nov 17 10:00:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9433777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C87AF60238 for ; Thu, 17 Nov 2016 10:00:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B721B291EE for ; Thu, 17 Nov 2016 10:00:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A8AC8293AD; Thu, 17 Nov 2016 10:00:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9308C291EE for ; Thu, 17 Nov 2016 10:00:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8982E6E282; Thu, 17 Nov 2016 10:00:16 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id CFD026E282 for ; Thu, 17 Nov 2016 10:00:14 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id a20so19610645wme.2 for ; Thu, 17 Nov 2016 02:00:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=StL9Xfwpp/gUejGBSVFAf9pkc8TzTFSUQgSwr+cOAbI=; b=aKAADnOK0mmUkp6k5tr52jdou6c2YL85Bs75R+lpnIj3ym0zhCcPT245BcMy8rmhpW pYHk5c4saaHEAX/gvgMRBuP5tNpBOIDkvnDqrWi9Ud003cyxtUKgrxwFSmbI/4MbiU2j c4SHAbFqXDHE8J3HLSedaqlh2VhWN+kFxIGhrRKlYVINeN2/JvZ4Ct9DmN99SHj7Hl3c IB9HSGJuhDwZtXhKUWlQrZQLGDill2FzF92f2zuM4zapxItBimRC//OrFNfvZsb5sbCM QY5uJWaIj7Br6qI76Piibe89xhE8qjymVERi+ZLE89mI/gp3hQb5yQRTyNf4Www2KikM LE8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=StL9Xfwpp/gUejGBSVFAf9pkc8TzTFSUQgSwr+cOAbI=; b=cJKbtwiauw8WWZOhmltWo+HIudh1wQ1ivZ+utlB8CSZvLoAcxgghnuc81xLeaf2dpo 2SjltXeiEHBZQD3Lt/R3DDRZpUir4cKUhD8jz2chUIHZfiznWJo/1cKaB86pqyjGJHZu 4FPJHto2cnTZxYaDYdQAtU4BoaIokYe6oT3jb6sxCuB+25z2emB/e7J/TPvHPmOnGYQ5 JD87Ys1d8XCTgMEiczIsS2BEvLGwrO8K8Bh0f7DoFrEpSjr4Gnt1UCKDawfNeEviJy/J Pm8jwBPqV7Hdm9l9qnDnQVZtce5quqRb+KaGHl4HAfg+3HZjhWS9wCLvG43ezOCwhPYT BqWw== X-Gm-Message-State: ABUngveP79JXJdEjt+qDWEL+8DxcsPvRzPRck3O6vqa3QcWgRi50jLLuA0YGOrC7TaXHVw== X-Received: by 10.28.126.11 with SMTP id z11mr16544834wmc.87.1479376813212; Thu, 17 Nov 2016 02:00:13 -0800 (PST) Received: from t460p.Home ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id 138sm2827093wms.20.2016.11.17.02.00.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 02:00:12 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 17 Nov 2016 10:00:05 +0000 Message-Id: <1479376805-5087-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 Subject: [Intel-gfx] [PATCH] drm/i915: Make scaler updates less chatty X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin It looks to me skl_update_scaler will already log interesting debug messages when the state transitions or there is an error. In this case it feels we can remove the two unconditional debug messages which happen immediately before calling skl_update_scaler. This way we get rid of the sole debug message when switching virtual terminals for example. Signed-off-by: Tvrtko Ursulin Reviewed-by: Paulo Zanoni Reviewed-by: Maarten Lankhorst --- drivers/gpu/drm/i915/intel_display.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2ebb8b833395..cd5256c0b2d6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4727,13 +4727,8 @@ skl_update_scaler(struct intel_crtc_state *crtc_state, bool force_detach, */ int skl_update_scaler_crtc(struct intel_crtc_state *state) { - struct intel_crtc *intel_crtc = to_intel_crtc(state->base.crtc); const struct drm_display_mode *adjusted_mode = &state->base.adjusted_mode; - DRM_DEBUG_KMS("Updating scaler for [CRTC:%d:%s] scaler_user index %u.%u\n", - intel_crtc->base.base.id, intel_crtc->base.name, - intel_crtc->pipe, SKL_CRTC_INDEX); - return skl_update_scaler(state, !state->base.active, SKL_CRTC_INDEX, &state->scaler_state.scaler_id, DRM_ROTATE_0, state->pipe_src_w, state->pipe_src_h, @@ -4754,7 +4749,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, struct intel_plane_state *plane_state) { - struct intel_crtc *intel_crtc = to_intel_crtc(crtc_state->base.crtc); struct intel_plane *intel_plane = to_intel_plane(plane_state->base.plane); struct drm_framebuffer *fb = plane_state->base.fb; @@ -4762,10 +4756,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state, bool force_detach = !fb || !plane_state->base.visible; - DRM_DEBUG_KMS("Updating scaler for [PLANE:%d:%s] scaler_user index %u.%u\n", - intel_plane->base.base.id, intel_plane->base.name, - intel_crtc->pipe, drm_plane_index(&intel_plane->base)); - ret = skl_update_scaler(crtc_state, force_detach, drm_plane_index(&intel_plane->base), &plane_state->scaler_id,