From patchwork Wed Mar 10 21:47:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12129491 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B22C6C433E0 for ; Wed, 10 Mar 2021 21:48:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3795164F58 for ; Wed, 10 Mar 2021 21:48:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3795164F58 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9085D6E16D; Wed, 10 Mar 2021 21:48:52 +0000 (UTC) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) by gabe.freedesktop.org (Postfix) with ESMTPS id B8CE06E16D for ; Wed, 10 Mar 2021 21:48:51 +0000 (UTC) Received: by mail-qt1-x836.google.com with SMTP id 18so14317216qty.3 for ; Wed, 10 Mar 2021 13:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4M0snmyFx3hntMnqGoLjjCIdkC5MkJRcZ5aksVvCkcs=; b=A058PlQjS8f+i8KgiZvSCdvzp+QM7sPi1eemy7DArrEpjqqW1X/jOjfqIDfdbN8DTk YQ5+yx/C2ecIGPeAdNZntmf4uAaJTz9TbMlIBE/3ymyS5AMZMXRPKqqt0O8cDoDIV6NG T2xsBwgIYc3t9PIrJiZ5f9McK+bYNl0zs3Hhx8JkdU/xpsUdHqAfvGZdStUh+GOLTehp K4wi4VwavZxAJKsGpyeP0xrnGr/jpU5iZxreJDmLoYanGhWoAXG0YoiGUlSa5eeqbTqc QYxLajJs7U0c8ahKJ+yTRPoaVoDe7+MMpsMC1jMdHpBJNJeBWD22jfp48KmCBDR/B/rX rG4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4M0snmyFx3hntMnqGoLjjCIdkC5MkJRcZ5aksVvCkcs=; b=e/npR6k9XaZd3xjJGDHVpOcEv+fffbBOIwWE5htF2HOu0SSliZ6E31eEp3KLVUZfEd Fb7E1HSBs1aiBpOcCOl/5zzRjGfRIHwk9eJYy7LsaRfbg9rnRUf2ixtPUYM2mpFplG6z 1srPydGTdek5LQoUeevqZzKMoEGJCAKK2EK4BckjmGy67P7kpK/NXnyV3eP0Uj0a1ttW 50nHRxEhB++s2wXml5RgDViDVIjguni73Ia9FHo6LTVU9NRJf09QO0RgS0yYeh/4euqv QEjdVdeOQQ0+Mth5sDStbb9g1wXMj/qpzZLlCWYSGufiJ+oEvvUyjH9n5gl56xMb8mit ssUA== X-Gm-Message-State: AOAM5328hRnsPs2dLTmsZWYa/pX68VIvIah33fUtmZjbzzcl3f6YPBQT i/WLfZlqkzbL8FIkpx/ZcR6NSA== X-Google-Smtp-Source: ABdhPJyHY89MsBP5lyi4K4qxKFlHW+zevtUyAzkwMzPyPaWqSKFasX65M7E8uIZXZyDYY7CWqrUKBA== X-Received: by 2002:ac8:1413:: with SMTP id k19mr4627017qtj.379.1615412930888; Wed, 10 Mar 2021 13:48:50 -0800 (PST) Received: from localhost ([172.58.155.143]) by smtp.gmail.com with ESMTPSA id s19sm456801qks.130.2021.03.10.13.48.50 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Mar 2021 13:48:50 -0800 (PST) From: Sean Paul To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/i915/dp_link_training: Add newlines to debug messages Date: Wed, 10 Mar 2021 16:47:56 -0500 Message-Id: <20210310214845.29021-1-sean@poorly.run> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul , Rodrigo Vivi Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul This patch adds some newlines which are missing from debug messages. This will prevent logs from being stacked up in dmesg. Signed-off-by: Sean Paul Reviewed-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp_link_training.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index 892d7db7d94f..ad02d493ec16 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -29,7 +29,7 @@ static void intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE]) { - DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x", + DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n", link_status[0], link_status[1], link_status[2], link_status[3], link_status[4], link_status[5]); } @@ -731,7 +731,7 @@ intel_dp_link_train_phy(struct intel_dp *intel_dp, out: drm_dbg_kms(&dp_to_i915(intel_dp)->drm, - "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s", + "[CONNECTOR:%d:%s] Link Training %s at link rate = %d, lane count = %d, at %s\n", intel_connector->base.base.id, intel_connector->base.name, ret ? "passed" : "failed", From patchwork Wed Mar 10 21:47:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 12129493 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F2A3C433E9 for ; Wed, 10 Mar 2021 21:49:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 00E5C64E4B for ; Wed, 10 Mar 2021 21:49:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 00E5C64E4B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CA136EA6C; Wed, 10 Mar 2021 21:49:08 +0000 (UTC) Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by gabe.freedesktop.org (Postfix) with ESMTPS id A40B46E3AC for ; Wed, 10 Mar 2021 21:49:06 +0000 (UTC) Received: by mail-qv1-xf36.google.com with SMTP id a14so1597745qvj.7 for ; Wed, 10 Mar 2021 13:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QEd5AsA5xg18eVkLGLl1ZQeCR2oZqmgoHrlt2YFADVM=; b=TSm1Aof5H44JIYwWrR5poEzpmEUdulZ0a0a+yJfZJv0fnNS8/uW1B6RJWyiXYGHj0P 4kA5j0l62xNPC5ghGmVMoTZI9GJOoj0bsaLucnlV1UXcRt2h9uxREgwW1quyj2EnWa4j UGuOrR7NeMHXxim7do+7QPgGxs5IGC7PgsnfffbuZhymIYDFPkAmQi4wU5VfbUftKvIL GebztBkmh2rFMtLsm/g5uptsQW5vVlky6d2Kl216jhW0PFlu1NUCeT0E7nA9H5FDhUgd oWAm70QgbyNa0wPc49RHx7xd5hBG4+8AG4KHm7pnkjtZeFknGTG9DKk/YbaY3cEUfQLU 3U3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QEd5AsA5xg18eVkLGLl1ZQeCR2oZqmgoHrlt2YFADVM=; b=CIUEISoTFn2gKO80EVFrMTTl0Em/4zPjFH38ONZvgtuiRZ4tPOCuYKLy2pf+uQ0QqS 5vHmCLvj3cqOUWjlCzgJ2CWEaVrSQ6ypO9jX8QQsqbuPQFB25/1SgIfb0S0rHTilS3fW ElOVpSDROrjLXB+jjFTIyqjUPYH2O/0aiibT4yHiH45pJ+t/c4NFsUL4DC+2vNvewVrq 3SPwR60l7k6TicFNg9r9Fxqx/xD2zpeyoBqDfZm6jJ48UvXHnXjkl2rU6BfgPq4Vm5Zm cVtr4KqdZTmx1/QQ53hxa2b+tS8tVt62miGe0jgB+X2Fk16UJaNMAyWi+XbvyrkbBewj 3HDw== X-Gm-Message-State: AOAM5300H0Z9YgfG8Ai+rIuuVwHTXcLk1aBDA/gZQ1ZvTvtav9nxomg9 jTQbS72yKq7rzfVV/MYa6zSluQ== X-Google-Smtp-Source: ABdhPJzQXO4kE3VQdkvVOwo/o1DDoChi4gZkl7dHDwEGtnHOUlIMQD16l7a194B1N1dIXu+9uvDo/Q== X-Received: by 2002:a05:6214:2464:: with SMTP id im4mr4873762qvb.61.1615412945747; Wed, 10 Mar 2021 13:49:05 -0800 (PST) Received: from localhost ([172.58.155.143]) by smtp.gmail.com with ESMTPSA id c125sm482464qke.117.2021.03.10.13.49.05 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 10 Mar 2021 13:49:05 -0800 (PST) From: Sean Paul To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/i915/dp_link_training: Convert DRM_DEBUG_KMS to drm_dbg_kms Date: Wed, 10 Mar 2021 16:47:57 -0500 Message-Id: <20210310214845.29021-2-sean@poorly.run> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210310214845.29021-1-sean@poorly.run> References: <20210310214845.29021-1-sean@poorly.run> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sean Paul , Rodrigo Vivi Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul One instance of DRM_DEBUG_KMS was leftover in dp_link_training, convert it to the new shiny. Signed-off-by: Sean Paul Reviewed-by: Ville Syrjälä --- .../gpu/drm/i915/display/intel_dp_link_training.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_link_training.c b/drivers/gpu/drm/i915/display/intel_dp_link_training.c index ad02d493ec16..19ba7c7cbaab 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_link_training.c +++ b/drivers/gpu/drm/i915/display/intel_dp_link_training.c @@ -26,12 +26,13 @@ #include "intel_dp_link_training.h" static void -intel_dp_dump_link_status(const u8 link_status[DP_LINK_STATUS_SIZE]) +intel_dp_dump_link_status(struct drm_device *drm, + const u8 link_status[DP_LINK_STATUS_SIZE]) { - - DRM_DEBUG_KMS("ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n", - link_status[0], link_status[1], link_status[2], - link_status[3], link_status[4], link_status[5]); + drm_dbg_kms(drm, + "ln0_1:0x%x ln2_3:0x%x align:0x%x sink:0x%x adj_req0_1:0x%x adj_req2_3:0x%x\n", + link_status[0], link_status[1], link_status[2], + link_status[3], link_status[4], link_status[5]); } static void intel_dp_reset_lttpr_count(struct intel_dp *intel_dp) @@ -642,7 +643,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp, /* Make sure clock is still ok */ if (!drm_dp_clock_recovery_ok(link_status, crtc_state->lane_count)) { - intel_dp_dump_link_status(link_status); + intel_dp_dump_link_status(&i915->drm, link_status); drm_dbg_kms(&i915->drm, "Clock recovery check failed, cannot " "continue channel equalization\n"); @@ -669,7 +670,7 @@ intel_dp_link_training_channel_equalization(struct intel_dp *intel_dp, /* Try 5 times, else fail and try at lower BW */ if (tries == 5) { - intel_dp_dump_link_status(link_status); + intel_dp_dump_link_status(&i915->drm, link_status); drm_dbg_kms(&i915->drm, "Channel equalization failed 5 times\n"); }