From patchwork Mon Jun 8 21:04:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594023 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDC921392 for ; Mon, 8 Jun 2020 21:05:39 +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 9A9FB2076A for ; Mon, 8 Jun 2020 21:05:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="bgc6BHvC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A9FB2076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 33C656E59B; Mon, 8 Jun 2020 21:05:39 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by gabe.freedesktop.org (Postfix) with ESMTPS id 770D16E59B for ; Mon, 8 Jun 2020 21:05:37 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id w9so15957856qtv.3 for ; Mon, 08 Jun 2020 14:05:37 -0700 (PDT) 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; bh=EzthTjcENHrX3tITbBxwAqNbU6Xj4UipKRWTfNqnL+o=; b=bgc6BHvCUoJE1qdmgXsto7Z68feJbJp13cEXK0earcTUj+yjG6mWNGFv4eWC9f5rme gh6CIZHNFRuEC4BkJn1gYZRp9ltYcFiJxWyNqUDe44dZTFWcUtwXrXSWd7RG0VFken1R ahHX3yMVwTYYAr2lMlVbnaAeUvT8WBeTDpdOuBac1dEHikZCklphUDS4Iqz/4hvY3QYh BRrw+IYABTPGnY+s/JN6+qIexxlNPJWD8CC1k6YTRXH+6y9v+h2ytgTcZ1g6+oX1ne9O 0Z06Od9CauPVYFn+m2kA6SyDitLDb6VPpPj+c6/HemAanMCSn2n/EG0T62D6H6cV4qos DQqQ== 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; bh=EzthTjcENHrX3tITbBxwAqNbU6Xj4UipKRWTfNqnL+o=; b=nJnIceOqeH9pwAhWxuRn2G4k5JrbLaIEAupigZm6okrZ3Upkem9XgXqawlvAdFIQh2 WjtHi/Fb2WTA4uFuDc16jZBS1oYyJICBBVLupinDcAaij4tv54cWQczNNa7qRG9tzWN5 aJ6yccBS9QvrSoTL60odj9wZ/c3IOapD+tWyBXqvz2T1ZMTileQPZaL0D9AprqoCTD+D Cea367KqMcdyDZJOAXS7jkpuuOeC3rnZTucVKmNjBdm1A3ATL3TBsATr4HSfgEv4Jcm6 a5gJguaPs9QlrbKWGIW7FzPpEPpyQI5EJm4flDRq6bGXOzrMMJlMOtyvI0hwOfftG+aG S9jA== X-Gm-Message-State: AOAM531DhPNZ2Tt2T4HeCXGWPSv6+ee6uvHFrMHojJCgMFEU5MXGlvO2 H4bYKeedkw89qcURvJMUwZy1eQ== X-Google-Smtp-Source: ABdhPJz7OFpjGtNLCnywlgTFICvYLryTMF7ZufFlXArk5WTY8GEQ6QiPri1R0M/FCn4jm9pwFeQ1nw== X-Received: by 2002:aed:30cf:: with SMTP id 73mr7419561qtf.81.1591650335170; Mon, 08 Jun 2020 14:05:35 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id h202sm1934074qke.69.2020.06.08.14.05.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:34 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Date: Mon, 8 Jun 2020 17:04:53 -0400 Message-Id: <20200608210505.48519-4-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200608210505.48519-1-sean@poorly.run> References: <20200608210505.48519-1-sean@poorly.run> Subject: [Intel-gfx] [PATCH v5 03/13] drm/i915/utils: Replace dev_printk with drm helpers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, mripard@kernel.org, ppaalanen@gmail.com, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul Use drm logging helpers to add support for the upcoming tracefs implementation. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/i915/i915_utils.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_utils.c b/drivers/gpu/drm/i915/i915_utils.c index f42a9e9a0b4f..99499c0885cf 100644 --- a/drivers/gpu/drm/i915/i915_utils.c +++ b/drivers/gpu/drm/i915/i915_utils.c @@ -30,10 +30,9 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, vaf.va = &args; if (is_error) - dev_printk(level, kdev, "%pV", &vaf); + drm_dev_printk(kdev, level, "%pV", &vaf); else - dev_printk(level, kdev, "[" DRM_NAME ":%ps] %pV", - __builtin_return_address(0), &vaf); + drm_err(&dev_priv->drm, "%pV", &vaf); va_end(args); From patchwork Mon Jun 8 21:04:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594039 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F98C1392 for ; Mon, 8 Jun 2020 21:06:23 +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 4D15C2076A for ; Mon, 8 Jun 2020 21:06:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="NxkoXfcB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D15C2076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F14966E9A4; Mon, 8 Jun 2020 21:06:22 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A7786E9A4 for ; Mon, 8 Jun 2020 21:06:22 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id v79so18737236qkb.10 for ; Mon, 08 Jun 2020 14:06:22 -0700 (PDT) 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; bh=O6D84exwKsxe2WSxGQGQrNWpXYxDNFhQElFVl1cvEYs=; b=NxkoXfcBPMcvhKbulUwI8pBQCSiV6ihtRcVJerkvvzBFkBppMeit+exFy3nEDZCiLX lZsyu4nCREj83IYCS4piUQjousCSoq+ljC66qg6uu0XnqCj0Hh7kYiN0RxAXwudXnQEf Uqj8F53zKhODLqdXsbVOqy1Dz/4VVRJd6Vq0UC0sTTGbAzNNXD10/LKKP170rGRJ2MaY jAsNSfrp/K7JpTFrTP7vvuGZuVxpjv4R0v0iFofqYRjbkYnpi5fh62cAwDk0tIr9AcAB wDOxbPvoXcAV3u/z9iEHvxWUANe1BcoLIsqnCAuEJnCKHNCRk6WUGBycw39W9HasIsBe wWNw== 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; bh=O6D84exwKsxe2WSxGQGQrNWpXYxDNFhQElFVl1cvEYs=; b=BTQnKLy3xu+ol43ASk6e6IrgO5Vigybxq9F8YrzRe48lEiEUlRTxquj59lu4VFQ+4p P39h+VRqiQaQuxEUQc1LcNHmW+SWO806yU7xOPLwi/Ey/LxX1dMP49USQLb50nOj24cz gk4kiOW1m0FRoxVzr6XGHgmz6e/KYO8yXsZt7/+lqcMiho3azTtLWsCN5yM5paY5nl/3 Y7u1Fez4G1IxGLqXNmDzEC6T5xxCHjyAQvuVyi3WtM7Mn2k3uSHw6rg2EhWG7hQcXsxK AiKD40XB1RdQ1zhYYVNP2bboJTl4ECGvVcAWYsf9AKxK9U5CYXx0UwvQ9+lTIV3kyzgs h17A== X-Gm-Message-State: AOAM530WwTmoVg1jIauiddJDnyH1pqtNKc0/MmO0tNEgGtNkzAovFZ20 ShRlfTCkCkpG+XCztV2eba0ZlQ== X-Google-Smtp-Source: ABdhPJzX3A0L5qODtChF4jLNZwhd9JRoJY8tnw6Q6ZzZLXgAG1EKsgGjYoB+YlaeykRR9/TZAmhozQ== X-Received: by 2002:a37:607:: with SMTP id 7mr23386379qkg.385.1591650381467; Mon, 08 Jun 2020 14:06:21 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id r14sm8021776qke.62.2020.06.08.14.06.20 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:21 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Date: Mon, 8 Jun 2020 17:04:59 -0400 Message-Id: <20200608210505.48519-10-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200608210505.48519-1-sean@poorly.run> References: <20200608210505.48519-1-sean@poorly.run> Subject: [Intel-gfx] [PATCH v5 09/13] drm/i915: Change infoframe debug checks to specify syslog X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, mripard@kernel.org, ppaalanen@gmail.com, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul Since the logs protected by these checks specifically target syslog, use the new drm_debug_syslog_enabled() call to avoid triggering these prints when only trace is enabled. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/i915/display/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index b16aca0fe5f0..de449755d1e5 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -12876,7 +12876,7 @@ static void intel_dump_infoframe(struct drm_i915_private *dev_priv, const union hdmi_infoframe *frame) { - if (!drm_debug_enabled(DRM_UT_KMS)) + if (!drm_debug_syslog_enabled(DRM_UT_KMS)) return; hdmi_infoframe_log(KERN_DEBUG, dev_priv->drm.dev, frame); @@ -13519,7 +13519,7 @@ pipe_config_infoframe_mismatch(struct drm_i915_private *dev_priv, const union hdmi_infoframe *b) { if (fastset) { - if (!drm_debug_enabled(DRM_UT_KMS)) + if (!drm_debug_syslog_enabled(DRM_UT_KMS)) return; drm_dbg_kms(&dev_priv->drm, From patchwork Mon Jun 8 21:05:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF67A90 for ; Mon, 8 Jun 2020 21:06:45 +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 CD3E02076A for ; Mon, 8 Jun 2020 21:06:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="d5kLeBfa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD3E02076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 46D496E9A7; Mon, 8 Jun 2020 21:06:45 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF0AA6E9A7 for ; Mon, 8 Jun 2020 21:06:43 +0000 (UTC) Received: by mail-qv1-xf43.google.com with SMTP id g7so9059369qvx.11 for ; Mon, 08 Jun 2020 14:06:43 -0700 (PDT) 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; bh=vK6CsgCrPHEdxzOLTecsA2v3RFUx1hTjgc9vF8KhNkQ=; b=d5kLeBfarnu6yYGZYxmeHBh4U1jha1E1j0QCEdIS0MB+YBcOT5S+sah84ouuZnNT8R C93khKVrVvHEJWIlgAhBUFS4tbf4i2AIpspSiFBOWH+JEOsL4DohweBvrJ++hagV0PSh sLPyDrhTD1fceJW1WmM7GhcVXGm5DN6PlEsQF+5i006jhud8qLU834XbculVQLiwOHtO 4nFch/pkB9RcjyG9W2tBMGYTPckOYNcJX/sTKQvdoDV+3Oo6Fus6l5JaqptjJYIcZbro DJstcFkm+xgTm0ecirou98fYllh6DO2+h27/wbcYDx1NX/h21ctDQ0TK45e1CSoyCAvP zLMw== 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; bh=vK6CsgCrPHEdxzOLTecsA2v3RFUx1hTjgc9vF8KhNkQ=; b=mHNzr/C4dh68qq1iv8Oyn73bPXYoQpzs12lYkJFpQzEZpGgQqnS65AdF9nkQgIAq+r jGeeoF6JNUbHkUsm6kDq1lmAxGCh+xG8qvUFZB/9w1NxtFyuDB9GvjESESpgng/cM1kC JXqVsIROU/W5paXM3HCoXRywRkj2ptaaqbqsDVLYHlBZ3NMeoffPNhFSi9rM1YsYcL3T fUYyVPfZ205UZlGTEaOQs7GiBblqvR/TXhIitlhAYtxkUTzbNquPC/UKARWT7ACDmQmp hmtuv65RL5Hs8eoY5kayrtlm7oIRuJHDTKQqSQxy9UISaJybhtxaM6O6fQgFlFDEyFsV 56Kw== X-Gm-Message-State: AOAM5316RinrWpLwlcE52x/fTxeCXoR4zg7uy/Epf+1/AkiZSXkeJUc7 0rM3BF93CjA1OfEvt0qneDV3cA== X-Google-Smtp-Source: ABdhPJz9/VH9gRs0AdWzddxBIXI4MNW/WdezC6uBbNQVurjfE/e8MZjyvCPHby3/INgPxdvFMUr3kA== X-Received: by 2002:ad4:56b2:: with SMTP id bd18mr586065qvb.209.1591650403175; Mon, 08 Jun 2020 14:06:43 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id b189sm8143592qkg.110.2020.06.08.14.06.42 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:42 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Date: Mon, 8 Jun 2020 17:05:02 -0400 Message-Id: <20200608210505.48519-13-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200608210505.48519-1-sean@poorly.run> References: <20200608210505.48519-1-sean@poorly.run> Subject: [Intel-gfx] [PATCH v5 12/13] drm/i915: Use debug category printer for welcome message X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, mripard@kernel.org, ppaalanen@gmail.com, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul The welcome printer is meant to be gated on DRM_UT_DRIVER, so use the debug category printer to avoid dumping the message in the wrong place. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/i915/i915_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 34ee12f3f02d..966212805ef7 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -876,7 +876,8 @@ static void i915_driver_unregister(struct drm_i915_private *dev_priv) static void i915_welcome_messages(struct drm_i915_private *dev_priv) { if (drm_debug_enabled(DRM_UT_DRIVER)) { - struct drm_printer p = drm_debug_printer("i915 device info:"); + struct drm_printer p = drm_debug_category_printer(DRM_UT_DRIVER, + "i915 device info:"); drm_printf(&p, "pciid=0x%04x rev=0x%02x platform=%s (subplatform=0x%x) gen=%i\n", INTEL_DEVID(dev_priv),