From patchwork Thu Nov 17 12:30:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 9434205 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 5078B6047D for ; Thu, 17 Nov 2016 12:30:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4276B29448 for ; Thu, 17 Nov 2016 12:30:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 372552947F; Thu, 17 Nov 2016 12:30:35 +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 EB62729448 for ; Thu, 17 Nov 2016 12:30:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 061696E7E0; Thu, 17 Nov 2016 12:30:33 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 228B06E7D9 for ; Thu, 17 Nov 2016 12:30:29 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id g23so20894380wme.1 for ; Thu, 17 Nov 2016 04:30:29 -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:in-reply-to:references; bh=r99CZ97VNhS/xmKNfr4fpog0ametMlrKjT0lCjoA+jQ=; b=E1e691g6zQOU1n6WYXmRjGwlDONfDjxmEihGiSntv1NdgDhwK+xiN65Jmz3+9jaEPJ f5hA9mE/i54xijRKTtrZIMeBn2ZA9Iw5ZVsFBDw0mIRLHtRrIPjYl/0x0Fg77urTi85l 0dZwT45tWoFJ77FFhCc6onsViPZhG84sbWhxZayNQkIFxXtxjZ7oPzQgI8BEWwJp8Peq bmz+uoptVWNiPoK0mGdYMbp3rPCcJc+9zkIksLNGPn5mQZT2b8P9X8Nirzs1CecVwVSo BgldSzwj3Jl5K/qxa7o/n7Gr2oiz1KJoayJ8K/bPiMsnKLpjMxCO9s88+ekApY90XvWG KBGA== 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:in-reply-to :references; bh=r99CZ97VNhS/xmKNfr4fpog0ametMlrKjT0lCjoA+jQ=; b=Z+ZQyMhiVLykdnM84ad+lE2OUMhyXMNYqk0ZQwyuYWehKw9M9EtmdwD9043U37CzkA pqgezllxeZWHrVt8Lvl275iCnGTlfmr2svCXtcsbQonksms2A4ebr9gC9e3EWU4ZHzHu jYC6UDnB7Feb/Vz3G5iE7fzAej+2Nnpu5tGtPcmksztliW55TvRjMdgoZcZHjO/+WQQo kvd1hOBAzewT+7S6I6kTi6kl/glZsqILsJuXJIoWCGauKkWGA/fvOUzmv99Sz+ZXvVY9 nNdkwm7PpC5/bMCzhJid/aHZngukRCIbNHvrU5WKkqAaYPBpqBfkUU6QTz/KQAZi3Mad 26MQ== X-Gm-Message-State: ABUngvff7G3xZ7w9DDJHYPdzWbrktOTP5/KZvMpEt13YySVkfBn+vl+1kSV2U5KH1FskDw== X-Received: by 10.28.138.135 with SMTP id m129mr3693929wmd.36.1479385827399; Thu, 17 Nov 2016 04:30:27 -0800 (PST) Received: from t460p.Home ([2a02:c7d:9bd6:b000:f37e:1e07:a7d8:46cd]) by smtp.gmail.com with ESMTPSA id vr9sm3014995wjc.35.2016.11.17.04.30.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 04:30:27 -0800 (PST) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Thu, 17 Nov 2016 12:30:09 +0000 Message-Id: <1479385814-2358-3-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479385814-2358-1-git-send-email-tvrtko.ursulin@linux.intel.com> References: <1479385814-2358-1-git-send-email-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 2/7] drm/i915: Dump FDI config only where applicable 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 Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2fbc18081f81..1932d1eed52f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12735,10 +12735,10 @@ static void intel_dump_crtc_timings(const struct drm_display_mode *mode) static inline void intel_dump_m_n_config(struct intel_crtc_state *pipe_config, char *id, - struct intel_link_m_n *m_n) + unsigned int lane_count, struct intel_link_m_n *m_n) { - DRM_DEBUG_KMS("dp: lanes: %i; %s: gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n", - pipe_config->lane_count, id, + DRM_DEBUG_KMS("%s: lanes: %i; gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n", + id, lane_count, m_n->gmch_m, m_n->gmch_n, m_n->link_m, m_n->link_n, m_n->tu); } @@ -12761,18 +12761,18 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder)); DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n", pipe_config->pipe_bpp, pipe_config->dither); - DRM_DEBUG_KMS("fdi/pch: %i, lanes: %i, gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n", - pipe_config->has_pch_encoder, - pipe_config->fdi_lanes, - pipe_config->fdi_m_n.gmch_m, pipe_config->fdi_m_n.gmch_n, - pipe_config->fdi_m_n.link_m, pipe_config->fdi_m_n.link_n, - pipe_config->fdi_m_n.tu); + + if (pipe_config->has_pch_encoder) + intel_dump_m_n_config(pipe_config, "fdi", + pipe_config->fdi_lanes, + &pipe_config->fdi_m_n); if (intel_crtc_has_dp_encoder(pipe_config)) { - intel_dump_m_n_config(pipe_config, "m_n", - &pipe_config->dp_m_n); - intel_dump_m_n_config(pipe_config, "m2_n2", - &pipe_config->dp_m2_n2); + intel_dump_m_n_config(pipe_config, "dp m_n", + pipe_config->lane_count, &pipe_config->dp_m_n); + intel_dump_m_n_config(pipe_config, "dp m2_n2", + pipe_config->lane_count, + &pipe_config->dp_m2_n2); } DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",