From patchwork Fri Nov 18 11:40:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9436291 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 C254E6047D for ; Fri, 18 Nov 2016 11:40:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92F2529890 for ; Fri, 18 Nov 2016 11:40:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 856A129894; Fri, 18 Nov 2016 11:40:24 +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 8AF5B29890 for ; Fri, 18 Nov 2016 11:40:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 376E96E952; Fri, 18 Nov 2016 11:40:23 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6FC766E952 for ; Fri, 18 Nov 2016 11:40:21 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id u144so5318353wmu.0 for ; Fri, 18 Nov 2016 03:40:21 -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:mime-version :content-transfer-encoding; bh=LdUG0tz2B3vLv9N2YRK0O75hprROibukzX67jPaZqr8=; b=aN8SHOaTfdc+gn87xZhtxORaqMOt81bV/iqkimVj2L5jOIynNdZS+Svcs7s0YnctNv /DB9M/X85R1rvtSl2UyP6rbQ7gB6YR5JL0eTSegmIwx/uEUTaQRsLvGCiTW3s/ShQYMr fa3mc2rHTyIRfulTBDh3iHaTnoPyz+uMKcNgP8TExV1K4TOYvjtZY4AApgjZ42mSsTyg Dm9Bg7IUXuzrT2f+OcAPxA/jm9Oebgk+8z8BQCzo3G+ht2SbOCrg5F4YaK8X/NtIE6+7 N1Y8t/8dovrwOEO2GXUoKGAzfMuAROZZ0/DCXd/IXV4PnI5PysMcs5Cts7qVKnogLTEJ 2AJg== 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:mime-version :content-transfer-encoding; bh=LdUG0tz2B3vLv9N2YRK0O75hprROibukzX67jPaZqr8=; b=CtzyO7HXpFlpOL8o6BtKxm9Xm0+uhCW8Fp/1jJpRkQRC1RpWpG+9eQ/JtsVu6k/Vs4 3y0k1X0mZdgaxa+sXOTAlosjTqO4nrkCnk1QjpDfS+bbuDGW/krmd3RT0rJaJFdmUqB7 xeRY5OJJpmyk1Jjjs97vrrf+6zLAu/74hbIBKLZ2z8RJlSrPBLDx8fs5Bb50Mhb4UWg4 1lAYQa8YPLJu5lQsL6DWDNWNc1ifv9qgzkIvBMb2oJJVYKH1N3+wRl/HVddeQfCTwQjZ WHk614CJP0bBTwDqjRuRTuLg13Dlq274s2tEcVTWF9T4kRhz16g4UdxfZ2AaVBWQ2LNa sk2w== X-Gm-Message-State: ABUngvcZ9lUxDFGrYK6xkE5xUamVoej1KD9SvVDwiGAB93YiyZ/mj8jSFhocFxv/tFE/GQ== X-Received: by 10.28.35.14 with SMTP id j14mr21410752wmj.24.1479469220024; Fri, 18 Nov 2016 03:40:20 -0800 (PST) Received: from t460p.intel ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id v2sm8383150wja.41.2016.11.18.03.40.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Nov 2016 03:40:19 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Fri, 18 Nov 2016 11:40:14 +0000 Message-Id: <1479469214-24714-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Do not log disabled planes in pipe config 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin It just says "plane X disabled" which does not seem very useful. Signed-off-by: Tvrtko Ursulin Cc: Maarten Lankhorst Cc: Ville Syrjälä --- drivers/gpu/drm/i915/intel_display.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 155910c93896..d35ffb40ca67 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12732,9 +12732,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); struct drm_plane *plane; - struct intel_plane *intel_plane; - struct intel_plane_state *state; - struct drm_framebuffer *fb; + bool planes = false; DRM_DEBUG_KMS("[CRTC:%d:%s]%s\n", crtc->base.base.id, crtc->base.name, context); @@ -12822,19 +12820,19 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, pipe_config->dpll_hw_state.fp1); } - DRM_DEBUG_KMS("planes on this crtc\n"); list_for_each_entry(plane, &dev->mode_config.plane_list, head) { + struct intel_plane *intel_plane = to_intel_plane(plane); + struct intel_plane_state *state = + to_intel_plane_state(plane->state); + struct drm_framebuffer *fb = state->base.fb; struct drm_format_name_buf format_name; - intel_plane = to_intel_plane(plane); - if (intel_plane->pipe != crtc->pipe) - continue; - state = to_intel_plane_state(plane->state); - fb = state->base.fb; - if (!fb) { - DRM_DEBUG_KMS("[PLANE:%d:%s] disabled, scaler_id = %d\n", - plane->base.id, plane->name, state->scaler_id); + if (intel_plane->pipe != crtc->pipe || !fb) continue; + + if (!planes) { + DRM_DEBUG_KMS("Planes on this crtc:\n"); + planes = true; } DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d, fb = %ux%u format = %s\n",