From patchwork Mon Jun 8 21:04:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594019 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 0FB181392 for ; Mon, 8 Jun 2020 21:05: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 E138A2074B for ; Mon, 8 Jun 2020 21:05:22 +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="CfZbfsiK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E138A2074B 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 9CF7A89E38; Mon, 8 Jun 2020 21:05:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0F76989E11 for ; Mon, 8 Jun 2020 21:05:20 +0000 (UTC) Received: by mail-qv1-xf44.google.com with SMTP id g11so2598886qvs.2 for ; Mon, 08 Jun 2020 14:05:20 -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=fSV0plHNICcey+d5PgbYTWUOPiO4OxuQOOITA9OIC4I=; b=CfZbfsiKXW3Hdu2U8BpaMFpjWqFWpJcgn8dGQJHpZO3HctotL+Z6CsEvT3lSmm2AkI +NmBMJJ9SyXTYRc6YIkGrf8FzWye54+0yaB05AVON9xyfidZFGB47NAGal64vLGoIg7m Usv7kxERMeYWXKPC1zkz5uTFr+OhPuuc22fqOjZ7VPMYZn4cRHKM4qO15BMuupp/8NYr Dm3wTdKahs4py/+BFOqhblqAQWMcgf+4wvBfTZxcLzT68XGvHHlix05sFafQ0DHqGn/G ypmeEFuPOE/i8CJ2LnbHO3dfstUrh9Cp0eQB0gDVSbEL6P/O+uSHfRaN2dTVcyKv1Gi0 I36g== 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=fSV0plHNICcey+d5PgbYTWUOPiO4OxuQOOITA9OIC4I=; b=a1/nxAz0oacJywC+1I+krCHnwHH3kud7dc2b7cZbYKG2LrC91wWC4lFbhjxn/0RfG7 8EUxjBC7boGWBcyVaPRa5r55RjLauZSTcZzwblFaY7ealAuG+kqKV9Qwa//2xWdN1XoR ovUo4uCpECrhGhg1pU9V9jRUR2lYedv5yoiCLDd2ypgo5765FEPzQ0OsVn4FpurXnm7a Xi9k2Zn3Xnr9UsgRWedHP9wz+xk0alNCNIEYX2x3IcTJI8rAop/ggxOhsXnCskUNmK6X O+h4e3d9cOPPKBw+GXhFWXxI6B1OXLicFfTmlHHcobzFC3jiixzQ+XQx8nj75Y1NBbjd mung== X-Gm-Message-State: AOAM5327XcTJ+xBKeZB4V27RqKuf5kwHnhaw3xDoSMDFkERT85tHMOqW CB2/cmkbqbqlmNu9LXysU2IjJdc/nks= X-Google-Smtp-Source: ABdhPJx7bpLerv0Ttkg4fz3fi3Cfj/4s6rnupNIU94+71vBIrg0FScv5JSA9QCjPVQiAiJdnj5h2Ow== X-Received: by 2002:a0c:ed26:: with SMTP id u6mr591369qvq.141.1591650318988; Mon, 08 Jun 2020 14:05:18 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id i3sm8071302qkf.39.2020.06.08.14.05.18 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:18 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 01/13] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Date: Mon, 8 Jun 2020 17:04:51 -0400 Message-Id: <20200608210505.48519-2-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul Use the drm logging helpers to output these messages to ensure they'll be included by the drm tracefs instance. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/drm_mipi_dbi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index fd8d672972a9..ff6f83eeee09 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -769,9 +769,7 @@ static int mipi_dbi_spi1e_transfer(struct mipi_dbi *dbi, int dc, int i, ret; u8 *dst; - if (drm_debug_enabled(DRM_UT_DRIVER)) - pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n", - __func__, dc, max_chunk); + DRM_DEBUG_DRIVER("dc=%d, max_chunk=%zu, transfers:\n", dc, max_chunk); tr.speed_hz = mipi_dbi_spi_cmd_max_speed(spi, len); spi_message_init_with_transfers(&m, &tr, 1); @@ -893,9 +891,7 @@ static int mipi_dbi_spi1_transfer(struct mipi_dbi *dbi, int dc, max_chunk = dbi->tx_buf9_len; dst16 = dbi->tx_buf9; - if (drm_debug_enabled(DRM_UT_DRIVER)) - pr_debug("[drm:%s] dc=%d, max_chunk=%zu, transfers:\n", - __func__, dc, max_chunk); + DRM_DEBUG_DRIVER("dc=%d, max_chunk=%zu, transfers:\n", dc, max_chunk); max_chunk = min(max_chunk / 2, len); From patchwork Mon Jun 8 21:04:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594021 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 76BC8912 for ; Mon, 8 Jun 2020 21:05:30 +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 53E502074B for ; Mon, 8 Jun 2020 21:05:30 +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="LPi1Tnb+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 53E502074B 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 784E089E8C; Mon, 8 Jun 2020 21:05:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf41.google.com (mail-qv1-xf41.google.com [IPv6:2607:f8b0:4864:20::f41]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF8DF89E8C for ; Mon, 8 Jun 2020 21:05:27 +0000 (UTC) Received: by mail-qv1-xf41.google.com with SMTP id di13so3000329qvb.12 for ; Mon, 08 Jun 2020 14:05:27 -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=8sO4DzLJZcIOyysAN3LNUsftaBtZy4KrwHzJTDHCkzE=; b=LPi1Tnb+Zlp85KbxR3x6qxZtwNu5FBIcDDCON8i7wR0+y7lYbMPwkzCiVpLQcmz65H L1busLA7JcheWn5zU1cbkNaR0MQ2Py5wufACz/69umTEU3l1Yp1eyk+d10lTNbiX3KLF 1a7lD5YLHAfpVYOOTvkAP7QFzNylSHJ0ZHSwPfJRwh3LeeAOz5O0uVNVbn5H7qhuKEJG 7nAZGtt2ZysUWvJhHz7/cmKDXTB6+XAzWm5OwzbUlwwMz1M0JZONrF2JTx6mslMEcv5Q iXIo35nGqLffM6JLMhNqHQEXvXdduwN4cfI/5MdKwQOMHNF/f1Bw+7+QFS0xu6566aBf cttA== 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=8sO4DzLJZcIOyysAN3LNUsftaBtZy4KrwHzJTDHCkzE=; b=FepPLVR5UM5YXLofV80gMw1w+rcVmHGCrtiRXkrgFmmxxVn0Dj8/hbtHtesSCS0tX8 uK/gvYcBkgjMru/cDqNNCFQZzGJeLMfAGOJqVsuGUlVRJV5O4cKU/NmRnuiCjW3v3iiH NKxrChLqeMLkwRAOSxGhBT5iUiIaKHoUwGWlK/DiWeroSkIpZXKpLsCrh0GLCILP++OA 8WFwTP/4CGcjvJoE5GzEP9Qp7DH3Rm+4zJ7EoRmPt85pOoczDSFg2mvGAzlPMGhr3ZCg sWQJ3aFKe91PoqFS73NDH/PWA1J6bW4Tm2RtgleDiQRGhF4SUhsX4tBzDQ/dEP+0EvAZ FZ1w== X-Gm-Message-State: AOAM533rsct74LYmjSKH08YuowiHslnLCjV5T8Xa/VHodIBBTPZTuMzi DlOTzkqnB1dVw0b/m68weFPjeUCmp20= X-Google-Smtp-Source: ABdhPJxG9dA9AObQzNQodbPMS6C/SRodPgyNpfbDZB1+Kyy1f6EcvTOPAE15DHiqLLQ+OrW+pyt5Ww== X-Received: by 2002:a0c:e385:: with SMTP id a5mr646989qvl.218.1591650326935; Mon, 08 Jun 2020 14:05:26 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id b24sm3958798qkj.0.2020.06.08.14.05.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:26 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 02/13] drm/sil164: Convert dev_printk to drm_dev_dbg Date: Mon, 8 Jun 2020 17:04:52 -0400 Message-Id: <20200608210505.48519-3-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul Use the drm debug helper instead of dev_printk in order to leverage the upcoming tracefs support Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/i2c/sil164_drv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i2c/sil164_drv.c b/drivers/gpu/drm/i2c/sil164_drv.c index 741886b54419..b315a789fca2 100644 --- a/drivers/gpu/drm/i2c/sil164_drv.c +++ b/drivers/gpu/drm/i2c/sil164_drv.c @@ -43,11 +43,6 @@ struct sil164_priv { #define to_sil164_priv(x) \ ((struct sil164_priv *)to_encoder_slave(x)->slave_priv) -#define sil164_dbg(client, format, ...) do { \ - if (drm_debug_enabled(DRM_UT_KMS)) \ - dev_printk(KERN_DEBUG, &client->dev, \ - "%s: " format, __func__, ## __VA_ARGS__); \ - } while (0) #define sil164_info(client, format, ...) \ dev_info(&client->dev, format, __VA_ARGS__) #define sil164_err(client, format, ...) \ @@ -359,8 +354,8 @@ sil164_probe(struct i2c_client *client, const struct i2c_device_id *id) int rev = sil164_read(client, SIL164_REVISION); if (vendor != 0x1 || device != 0x6) { - sil164_dbg(client, "Unknown device %x:%x.%x\n", - vendor, device, rev); + drm_dev_dbg(&client->dev, DRM_UT_KMS, + "Unknown device %x:%x.%x\n", vendor, device, rev); return -ENODEV; } @@ -389,7 +384,8 @@ sil164_detect_slave(struct i2c_client *client) }; if (i2c_transfer(adap, &msg, 1) != 1) { - sil164_dbg(adap, "No dual-link slave found."); + drm_dev_dbg(&adap->dev, DRM_UT_KMS, + "No dual-link slave found."); return NULL; } 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: 11594025 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 373201392 for ; Mon, 8 Jun 2020 21:05:41 +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 147A72074B for ; Mon, 8 Jun 2020 21:05:41 +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 147A72074B 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 704A56E99A; Mon, 8 Jun 2020 21:05:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id C31816E59B for ; Mon, 8 Jun 2020 21:05:37 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id z1so15959716qtn.2 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=Pmug9SZ6fjXgh5+p80XfenczVac6A4SwoPaB5jMd8VTO32lQk86won1JAN/Dg98yca +ouCaH2hhxRb/Pu8Mi0vo1JKNhYpj95GXC6Y8+ri3UKYCORme3sx4PxeScYHPPKLkC9h pULhhIPR0WW93/lIU/gHBW2ZOepeST47MHpIesbJSHIJjPi6zEMLfkg/hWptVMmX9XVz AHq4z1uzASWB+8mwerchk4SOrxAHXa3U+Ei6ph7NJPuA1QkDvOG3BiYDSxRX25FxY1J6 E+Gcgjrqjx2dZ1NVXnTkckvXhJkG5FtiUrt+3bQLYh3jihyh4wQ6Ywu7mgpibGZUyB/b Yi2g== X-Gm-Message-State: AOAM5319dPlozUtNK78EOIdtHMwBmIjcGkXASC/dBr82Jg0/8GFiMFEr OeWu+wu29SiS8LasEcXuBcPM29oVkJo= 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 Subject: [PATCH v5 03/13] drm/i915/utils: Replace dev_printk with drm helpers 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> 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: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Sean Paul , tzimmermann@suse.de, Rodrigo Vivi MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594027 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 DDCD41667 for ; Mon, 8 Jun 2020 21:05:47 +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 BABC320774 for ; Mon, 8 Jun 2020 21:05:47 +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="CseeuErB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BABC320774 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 09CB56E99B; Mon, 8 Jun 2020 21:05:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 E75B36E99B for ; Mon, 8 Jun 2020 21:05:45 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id q14so15923260qtr.9 for ; Mon, 08 Jun 2020 14:05:45 -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=l260Oczt5NYvBAM8JWGWfwlC6xbJl17o2VEf10AzS44=; b=CseeuErBEfArFH/qvOm2e4aOzEu/535Sq9CuJsWO1Q85F5s0ZS6M7UdDa5H4jhBgGa mYOopnpofEfIk8y1bVHZIwXOVLbImEkLkXO3i6I8C9ZoZgeRZKZxaigphcgOXPBTEm6e GTMuVEQV35zYYmlj2g+7ofAGHlHaNf7z9t4NgGFjBtQmJW1LPjapU5eyBeyw1NX4SoJ6 7oCK5TGSqKR3jgn6fDhvNkX+YFV9xSIRKs1rpLc6/DvOV3A4ebbC3ZpAYqvuw3wFZcB2 S0XR8qMXnZ6WDHwEw9SUOxjQq3IOaA90FyIleE5dHV5Sp/aSVA445nB2Cw+X2J2Akfs+ VozQ== 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=l260Oczt5NYvBAM8JWGWfwlC6xbJl17o2VEf10AzS44=; b=OFae7+TakegDYCWjHDKME9n1JeVFQuoOUOWFbyjoOWa0OfX52wm1DshD3tO6BtwcTy YcEfwTydi70EMcx4ATEbDgr0TVWmvT839ibb11JJbSLdJzS2NIp/XzlYnuPWQV73grms 242LhSVMct1GbC2Laa0DvHkWsat6H29+ECM9dSv+shHv7CqnM7Hwv32wI+R71ry1N97e CHaD9HYMyFfTWph+kALQqntjaVIKn/bB/RKIrzaoSVYdLNqdWZoLZ2LiSYnAyP6s7d/R ffM+oPd/Z/JE9DgvrcoqzXlOOfuK7u5eIU+8N5ZjWweJLnufcUk/+OvdhDBSSZvDIKnR LF4g== X-Gm-Message-State: AOAM531PLt985/PT8wI/NhPY6+MYwFX+MZFFPaD05v98US46XcAS8c6X dES0BgXr9c8ptH74K/fE4S1fWpaAk4E= X-Google-Smtp-Source: ABdhPJz+V6uEQOV6V65xXTa5fOfwbjDQhqzzFkU5HU0ppoPhtj/oZgEmG1jcwSwRc3m01YVKe+vcTA== X-Received: by 2002:ac8:342b:: with SMTP id u40mr24513501qtb.59.1591650344787; Mon, 08 Jun 2020 14:05:44 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id z19sm9028902qtz.81.2020.06.08.14.05.44 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:44 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 04/13] drm/msm/dpu: Replace definitions for dpu debug macros Date: Mon, 8 Jun 2020 17:04:54 -0400 Message-Id: <20200608210505.48519-5-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> 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 , freedreno@lists.freedesktop.org, David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de, linux-arm-msm@vger.kernel.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul The debug messages shouldn't be logged as errors when debug categories are enabled. Use the drm logging helpers to do the right thing Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h index 4e32d040f1e6..89c444ec3bb8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h @@ -29,27 +29,15 @@ * DPU_DEBUG - macro for kms/plane/crtc/encoder/connector logs * @fmt: Pointer to format string */ -#define DPU_DEBUG(fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_KMS)) \ - DRM_DEBUG(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) +#define DPU_DEBUG(fmt, ...) DRM_DEBUG_KMS(fmt, ##__VA_ARGS__) /** * DPU_DEBUG_DRIVER - macro for hardware driver logging * @fmt: Pointer to format string */ -#define DPU_DEBUG_DRIVER(fmt, ...) \ - do { \ - if (drm_debug_enabled(DRM_UT_DRIVER)) \ - DRM_ERROR(fmt, ##__VA_ARGS__); \ - else \ - pr_debug(fmt, ##__VA_ARGS__); \ - } while (0) - -#define DPU_ERROR(fmt, ...) pr_err("[dpu error]" fmt, ##__VA_ARGS__) +#define DPU_DEBUG_DRIVER(fmt, ...) DRM_DEBUG_DRIVER(fmt, ##__VA_ARGS__) + +#define DPU_ERROR(fmt, ...) DRM_ERROR(fmt, ##__VA_ARGS__) /** * ktime_compare_safe - compare two ktime structures From patchwork Mon Jun 8 21:04:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594031 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 E22A01392 for ; Mon, 8 Jun 2020 21:05:54 +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 BF5DE2074B for ; Mon, 8 Jun 2020 21:05:54 +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="QYpNbkRV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF5DE2074B 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 04F236E99D; Mon, 8 Jun 2020 21:05:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id 104C66E9A8 for ; Mon, 8 Jun 2020 21:05:53 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id 205so18788814qkg.3 for ; Mon, 08 Jun 2020 14:05:53 -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=G8s6Lc0q3THMODVI6JTrmHxfOaWOZ58hrbwHPebtvg4=; b=QYpNbkRVzUdP7VPHHejsPGd18y8ACpyEtOL22/6VjDVAw5HZPd7aAdgK9bwMvw10RO SkLdgwLrxjrqDmJRwGyownr1IPMHJJmUV2O+oXNlN+B1bFxdv38skg7Z41VHRRGP4nyx LtzHGVRenPgXp/fD/hQ+IXT8gThweSlsozF2019un2ioafrqYWutMIA8DW2d+8tIQMkR LcDQI2tiClDmRX1V+z1oGBxQiKjgH3x51EMYDDLT0c8uRQZkJhFPFDaOxmR3wO1Bs6Cw ZnLNdH2h2tQEAOiOXQrLBEj0iD9mWAKn6oL1Hky2I3wayX6KnJTTpcVG8ZpP9bzbbNfe GgpQ== 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=G8s6Lc0q3THMODVI6JTrmHxfOaWOZ58hrbwHPebtvg4=; b=TgROswDhp3fZj1PUMfaT69pYCWxd/vqwi+a+fZd9wfxzIf+EhaLpRD0yIButiLpM2s mgpjq8ouXoO31ceAFR/nntGd1wuCcAhmtQzx3lVsmrJJEtDdRmWKvCFuMu1VRDn2rc6Z 0REgAJ3l44q5WW41upfpvwXutJIiuUeCHEov3tLXlSljqpHDOwiQN++rOUX8Khnx2Fb5 gMZWc4u7lEXyQ4AP4P812SOFi0DhFusY/udAZ2f1AE79NKo4LOz4apjRISAe1Oc6jBM6 hZGu7fTCQw+4vbjsucYln4hUfdLOZ+fv+IB7ZWwYeeBbJhWR4aDdcj8hNjims0eduInR FVoA== X-Gm-Message-State: AOAM530vFRwyZqOEfQavOSQARqH4ZS1wltRM4myyqoy7QSnPVusChNLF UbmiueC6q+4CUfECXO0VlwNNzZpWQyc= X-Google-Smtp-Source: ABdhPJzbxnL8SIVo1wFOxtd4P2kmvwBZuduJGv6J2OE2wZx6cxGeEl5+ImV/lZqMg/CuBLL+bLvT8A== X-Received: by 2002:ae9:eb83:: with SMTP id b125mr25614723qkg.85.1591650352010; Mon, 08 Jun 2020 14:05:52 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id g140sm4303239qke.98.2020.06.08.14.05.51 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:51 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 05/13] drm/print: rename drm_debug* to be more syslog-centric Date: Mon, 8 Jun 2020 17:04:55 -0400 Message-Id: <20200608210505.48519-6-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul In preparation for tracefs support, rename drm_debug related functions to reflect that it targets the syslog. This will allow us to selectively target syslog and/or tracefs. No functional changes here. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/drm_print.c | 12 ++++++------ include/drm/drm_print.h | 13 +++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 111b932cf2a9..2ff7a6ecc632 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -37,11 +37,11 @@ #include /* - * __drm_debug: Enable debug output. + * __drm_debug_syslog: Enable debug output to system logs * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details. */ -unsigned int __drm_debug; -EXPORT_SYMBOL(__drm_debug); +unsigned int __drm_debug_syslog; +EXPORT_SYMBOL(__drm_debug_syslog); MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n" "\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" @@ -52,7 +52,7 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat "\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" "\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" "\t\tBit 8 (0x100) will enable DP messages (displayport code)"); -module_param_named(debug, __drm_debug, int, 0600); +module_param_named(debug, __drm_debug_syslog, int, 0600); void __drm_puts_coredump(struct drm_printer *p, const char *str) { @@ -160,11 +160,11 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf) } EXPORT_SYMBOL(__drm_printfn_info); -void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf) +void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf) { pr_debug("%s %pV", p->prefix, vaf); } -EXPORT_SYMBOL(__drm_printfn_debug); +EXPORT_SYMBOL(__drm_printfn_debug_syslog); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf) { diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 1c9417430d08..ce7675bf0d2b 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -35,7 +35,7 @@ #include /* Do *not* use outside of drm_print.[ch]! */ -extern unsigned int __drm_debug; +extern unsigned int __drm_debug_syslog; /** * DOC: print @@ -85,7 +85,7 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str); void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf); void __drm_puts_seq_file(struct drm_printer *p, const char *str); void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf); -void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf); +void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf); __printf(2, 3) @@ -227,7 +227,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev) static inline struct drm_printer drm_debug_printer(const char *prefix) { struct drm_printer p = { - .printfn = __drm_printfn_debug, + .printfn = __drm_printfn_debug_syslog, .prefix = prefix }; return p; @@ -319,9 +319,14 @@ enum drm_debug_category { DRM_UT_DRMRES = 0x200, }; +static inline bool drm_debug_syslog_enabled(enum drm_debug_category category) +{ + return unlikely(__drm_debug_syslog & category); +} + static inline bool drm_debug_enabled(enum drm_debug_category category) { - return unlikely(__drm_debug & category); + return drm_debug_syslog_enabled(category); } /* From patchwork Mon Jun 8 21:04:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594033 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 A4DB01667 for ; Mon, 8 Jun 2020 21:06:01 +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 81E6A2074B for ; Mon, 8 Jun 2020 21:06:01 +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="BG19wTK0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81E6A2074B 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 325C66E99F; Mon, 8 Jun 2020 21:06:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2777C6E99F for ; Mon, 8 Jun 2020 21:05:59 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id w3so18774930qkb.6 for ; Mon, 08 Jun 2020 14:05:59 -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=3lGoCASmqmL0XGiwgCZ6IM26DMk0q5eTR7kt4CPxXww=; b=BG19wTK0x5LAh+DAGVfERtOj2MwsfYjUNa05eEj3LkEcCnV2ed/Oa6lxdi42MOkN02 wdP6DMHAneF9NWov5i5r1CFDOy7hkusEDIaJgnKFxaEHrMUv6EeZHXe2Yyx0uMuSA1Bk /FXUh7bKWDuHkLQOikYie/y2e9JZnP+FoSl9f0A1aXxopgbXMFSFucy1aMECnVzm1THG jhp55w7SJ+z3yBgMZKwcbfBD+kdKYgapYyevaSZ6fJTVr8KpQeyANibXqhHlRPVHyMci myxG8ISvMhiDMO/PyWGsc60TATvNaOLWm1czmQc2kXHcT230sr58ZoGGDkTDrifiwEll j/Qg== 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=3lGoCASmqmL0XGiwgCZ6IM26DMk0q5eTR7kt4CPxXww=; b=JetVhsqY/Asm3Ao8qsmsHwRcDjo4c1NLixtuELf23becYcXMAC7+n+ZYqO3JcGdKYs cQRu/QExpEUx87Ao979ao1TiNz+BqIK+etG+0mCFP++dpBYoBt9uJLgxYbZgTKXBRnXQ SS6NIb9w49CBGF55f9le3zTpA/Sik/qppyCFnuqFfPQqbt265Fs2VAEB+0pjsDjWIoUo KdETQj9ghfc7eDsQpJ3zJ04MiM98QWeSVy8fowk2Fq7oRygPWQWY3xmVQ8TamhuOXkM3 zeLzW/rEeAzydHyF1iDSaEPQZUVTtQ+88sQtok3XCrpv5QTULjTN4zKrdM4NoPqkLIM6 AIrQ== X-Gm-Message-State: AOAM533WgS5ez5RXxkBsjHBS0c+CAJ76CvgfSpQEDAy2yCIbWqknjaWP P0wZKDZUHWUKoK27PuO+7amNVwGaSME= X-Google-Smtp-Source: ABdhPJw8Jjk7oif/BBxPbHlXuh/tL5TFWd+obsWTrGA596OmBAk4bdIfGNk7j9+0DpB8+KziOP5gVA== X-Received: by 2002:a05:620a:133b:: with SMTP id p27mr23224008qkj.444.1591650358159; Mon, 08 Jun 2020 14:05:58 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id a27sm8698275qtc.92.2020.06.08.14.05.57 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:05:57 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 06/13] drm/amd: Gate i2c transaction logs on drm_debug_syslog Date: Mon, 8 Jun 2020 17:04:56 -0400 Message-Id: <20200608210505.48519-7-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , amd-gfx@lists.freedesktop.org, tzimmermann@suse.de, Alex Deucher , =?utf-8?q?Ch?= =?utf-8?q?ristian_K=C3=B6nig?= MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Acked-by: Christian König either way. --- drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c index 9bffbab35041..9bc6baddd302 100644 --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c @@ -233,7 +233,7 @@ static uint32_t smu_v11_0_i2c_transmit(struct i2c_adapter *control, DRM_DEBUG_DRIVER("I2C_Transmit(), address = %x, bytes = %d , data: ", (uint16_t)address, numbytes); - if (drm_debug_enabled(DRM_UT_DRIVER)) { + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE, 16, 1, data, numbytes, false); } @@ -387,7 +387,7 @@ static uint32_t smu_v11_0_i2c_receive(struct i2c_adapter *control, DRM_DEBUG_DRIVER("I2C_Receive(), address = %x, bytes = %d, data :", (uint16_t)address, bytes_received); - if (drm_debug_enabled(DRM_UT_DRIVER)) { + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "data: ", DUMP_PREFIX_NONE, 16, 1, data, bytes_received, false); } From patchwork Mon Jun 8 21:04:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594035 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 6CA801391 for ; Mon, 8 Jun 2020 21:06:10 +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 499252074B for ; Mon, 8 Jun 2020 21:06:10 +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="eV6tB2DM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 499252074B 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 7D79F6E99C; Mon, 8 Jun 2020 21:06:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 B4BC16E9A2 for ; Mon, 8 Jun 2020 21:06:08 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id w1so18788641qkw.5 for ; Mon, 08 Jun 2020 14:06:08 -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=88E1b1M85yoLt2wQSUARt1kqrX/wmst0RMRkdQQFLvY=; b=eV6tB2DMiYMp9aq5CL2nHjRZfadoA56ZVinBb8t1ouoHvNvsZdHME1MO6SN75PuU3O 7pe+icAw3bycKTtJjBP3EssD8kQDOjH8/b6a69azEZ7plAQwmSFYe13Iv96OCAOAAbIE KvlIqzAwKODnrtgDHQxgKdLObgPHEwmhhM2VH8iVpzU1f7sWyf45PHXSEPhGmqEotQXv 0cvRnineQC3NVTNPdZgxpGWu3j5sfJUZGpDGrnjUHoLHHVAYI8EfFHo1lKEkURHEd4gd sbzQ+YVZgQ0S5vwfM5hLyQoXx5umlq1MUMJhRiFyk31QiEjn/4OQU0/pjk45lHjTGXEL Stpg== 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=88E1b1M85yoLt2wQSUARt1kqrX/wmst0RMRkdQQFLvY=; b=pa7V23B5H9TiohrU5fuDcytH7IOuA2QPy4ilTuz5mKQ9UfQ9adiNpcFMkfyECRmwGk rYoP6xAHfxetjQtKkCsPPzRtpYqzC+v2OD+jJu18xAF+e+0K8rDdufXl5687W5KGHh5k 630a5aCzSApZhVPgsdetJOBjahGhfrhjlOfJJL44SSXfkCLVKMW9rvVVHNsoLcDFQuEZ LMEV6e/GnDLESi5W1ST/IowoVLzH4yRTF7MMj2ugiUvX92qsFysyWzjkcI4iuT7AmwUI xVizdlq+TVrgZaheY7aK4ob5QO+IsAYFMLesZZFWhjeZRQjJ3GCq5Hb8mvFlaGvduWe3 ABmw== X-Gm-Message-State: AOAM530naP1BE66IGCyvPtVzUO5d9PAFAJt+BDA9z68Gf67A4TPCF7HM +zJMqBVn/AThBAHnKOCjAr99fO8LoXc= X-Google-Smtp-Source: ABdhPJw+jlIdPJV1eXMsqqg65yxIIDLqsUSVa/vXlYz25h1eL1tIBueBHjuCloadV2NlG9t6xhSOPA== X-Received: by 2002:a05:620a:15e8:: with SMTP id p8mr25094222qkm.333.1591650367719; Mon, 08 Jun 2020 14:06:07 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id u7sm7606239qku.119.2020.06.08.14.06.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:07 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 07/13] drm/etnaviv: Change buffer dump checks to target syslog Date: Mon, 8 Jun 2020 17:04:57 -0400 Message-Id: <20200608210505.48519-8-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> 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: David Airlie , daniel.vetter@ffwll.ch, etnaviv@lists.freedesktop.org, Sean Paul , tzimmermann@suse.de, Russell King MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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/etnaviv/etnaviv_buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c index 76d38561c910..7713474800e8 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -353,7 +353,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, lockdep_assert_held(&gpu->lock); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); link_target = etnaviv_cmdbuf_get_va(cmdbuf, @@ -509,13 +509,13 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping) + buffer->user_size - 4); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) pr_info("stream link to 0x%08x @ 0x%08x %p\n", return_target, etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping), cmdbuf->vaddr); - if (drm_debug_enabled(DRM_UT_DRIVER)) { + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4, cmdbuf->vaddr, cmdbuf->size, 0); @@ -534,6 +534,6 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, VIV_FE_LINK_HEADER_PREFETCH(link_dwords), link_target); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); } From patchwork Mon Jun 8 21:04:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594037 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 A88281391 for ; Mon, 8 Jun 2020 21:06:18 +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 856062076A for ; Mon, 8 Jun 2020 21:06:18 +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="FMdXk7UI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 856062076A 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 2E4CE6E9A1; Mon, 8 Jun 2020 21:06:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf2e.google.com (mail-qv1-xf2e.google.com [IPv6:2607:f8b0:4864:20::f2e]) by gabe.freedesktop.org (Postfix) with ESMTPS id 127F96E9A1 for ; Mon, 8 Jun 2020 21:06:16 +0000 (UTC) Received: by mail-qv1-xf2e.google.com with SMTP id p15so9068088qvr.9 for ; Mon, 08 Jun 2020 14:06:16 -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=SAppPpa1LXhRlJGmkA2/z+Dr2Wp9y7xO4XPUfiSSbTI=; b=FMdXk7UIUD9h9hT2JCBx99SKW/dMCL5oH3fDczKvZ0nzxJQrfAN4X0iurpbXSHL0nS vtHXNxa8Be7Fxib+5od2v/PxcoayfScIZqjyQl/yjwxJ9PkA/0B4wQiRQpczNpaUiAYY pFEXQwulQWsI4A6igvEmvn+1UwZlTuaUu4ez8Y+Dm1BEc9QgugJNxa1gjtz2ZPkSMOh2 SOsHwX4iMZOuJDf4x/YDHgyOKbQGBk15e72L6xiLe7qzsecxotKnXEsLA0zoxCl1ZeOo ytval+8WAOnSkZZD+ibMaX53Sjqq+ydt5GhwtbG9krZcZ8r7VC8nzxEC1XWKRdMKUxZz LMfg== 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=SAppPpa1LXhRlJGmkA2/z+Dr2Wp9y7xO4XPUfiSSbTI=; b=flfK28aqZj5dbrIb1soI7HGp6iJQu2a7i0SZhaeww8M2ZuxOpL9C0ihj3EMs2aMV4N uQITjJDVBkig9Dmcf5/g0lDcsfXQUDqrx0DTVCk7q+A4PkIV982kRwPc3XWlPDFkKMom cSRQ9Ond87hPiy/8cHC/eWzbnrclKAGJ9qsz0MaaV2od4cVHESM4WxsMNgtZLwDag2ZQ +7MMcN07LNoB27yYkjk39o/Lm1fISlD4S9D20qR1KHcghZWqsJhc9iODvWvbz+Ku4Ho2 1xIYh7T3qBmcvK3lkXP4wfjjlA4uotqofCE4se9PSwNjHAbMc5uqms3oU9JBqXW0V8nZ FSyQ== X-Gm-Message-State: AOAM532zlNXfI9pIbFKsUjDKMy0wSySFU0xjGk61N+Zu+sIXVdF7upKM 7yS6Ji41vDyReYjR91N9VzuOFGC0VfE= X-Google-Smtp-Source: ABdhPJwheOYqcswFZ16457m3Bo6nUhBN7dUfynfSbEg06VTr1WbBj6rbjgGaKPPvPZdbWDJYmkTPvg== X-Received: by 2002:a05:6214:589:: with SMTP id bx9mr622046qvb.127.1591650374964; Mon, 08 Jun 2020 14:06:14 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id 126sm8226977qkj.89.2020.06.08.14.06.14 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:14 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 08/13] drm/nouveau: Change debug checks to specifically target syslog Date: Mon, 8 Jun 2020 17:04:58 -0400 Message-Id: <20200608210505.48519-9-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , Ben Skeggs , tzimmermann@suse.de, nouveau@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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/nouveau/dispnv50/disp.h | 4 ++-- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h index 696e70a6b98b..d60602db2cf0 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.h +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h @@ -85,14 +85,14 @@ extern const u64 wndwc57e_modifiers[]; #define evo_mthd(p, m, s) do { \ const u32 _m = (m), _s = (s); \ - if (drm_debug_enabled(DRM_UT_KMS)) \ + if (drm_debug_syslog_enabled(DRM_UT_KMS)) \ pr_err("%04x %d %s\n", _m, _s, __func__); \ *((p)++) = ((_s << 18) | _m); \ } while(0) #define evo_data(p, d) do { \ const u32 _d = (d); \ - if (drm_debug_enabled(DRM_UT_KMS)) \ + if (drm_debug_syslog_enabled(DRM_UT_KMS)) \ pr_err("\t%08x\n", _d); \ *((p)++) = _d; \ } while(0) diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 2a6519737800..b916d1f456cd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -257,11 +257,11 @@ void nouveau_drm_device_remove(struct drm_device *dev); #define NV_INFO(drm,f,a...) NV_PRINTK(info, &(drm)->client, f, ##a) #define NV_DEBUG(drm,f,a...) do { \ - if (drm_debug_enabled(DRM_UT_DRIVER)) \ + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) \ NV_PRINTK(info, &(drm)->client, f, ##a); \ } while(0) #define NV_ATOMIC(drm,f,a...) do { \ - if (drm_debug_enabled(DRM_UT_ATOMIC)) \ + if (drm_debug_syslog_enabled(DRM_UT_ATOMIC)) \ NV_PRINTK(info, &(drm)->client, f, ##a); \ } while(0) 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: 11594041 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 B53E51391 for ; Mon, 8 Jun 2020 21:06:24 +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 923772074B for ; Mon, 8 Jun 2020 21:06:24 +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 923772074B 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 AFCDB6E9A5; Mon, 8 Jun 2020 21:06:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by gabe.freedesktop.org (Postfix) with ESMTPS id 781946E9A4 for ; Mon, 8 Jun 2020 21:06:22 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id c12so18741842qkk.13 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=bs3W+336RHJAtaRE0hp9t3uDBSAXma0Rq5Ij04zoYQhyBMzlZ0q2Pz06wHC4AA2gn5 6FTUQId/TK8+/Xwm9iGbF+BWsOxQmz68O+bzORziG7HTGi1w4cVGeIsazs3yUSezErWL aCkaPq6RcVvWZKdmpShAcJw9yZX6ucbMwQb2ul1A3jhySa7ma7VRCUnDlCx8ekev4uHn pWgz6+SbEH9oYKMtQ8B9sUq2fbbwQ6hLj5Kt8iieWZ5aUrBs/kSn178zFc6aJVIPoGzZ cNh33bmF8YGr+23A0maCDNsWf/6B7y2MO+k8JdYsDUgPPOwI9kWp4iU7YijR6aoyXCT7 1Ufg== X-Gm-Message-State: AOAM5334k9frR/82ET0QzQnfWENj1G35G2uqUBLTe5oT32M8/k3EqS2M p4FBVW+wueIJpkIdW/Sjm1jTKjlWXwY= 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 Subject: [PATCH v5 09/13] drm/i915: Change infoframe debug checks to specify syslog 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> 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: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Sean Paul , tzimmermann@suse.de, Rodrigo Vivi MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594043 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 E5D591391 for ; Mon, 8 Jun 2020 21:06:31 +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 C39A72074B for ; Mon, 8 Jun 2020 21:06:31 +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="FZRYWUXL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C39A72074B 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 053686E9A9; Mon, 8 Jun 2020 21:06:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id E804B6E9A9 for ; Mon, 8 Jun 2020 21:06:29 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id n11so18787965qkn.8 for ; Mon, 08 Jun 2020 14:06:29 -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=+4eAil2vbzPgh8HMO5NSPqggdk/Dns1MKOIFp4gwtAo=; b=FZRYWUXLHCX9QJX5pad1zCddLAV/UnhUw/3GRHpEmxoS5YrX798Kgdab+2m5siPFor KxEyzT+Nojroi8W4EW61vvvwVG/UCl0gd/jkLJ4Trz0v3zjKkDkBnKbEsQs+W3Emu18G 9UsXm/bWEZhvTVgTbDNCG4pqcmllYnytxjpVxn8t2p111Q9MCMUjlrlioQUSITlDBsoZ tZcs6str9sz5aQhbtO8LxODwebjJ5f45E7xmGkC2Gdt5yzTqyxeFnWor8FGd5KY/U/8e 1d2S/b7DFqQPIepQbyO6s0QBTJ+y/j3TIeE4JK+DkmWX+dDjFbyvrEXnFinRebX0PGvC vaDw== 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=+4eAil2vbzPgh8HMO5NSPqggdk/Dns1MKOIFp4gwtAo=; b=mvnpoyQDh12jZ1+YxUbkxTsx8JoBrESYTa3OHPquII012Bg8GBXa4mbmbMijMSMbTJ iPJUmWP/shW/6HUWJhbUOlG6aHd00dorb9SJdpe9N18F0n+PkO7FgaiQilBasgvKOILv w3pbI95X5XucaVCAiY1jeq1Doln/6w+C5IQ3eikIl1m7hX9s2J455Y2PdIvKMF00L4DI g+9I90QZlEIyi4bbUEW1iuSajVoXZDIETVxupHxXsKWKZpZuL1LVoZa97c32zDVm3TEc WzSXgNNiIoTU4/cj06ERghx59Ftj+ujR2KfeR6qeaMrXuiPbOLlGcPYAMjhqx4+2qL3h QDHA== X-Gm-Message-State: AOAM530JAP6mo8gfrqwShx4WP1kRbQNwcirAyzmCh9D1JTLl0bacc+Z/ kvhwloNoYgMRJn5tMr8PNgSrMQx0UsI= X-Google-Smtp-Source: ABdhPJxtrMm6SsgROad05hoRuTmB9pmY1k0QiYFORzEoPpbZiN9kc5l6fdFvvM+cDxw40lQyzI1Fag== X-Received: by 2002:a37:62c7:: with SMTP id w190mr24812445qkb.154.1591650388821; Mon, 08 Jun 2020 14:06:28 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id x4sm8832970qtj.43.2020.06.08.14.06.28 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:28 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 10/13] drm/print: Add drm_debug_category_printer Date: Mon, 8 Jun 2020 17:05:00 -0400 Message-Id: <20200608210505.48519-11-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul This patch adds a new printer which will select the appropriate output for a given debug category. Currently there is only one output target, which is syslog. However in the future we'll have tracefs and it will be useful to print to syslog, tracefs, or both. Drivers just need to create the printer for the appropriate category and the printer will decide where to send the output. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/drm_print.c | 5 +++++ include/drm/drm_print.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 2ff7a6ecc632..4d984a01b3a3 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -172,6 +172,11 @@ void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf) } EXPORT_SYMBOL(__drm_printfn_err); +void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf) +{ +} +EXPORT_SYMBOL(__drm_printfn_noop); + /** * drm_puts - print a const string to a &drm_printer stream * @p: the &drm printer diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index ce7675bf0d2b..8987b98bbfda 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -87,6 +87,7 @@ void __drm_puts_seq_file(struct drm_printer *p, const char *str); void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf); +void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf); __printf(2, 3) void drm_printf(struct drm_printer *p, const char *f, ...); @@ -329,6 +330,33 @@ static inline bool drm_debug_enabled(enum drm_debug_category category) return drm_debug_syslog_enabled(category); } +/** + * drm_debug_category_printer - construct a &drm_printer that outputs to + * pr_debug() if enabled for the given category. + * @category: the DRM_UT_* message category this message belongs to + * @prefix: trace output prefix + * + * RETURNS: + * The &drm_printer object + */ +static inline struct drm_printer +drm_debug_category_printer(enum drm_debug_category category, + const char *prefix) +{ + struct drm_printer p = { + .prefix = prefix + }; + + if (drm_debug_syslog_enabled(category)) { + p.printfn = __drm_printfn_debug_syslog; + } else { + WARN(1, "Debug category %d is inactive.", category); + p.printfn = __drm_printfn_noop; + } + + return p; +} + /* * struct device based logging * From patchwork Mon Jun 8 21:05:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594045 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 DE43A1391 for ; Mon, 8 Jun 2020 21:06: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 BA4AA2076A for ; Mon, 8 Jun 2020 21:06: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="Q7QA1ExD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BA4AA2076A 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 F0E746E99E; Mon, 8 Jun 2020 21:06:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32C666E99E for ; Mon, 8 Jun 2020 21:06:37 +0000 (UTC) Received: by mail-qk1-x744.google.com with SMTP id l17so4958959qki.9 for ; Mon, 08 Jun 2020 14:06: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=UADwIitYeeRjrBoFSNdL04uFlF0ln39T0ne23bnsj5g=; b=Q7QA1ExDjnKdhXRkd13w6l0b+xEo0MsPjeuJqaMKBEBTqCp7HEWYPiIgcGZVsoZVI2 VBpnYdlGSSjZq4Xh8ALm6VvypeX+686t4mn/FvnnFA6OGTCVwxrs48oZWMLSU8cRddOv D4KPqPf9wgfm/8L9QrFoCL2On5ssGrpoObryuOQfNsEzfr186X3tyFFZpXR5dDRA0QzT cd9De3u1Xrtq0C4OpAlKhL0NpuUqwWTVx7ATaj9XXyXu1GHLfNzcAfBqOX/Od/J1etM2 O85ArkwYApaAEHTGsNrziGwO/pP0/IO8Ouyr9M7icX1p0C9ZbU1v2nEOeWzL9wXy4FgU 0ZGw== 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=UADwIitYeeRjrBoFSNdL04uFlF0ln39T0ne23bnsj5g=; b=qoHSUeKkyJCdnM6ijuod5fmhGvHrMobu/S7fXpcZbQS/f9SiVaH1HdSQqxFwBMsxAX eCRtaN/LjGgLDpoZyxOStdQr9bRKXiuF63zpVeu8hHA4mNxsAuSAFDbszBGltOWepJ6E yhZ4cRBfM1YTPKsvYwo/lWkXdL11wOxwDZvX08Mv2kOsfKo3klk1HowYrytMzcDS+OWg hcARkr3J2TUO8Zm9JyvuwPblb0ytHMjCOTVoazpmzLg6/9Wlwi6oiiYjQJmaRlz6f4/6 sZq/gEH6XHTQlboerVgQO6wYt9mRL7tGFXhv+N9WqC46y5c7lVzfMiGam3Vp0H8UyHAr ZNIQ== X-Gm-Message-State: AOAM533l+6yvRlVV1VLtbj1sRRZJqi0ybjl/ETAmfwT9FkvDoKw/YVxN zPHRKZHMLMe1fPfQwB9ruTacDk6U+mI= X-Google-Smtp-Source: ABdhPJyR8wfk5lCJjROGNWxVSXFl5Qn8lMtdi/zb6b4sTWPNuGHM1PX7nHEYhBQOUC4xAPfhTfVsrw== X-Received: by 2002:a37:9a87:: with SMTP id c129mr24251895qke.374.1591650396180; Mon, 08 Jun 2020 14:06:36 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id e16sm8976160qtc.71.2020.06.08.14.06.35 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:35 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 11/13] drm/mst: Convert debug printers to debug category printers Date: Mon, 8 Jun 2020 17:05:01 -0400 Message-Id: <20200608210505.48519-12-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> 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: David Airlie , daniel.vetter@ffwll.ch, Sean Paul , tzimmermann@suse.de MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul The printers in dp_mst are meant to be gated on DRM_UT_DP, so use the debug category printer to avoid dumping mst transactions to the wrong place. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/drm_dp_mst_topology.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 1bdf3cfeeebb..e225a84da96e 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1203,7 +1203,8 @@ static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb, } out: if (unlikely(ret == -EIO) && drm_debug_enabled(DRM_UT_DP)) { - struct drm_printer p = drm_debug_printer(DBG_PREFIX); + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP, + DBG_PREFIX); drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); } @@ -2739,7 +2740,8 @@ static int process_single_tx_qlock(struct drm_dp_mst_topology_mgr *mgr, ret = drm_dp_send_sideband_msg(mgr, up, chunk, idx); if (unlikely(ret) && drm_debug_enabled(DRM_UT_DP)) { - struct drm_printer p = drm_debug_printer(DBG_PREFIX); + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP, + DBG_PREFIX); drm_printf(&p, "sideband msg failed to send\n"); drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); @@ -2783,7 +2785,8 @@ static void drm_dp_queue_down_tx(struct drm_dp_mst_topology_mgr *mgr, list_add_tail(&txmsg->next, &mgr->tx_msg_downq); if (drm_debug_enabled(DRM_UT_DP)) { - struct drm_printer p = drm_debug_printer(DBG_PREFIX); + struct drm_printer p = drm_debug_category_printer(DRM_UT_DP, + DBG_PREFIX); drm_dp_mst_dump_sideband_msg_tx(&p, txmsg); } 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: 11594049 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 6FA0E159A for ; Mon, 8 Jun 2020 21:06:46 +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 4D2EE2076A for ; Mon, 8 Jun 2020 21:06:46 +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 4D2EE2076A 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 4B9C26E9AA; Mon, 8 Jun 2020 21:06:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2934B6E9A7 for ; Mon, 8 Jun 2020 21:06:44 +0000 (UTC) Received: by mail-qv1-xf44.google.com with SMTP id g11so2600807qvs.2 for ; Mon, 08 Jun 2020 14:06:44 -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=V6BIX03Zzb+aBWPbgzh6bOL6ufJNwBEMunyhJgAkrQUlIGA2H9LPC2UyNlQ14BlR1y 0c6t9www6rxTufDccyvUPuTCxrTZrvg+J9a8XEj53ozLNAwScLlyY9bydIftPvBTfSNC 3fLwSYKnU0hstz7D7kInSjqYITJe606Ae5E2x2i3fbIM+oRyqRJk0IzbNW5kZOD0Do6N jFS9gVngwGrww2g8BRK+43HOkUqpZu6l6WV2a9gpX1ObBbP6A2stZOUjg4KN+WQW5wMk GZ73uswZ2c+k72zJ2Q0CQ9vgSmpssuhMTTqJTlYSRfkenvwc1nm6tsF25Ofe4L7vixlS 7asQ== X-Gm-Message-State: AOAM531cgxIvJKQG/JXsdhhzls7lhF2xVbeth9SbIjyZ5986mLigP1eL 4u6BiAr+qGNHUXvUKB1acQFsXVmipjg= 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 Subject: [PATCH v5 12/13] drm/i915: Use debug category printer for welcome message 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> 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: David Airlie , daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, Sean Paul , tzimmermann@suse.de, Rodrigo Vivi MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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), From patchwork Mon Jun 8 21:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594051 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 4986B90 for ; Mon, 8 Jun 2020 21:06:55 +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 2681A2076A for ; Mon, 8 Jun 2020 21:06:55 +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="IF9akcHa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2681A2076A 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 403EA6E9AC; Mon, 8 Jun 2020 21:06:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE0946E9AC for ; Mon, 8 Jun 2020 21:06:53 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id f18so18816918qkh.1 for ; Mon, 08 Jun 2020 14:06:53 -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 :mime-version:content-transfer-encoding; bh=d5zEDo2JBMgX5hYA19EEIcs++4DHZQS+dB8XbR2PlnY=; b=IF9akcHaoitPUD6p8uKeUlRUkvuEPt2QejFScv92q91/i8ywqeuBofi7QIHbFIH6gQ Ss3giVVj2MMhpZZD+dB0WSLVEyZmDs5wvXBXm/jwsFmLv7lsocr4fI/RySxmyOTtyUno BiZTrg6n9uv9E2+qOX7d8Fm2Gylc9EVBGVz2UKGGNek7fDZ5WVJoYvzvKE8Y/A8F/bu7 dSIe2Rcj2Y3GvSI4Sn34bh0cr+CwYX7PpHMwCddX2eAgU5staYJJnb9SVtV5NpImGieq J9t6R1Q/rUjTDuwgvxZEysuNnlwu05l9n+q38jjYxkzgv6giQMrtSM/aBUzNa+9X3x+6 06Ug== 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=d5zEDo2JBMgX5hYA19EEIcs++4DHZQS+dB8XbR2PlnY=; b=VpgFg+RdyTAodnzlA/tEGkcGNBJSEazRkot7Rja4PbM40JaxgGaTH49MbEmj7kSh9t hJ8TdOvIolfjqbaJ8IbQLKbcZSwMKdPnwKbGSu013mfcSW9AYnQLRR25rj6Qj+vThNoj w9VZSRH2aqufNiSccP+qelFLjVFWgecRBtdi7ybgD4Whcumr6IPimz85wmlwikdZxu5a OGLZvq7XLSXDCbePY+8JS40eydTF7P3lGFDEhuWbd3G9LiCCrqh5Fmp0k1B6qoF1adbh Jd+XL4hTo3uGqrnUCJDsHXwIpgzXu0N18haBryvPF3cKFeE5es30qLaKl+2aAypPSU1c c6qA== X-Gm-Message-State: AOAM5335cp0oNw+w+eqDra1iLCj7u+MZmDYN8llh+wDiAnaPVtYU3rk/ lj51jM7dkujpJEtnmGyKFsO0PKVXufo= X-Google-Smtp-Source: ABdhPJyjZByuVGa3aedRo3kpzH16ZQatvnmfOO5BoKgVNGkMbC1Gg6qDExz33wujL9IM2onErPBYUA== X-Received: by 2002:a37:d95:: with SMTP id 143mr23371263qkn.496.1591650412545; Mon, 08 Jun 2020 14:06:52 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id s42sm8623013qtk.14.2020.06.08.14.06.51 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:52 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 13/13] drm/print: Add tracefs support to the drm logging helpers Date: Mon, 8 Jun 2020 17:05:03 -0400 Message-Id: <20200608210505.48519-14-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> 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: linux-doc@vger.kernel.org, Jonathan Corbet , David Airlie , daniel.vetter@ffwll.ch, Chris Wilson , Sean Paul , tzimmermann@suse.de, Steven Rostedt Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul This patch adds a new module parameter called drm.trace which accepts the same mask as drm.debug. When a debug category is enabled, log messages will be put in a new tracefs instance called drm for consumption. Using the new tracefs instance will allow distros to enable drm logging in production without impacting performance or spamming the system logs. Cc: Daniel Vetter Cc: David Airlie Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Pekka Paalanen Cc: Rob Clark Cc: Steven Rostedt Cc: Thomas Zimmermann Cc: Ville Syrjälä Cc: Chris Wilson Cc: Steven Rostedt Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20191010204823.195540-1-sean@poorly.run #v1 Link: https://lists.freedesktop.org/archives/dri-devel/2019-November/243230.html #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20191212203301.142437-1-sean@poorly.run #v3 Link: https://patchwork.freedesktop.org/patch/msgid/20200114172155.215463-1-sean@poorly.run #v4 Changes in v5: -Re-write to use trace_array and the tracefs instance support Reported-by: kernel test robot Reported-by: kernel test robot Acked-by: Pekka Paalanen --- Documentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_print.c | 209 ++++++++++++++++++++++++++++----- include/drm/drm_print.h | 63 ++++++++-- 4 files changed, 241 insertions(+), 40 deletions(-) diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst index 56fec6ed1ad8..1c1c4d043f40 100644 --- a/Documentation/gpu/drm-uapi.rst +++ b/Documentation/gpu/drm-uapi.rst @@ -312,6 +312,12 @@ Debugfs Support .. kernel-doc:: drivers/gpu/drm/drm_debugfs.c :export: +DRM Tracing +--------------- + +.. kernel-doc:: drivers/gpu/drm/drm_print.c + :doc: DRM Tracing + Sysfs Support ============= diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index bc38322f306e..88404af74c9b 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -1108,12 +1108,15 @@ static void drm_core_exit(void) drm_sysfs_destroy(); idr_destroy(&drm_minors_idr); drm_connector_ida_destroy(); + drm_trace_cleanup(); } static int __init drm_core_init(void) { int ret; + drm_trace_init(); + drm_connector_ida_init(); idr_init(&drm_minors_idr); diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 4d984a01b3a3..c4bef38921db 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -43,17 +44,34 @@ unsigned int __drm_debug_syslog; EXPORT_SYMBOL(__drm_debug_syslog); -MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n" -"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" -"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" -"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" -"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" -"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" -"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" -"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" -"\t\tBit 8 (0x100) will enable DP messages (displayport code)"); +/* + * __drm_debug_trace: Enable debug output in drm tracing instance. + * Bitmask of DRM_UT_x. See include/drm/drm_print.h for details. + */ +unsigned int __drm_debug_trace; +EXPORT_SYMBOL(__drm_debug_trace); + +#define DEBUG_PARM_DESC(dst) \ +"Enable debug output to " dst ", where each bit enables a debug category.\n" \ +"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n" \ +"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n" \ +"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n" \ +"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n" \ +"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n" \ +"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n" \ +"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n" \ +"\t\tBit 8 (0x100) will enable DP messages (displayport code)" + +MODULE_PARM_DESC(debug, DEBUG_PARM_DESC("syslog")); module_param_named(debug, __drm_debug_syslog, int, 0600); +MODULE_PARM_DESC(trace, DEBUG_PARM_DESC("tracefs")); +module_param_named(trace, __drm_debug_trace, int, 0600); + +#ifdef CONFIG_TRACING +struct trace_array *trace_arr; +#endif + void __drm_puts_coredump(struct drm_printer *p, const char *str) { struct drm_print_iterator *iterator = p->arg; @@ -166,6 +184,20 @@ void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf) } EXPORT_SYMBOL(__drm_printfn_debug_syslog); +void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf) +{ + drm_trace_printf("%s %pV", p->prefix, vaf); +} +EXPORT_SYMBOL(__drm_printfn_trace); + +void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p, + struct va_format *vaf) +{ + pr_debug("%s %pV", p->prefix, vaf); + drm_trace_printf("%s %pV", p->prefix, vaf); +} +EXPORT_SYMBOL(__drm_printfn_debug_syslog_and_trace); + void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf) { pr_err("*ERROR* %s %pV", p->prefix, vaf); @@ -246,6 +278,14 @@ void drm_dev_printk(const struct device *dev, const char *level, struct va_format vaf; va_list args; + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; + drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV", + dev ? dev_name(dev) : "",dev ? " " : "", + __builtin_return_address(0), &vaf); + va_end(args); + va_start(args, format); vaf.fmt = format; vaf.va = &args; @@ -267,21 +307,30 @@ void drm_dev_dbg(const struct device *dev, enum drm_debug_category category, struct va_format vaf; va_list args; - if (!drm_debug_enabled(category)) - return; + if (drm_debug_syslog_enabled(category)) { + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; - va_start(args, format); - vaf.fmt = format; - vaf.va = &args; + if (dev) + dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV", + __builtin_return_address(0), &vaf); + else + printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV", + __builtin_return_address(0), &vaf); - if (dev) - dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV", - __builtin_return_address(0), &vaf); - else - printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV", - __builtin_return_address(0), &vaf); + va_end(args); + } - va_end(args); + if (drm_debug_trace_enabled(category)) { + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; + drm_trace_printf("%s%s[" DRM_NAME ":%ps] %pV", + dev ? dev_name(dev) : "", dev ? " " : "", + __builtin_return_address(0), &vaf); + va_end(args); + } } EXPORT_SYMBOL(drm_dev_dbg); @@ -290,17 +339,25 @@ void __drm_dbg(enum drm_debug_category category, const char *format, ...) struct va_format vaf; va_list args; - if (!drm_debug_enabled(category)) - return; + if (drm_debug_syslog_enabled(category)) { + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; - va_start(args, format); - vaf.fmt = format; - vaf.va = &args; + printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV", + __builtin_return_address(0), &vaf); - printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV", - __builtin_return_address(0), &vaf); + va_end(args); + } - va_end(args); + if (drm_debug_trace_enabled(category)) { + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; + drm_trace_printf("[" DRM_NAME ":%ps] %pV", + __builtin_return_address(0), &vaf); + va_end(args); + } } EXPORT_SYMBOL(__drm_dbg); @@ -347,3 +404,97 @@ void drm_print_regset32(struct drm_printer *p, struct debugfs_regset32 *regset) } } EXPORT_SYMBOL(drm_print_regset32); + + +/** + * DOC: DRM Tracing + * + * *tl;dr* DRM tracing is a lightweight alternative to traditional DRM debug + * logging. + * + * While DRM logging is quite convenient when reproducing a specific issue, it + * doesn't help when something goes wrong unexpectedly. There are a couple + * reasons why one does not want to enable DRM logging at all times: + * + * 1. We don't want to overwhelm syslog with drm spam, others have to use it too + * 2. Console logging is slow + * + * DRM tracing aims to solve both these problems. + * + * To use DRM tracing, set the drm.trace module parameter (via cmdline or sysfs) + * to a DRM debug category mask (this is a bitmask of &drm_debug_category + * values): + * :: + * + * eg: echo 0x106 > /sys/module/drm/parameters/trace + * + * Once active, all log messages in the specified categories will be written to + * the DRM trace. Once at capacity, the trace will overwrite old messages with + * new ones. At any point, one can read the trace file to extract the previous N + * DRM messages: + * :: + * + * eg: cat /sys/kernel/tracing/instances/drm/trace + * + * Considerations + * ************** + * The trace is subsystem wide, so if you have multiple devices active, they + * will be adding logs to the same trace. + * + * The contents of the DRM Trace are **not** considered UABI. **DO NOT depend on + * the values of these traces in your userspace.** These traces are intended for + * entertainment purposes only. The contents of these logs carry no warranty, + * expressed or implied. + */ + + +#ifdef CONFIG_TRACING + +/** + * drm_trace_init - initializes the drm trace array + * + * This function fetches (or creates) the drm trace array. This should be called + * once on drm subsystem creation and matched with drm_trace_cleanup(). + */ +void drm_trace_init() +{ + trace_arr = trace_array_get_by_name("drm"); + if (!trace_arr) + return; +} +EXPORT_SYMBOL(drm_trace_init); + +/** + * drm_trace_printf - adds an entry to the drm tracefs instance + * @format: printf format of the message to add to the trace + * + * This function adds a new entry in the drm tracefs instance + */ +void drm_trace_printf(const char *format, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, format); + vaf.fmt = format; + vaf.va = &args; + trace_array_printk(trace_arr, _THIS_IP_, "%pV", &vaf); + va_end(args); +} + +/** + * drm_trace_cleanup - destroys the drm trace array + * + * This function destroys the drm trace array created with drm_trace_init. This + * should be called once on drm subsystem close and matched with + * drm_trace_init(). + */ +void drm_trace_cleanup() +{ + if (trace_arr) { + trace_array_put(trace_arr); + trace_array_destroy(trace_arr); + } +} +EXPORT_SYMBOL(drm_trace_cleanup); +#endif \ No newline at end of file diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 8987b98bbfda..284f7d325056 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -36,12 +36,13 @@ /* Do *not* use outside of drm_print.[ch]! */ extern unsigned int __drm_debug_syslog; +extern unsigned int __drm_debug_trace; /** * DOC: print * * A simple wrapper for dev_printk(), seq_printf(), etc. Allows same - * debug code to be used for both debugfs and printk logging. + * debug code to be used for debugfs, printk and tracefs logging. * * For example:: * @@ -86,6 +87,9 @@ void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf); void __drm_puts_seq_file(struct drm_printer *p, const char *str); void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_debug_syslog(struct drm_printer *p, struct va_format *vaf); +void __drm_printfn_trace(struct drm_printer *p, struct va_format *vaf); +void __drm_printfn_debug_syslog_and_trace(struct drm_printer *p, + struct va_format *vaf); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_noop(struct drm_printer *p, struct va_format *vaf); @@ -219,7 +223,8 @@ static inline struct drm_printer drm_info_printer(struct device *dev) } /** - * drm_debug_printer - construct a &drm_printer that outputs to pr_debug() + * drm_debug_printer - construct a &drm_printer that outputs to pr_debug() and + * drm tracefs * @prefix: debug output prefix * * RETURNS: @@ -228,7 +233,7 @@ static inline struct drm_printer drm_info_printer(struct device *dev) static inline struct drm_printer drm_debug_printer(const char *prefix) { struct drm_printer p = { - .printfn = __drm_printfn_debug_syslog, + .printfn = __drm_printfn_debug_syslog_and_trace, .prefix = prefix }; return p; @@ -254,14 +259,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix) * enum drm_debug_category - The DRM debug categories * * Each of the DRM debug logging macros use a specific category, and the logging - * is filtered by the drm.debug module parameter. This enum specifies the values - * for the interface. + * is filtered by the drm.debug and drm.trace module parameters. This enum + * specifies the values for the interface. * * Each DRM_DEBUG_ macro logs to DRM_UT_ category, except * DRM_DEBUG() logs to DRM_UT_CORE. * - * Enabling verbose debug messages is done through the drm.debug parameter, each - * category being enabled by a bit: + * Enabling verbose debug messages is done through the drm.debug and drm.trace + * parameters, each category being enabled by a bit: * * - drm.debug=0x1 will enable CORE messages * - drm.debug=0x2 will enable DRIVER messages @@ -270,10 +275,14 @@ static inline struct drm_printer drm_err_printer(const char *prefix) * - drm.debug=0x1ff will enable all messages * * An interesting feature is that it's possible to enable verbose logging at - * run-time by echoing the debug value in its sysfs node:: + * run-time by echoing the debug category value in its sysfs node:: * + * # For syslog logging: * # echo 0xf > /sys/module/drm/parameters/debug * + * # For tracefs logging: + * # echo 0xf > /sys/module/drm/parameters/trace + * */ enum drm_debug_category { /** @@ -325,14 +334,20 @@ static inline bool drm_debug_syslog_enabled(enum drm_debug_category category) return unlikely(__drm_debug_syslog & category); } +static inline bool drm_debug_trace_enabled(enum drm_debug_category category) +{ + return unlikely(__drm_debug_trace & category); +} + static inline bool drm_debug_enabled(enum drm_debug_category category) { - return drm_debug_syslog_enabled(category); + return drm_debug_syslog_enabled(category) || + drm_debug_trace_enabled(category); } /** * drm_debug_category_printer - construct a &drm_printer that outputs to - * pr_debug() if enabled for the given category. + * pr_debug() and/or the drm tracefs instance if enabled for the given category. * @category: the DRM_UT_* message category this message belongs to * @prefix: trace output prefix * @@ -347,8 +362,13 @@ drm_debug_category_printer(enum drm_debug_category category, .prefix = prefix }; - if (drm_debug_syslog_enabled(category)) { + if (drm_debug_syslog_enabled(category) && + drm_debug_trace_enabled(category)) { + p.printfn = __drm_printfn_debug_syslog_and_trace; + } else if (drm_debug_syslog_enabled(category)) { p.printfn = __drm_printfn_debug_syslog; + } else if (drm_debug_trace_enabled(category)) { + p.printfn = __drm_printfn_trace; } else { WARN(1, "Debug category %d is inactive.", category); p.printfn = __drm_printfn_noop; @@ -357,6 +377,27 @@ drm_debug_category_printer(enum drm_debug_category category, return p; } + +#ifdef CONFIG_TRACING +void drm_trace_init(void); +__printf(1, 2) +void drm_trace_printf(const char *format, ...); +void drm_trace_cleanup(void); +#else +static inline void drm_trace_init(void) +{ +} + +__printf(1, 2) +static inline void drm_trace_printf(const char *format, ...) +{ +} + +static inline void drm_trace_cleanup(void) +{ +} +#endif + /* * struct device based logging *