From patchwork Tue Aug 18 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: 11722143 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 3D74C618 for ; Tue, 18 Aug 2020 21:05:26 +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 1C354207BB for ; Tue, 18 Aug 2020 21:05:26 +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="aLn0H7GB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C354207BB 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 086716E13A; Tue, 18 Aug 2020 21:05:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DC186E13A for ; Tue, 18 Aug 2020 21:05:19 +0000 (UTC) Received: by mail-qt1-x841.google.com with SMTP id h21so16232274qtp.11 for ; Tue, 18 Aug 2020 14:05:19 -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=BHKVTNTGi6cHfaoZOy7Gxm7/imbWNMc5S3azkaOfSS4=; b=aLn0H7GBvwyQ/HZxxp4tCqSHaWYd8rqy0KER63R+Mr0coGXd8mLYQR/5NOFJLgmXRS mHLfZ8hNJ50kk02N4dz0+zcP/DVFe+sLPn0ke/Xoqp9To1NvaZWyxvWHnzElLUmRae1Y /KxdWDHenvRjL9yn9ak3rNgBmJsT8XezkjZAw0JwEdLTG68GqM6OXs98dC01AOFxCZ5x p9UCZuZqr2BUq/u9oB6Y+AB2/fQhEcOG64+3/ZSRv0VEzrU4tHU4Ay76bYxSj3yz7PzO Bdi5nHOjmS/dubbxgsCf13/N6t95vwJIZ3wsbWwXzGkyMzL8JmqfETCN2+VEzEgEC7Lf yaRA== 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=BHKVTNTGi6cHfaoZOy7Gxm7/imbWNMc5S3azkaOfSS4=; b=L6NSJLwaQu2vJ3wA6bPn2mBrjto7rLZk2b5xVQKFwl9jdAOPzLxfFonckMrVr6lY0W M2pngAtfQ6aHTtEjRTPevZybppDD5nXz0TZYGsPnIyvD7i4jh2apiyqjTHsa9b56woN9 ruxENQSMk5KM1YMYpuiD8bT1pFn5mpFj1ikqB7GLrXv3aM17qGc+6QhvujNbmgkI3Rg0 jG5L+JDqKr89rBy2y6w56ejxsRfCnwL33pk0xSOzIfpataiqc5M7pqGibDUnQ6n6zEED aUXsLq+g6xatn1ekcUCi00zgnAYDVWYbzGCWbgykIwC6lhyDKH7DYJDVY/8tXC5LuIU8 zFnw== X-Gm-Message-State: AOAM5303t36VhttLJn96R0hv5fP43as2ukKiKysJ9WkF13aDTc8Tlj5x oJWFBAEbNZHMse9JCHCi0jBwzrZ/PId+Vw== X-Google-Smtp-Source: ABdhPJytjSuMmDlf2tRAqTfPkOfsavaSvT/tEytG1YIwHnUzpOz2ZGwe/HD1fpI9JnRAgV1ko51cAA== X-Received: by 2002:ac8:318e:: with SMTP id h14mr20657597qte.245.1597784718162; Tue, 18 Aug 2020 14:05:18 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id t12sm21191885qkt.56.2020.08.18.14.05.17 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:17 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 01/14] drm/mipi_dbi: Convert pr_debug calls to DRM_DEBUG_DRIVER Date: Tue, 18 Aug 2020 17:04:57 -0400 Message-Id: <20200818210510.49730-2-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-2-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 230c4fd7131c..e233b6da7cca 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -764,9 +764,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); @@ -888,9 +886,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 Tue Aug 18 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: 11722145 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 9DE83618 for ; Tue, 18 Aug 2020 21:05:28 +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 7B33220786 for ; Tue, 18 Aug 2020 21:05:28 +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="FzaLrikm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B33220786 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 CE0CC6E139; Tue, 18 Aug 2020 21:05:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 3571C6E139 for ; Tue, 18 Aug 2020 21:05:21 +0000 (UTC) Received: by mail-qv1-xf43.google.com with SMTP id v1so8429541qvn.3 for ; Tue, 18 Aug 2020 14:05:21 -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=OMkgS3KJ9eUsffAjes/ogVCJh1BrcgeqLuYwbEpCi+w=; b=FzaLrikmaqeXQHzfAdHz3UYiz6xwuuMKPobOdOB6BQ2Tt/v3zt7cdOIEyIoPPMdBJq IY1s0yXQ7R2GmHa/9dCL7BuvLVBsez3HQWe8FDqg1YCsYu1XSYE5L5ZDNJrHvcnqoxr8 8ad6lPxPvORQDRZinoN/nPQ0TxqlOi6EtjLu/8kouP8A1fe7bp1fmwvPVPZ95NiuSv4h 54tx6Omwx4dySDMXt9QDHQmCdwOO90LYucKTWbEzi22+Y/O14camwDkkkgscWVxlw7bo MLzsao7yVf9n0V1yM8prd2825VKy1B2PMBp9Ek1Y0au5jn4jGXV5odFAu7KkYSoA1INY y8bA== 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=OMkgS3KJ9eUsffAjes/ogVCJh1BrcgeqLuYwbEpCi+w=; b=M+0O/nn2wiZxqTndg/+kzuY5rO0fBIGW5lsfVV1M55Ckg4s+bf4QxdE2EUvU0UY/vG 86iFDP2zcCA/XI3ZfBFSl2fNl5RO8w4KNBWIXJ9nNUCWgWY1LUVFHkSMiuidTsnn+TbD /KK7e0D+ENGMVaFxYmF5OYcFE2NsGPDEM//ECBVZTEisolPnVuphLW486aFU59RvnuXq C9L1N9v4IVmEK5qjOq2QW0g4rSY9GcYvFYlXLBs435zk5Rgb4FnLNTsnA8ys+DnaK9Nv ImoHI48WturcVZSi7RLqZ5q3EnXwYoPrrOOXE/+SsmdtJ/hUbLji+G7+IjgRnNjMNDhj x0qA== X-Gm-Message-State: AOAM530jqY5aK+R0QhBZ/LsWl1aT93uRQIGezGcfQYVNHvWyZ1325YrO 9fD1jZrYla+kkoJQtHcOjYbvGLc29FjVUg== X-Google-Smtp-Source: ABdhPJxqXc5HOTkRijQQ27tVB/9ydAcnZoNYiQe3hhhZJTQHmNxh4zZn2Ped2za+V8SFBpjODg8LQw== X-Received: by 2002:ad4:444e:: with SMTP id l14mr20280865qvt.111.1597784720166; Tue, 18 Aug 2020 14:05:20 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id g55sm27132608qta.94.2020.08.18.14.05.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:19 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 02/14] drm/sil164: Convert dev_printk to drm_dev_dbg Date: Tue, 18 Aug 2020 17:04:58 -0400 Message-Id: <20200818210510.49730-3-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-3-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 Tue Aug 18 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: 11722147 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 D2014618 for ; Tue, 18 Aug 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 AD15720786 for ; Tue, 18 Aug 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="YUMGNan5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD15720786 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 8F6056E169; Tue, 18 Aug 2020 21:05:24 +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 AC6366E159 for ; Tue, 18 Aug 2020 21:05:22 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id g26so19707841qka.3 for ; Tue, 18 Aug 2020 14:05: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=pgIQz+io6y85AU6XwSiQ95BElGtl4jKiBH0m3yWVK7I=; b=YUMGNan5nPR2DLvOcTa71WpfThiudTPT7p8sa3VSdOP0BLSl84VI5yluoPOxtDMq3u cnhiBtr20lNp/K9NYU7MbZIJhXWZYFoKv0zmydTkcStkHqazxSfJ4xgM9T6k0qT0E0qq dZI0q9AIZZP7DrkIwWqHeWnx1vluPGuP+SMkFfk0PXcZ0vVZgRWdttFyDgSwAnVw+yO/ Cy9algY987q7wxfgX8FaWgqY/gNMz9lG7UuAknS5Wzg3QmFcuN2UfhpV+RkRq1a81Jhc glHQZLaVAhy4ol5bIrnrjJGo1S1HKWKbJUU+GlRH3+BNMAz+KN+SoX97d1fmK+MckOEI 93Eg== 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=pgIQz+io6y85AU6XwSiQ95BElGtl4jKiBH0m3yWVK7I=; b=Sifp6q/gVXoifm5402fxUAM8XbY9nG8YFtBMqn6rRXhJ9DouVyyCOdbGDSqR2a6T4n Ffl+RHwCLeZ9qzJ6M17b9Bd7vI7+WgKSOj3JGZbWtuZiBKFs7d2TfC3b8rnhhNZAkuhq 7TmYu5XPEhM9qKsMWu2ALP/McmuA5vemsXc/aP0L2RHxnPF4SR55GgBYUaNvWZKVpboq ZIkwweyKFh9PgdU2UUn3JMQ1RGYM+juf2IvvOcxuni/Fg6J/VqJsRYMFUzbqlUBlVf5d 8d8SYpfFztqgLTsR7U7kNdWckD/mjrTPQBZCAhE0V9HVmBL2M+wQKhkxf9DprJGKWUCn Z+Qg== X-Gm-Message-State: AOAM531IG/V97mc73jVQH3BfQA6s6I//zafqVo9pYxetfmppt9g6Aw89 Sy91J0HNk32h4CcuK+uV0DYd60B3E/40Ng== X-Google-Smtp-Source: ABdhPJy/7dhSn3hxg5B6eAKjUIbx9BWGbYr8DysGpOnNZe+w8wxHTCIfMRdEjULAU3104YiKqX0upw== X-Received: by 2002:a05:620a:1436:: with SMTP id k22mr18395717qkj.308.1597784721670; Tue, 18 Aug 2020 14:05:21 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id d20sm21473937qkk.84.2020.08.18.14.05.21 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:21 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 03/14] drm/i915/utils: Replace dev_printk with drm helpers Date: Tue, 18 Aug 2020 17:04:59 -0400 Message-Id: <20200818210510.49730-4-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-4-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 4c305d838016..f16a75b165a3 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 Tue Aug 18 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: 11722149 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 A4A7C16B1 for ; Tue, 18 Aug 2020 21:05:32 +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 835912078D for ; Tue, 18 Aug 2020 21:05:32 +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="O1OryiM/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 835912078D 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 09CE96E15C; Tue, 18 Aug 2020 21:05:29 +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 079E86E15C for ; Tue, 18 Aug 2020 21:05:26 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id v22so16264963qtq.8 for ; Tue, 18 Aug 2020 14:05:25 -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=a8L8AwV4qdE5/njGYAQ33CWoirWxJ55I+ZVhtLU2cMw=; b=O1OryiM/3TYvVnczNJDJOxCAkvfj7WnKzIXQ8NORcXdoEg3bLsnBP3RhYVJXn7NMUd aqAP3i+/L14qpRPdTZFss6BYhvaQL4/z9z9bupAEBwJgF0UVm09XaFA3MIJCbMG5cbj+ MhOB8wB96rXpVpdE+i5UVxR9vk9gSUCOIeZ0gE0HV1rZYC9XnvOnm5mvYTgLRdWT30BJ GcIEpH/TH4/QdII6dXVb7HNJF0g7B4/Igz6jerBz6yWIqyKHxGg8PNdhpW5Co6b6DaYr p4OzfNFP2a5/tIIqy0AJHPcBFU1oO6uqfSKFHGRH8b1zquJOZuUE2L/X48Ex79YcSm5j +A/A== 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=a8L8AwV4qdE5/njGYAQ33CWoirWxJ55I+ZVhtLU2cMw=; b=IF617vZCSDgkN1uhA6AZ69jNd/WI2oDHJ3mNwXlfxAhAbxZntaVcwHHilRrNrzKjEr xvrGHYMnWKlxPNj1kBUey+5Yf93/Z44X+08rU2UxeYdTrSTkoBIylvapnWuY67J4CGch xIeNQcsEJd25yLQt0/nYs5h3vlhyAjhqB0xANmY91Z0yRp3EBBi0LgBoY71S1jGOKqgN 53KetrAaTV5sXbi/SCzEgTAMNrQPkFPs3WapAG0WQ2jR9nlVogKTtU4SiMp603hVA/GQ DYd/CVi2hzop7UoRupQWnpBctvkUyxABg3JVk9gxsbL/C/yj4VBW8CWO78YFtLL15hUQ jkVA== X-Gm-Message-State: AOAM5337+tZEHNVkkscB3cwBzPw0OjJ91VnrVr7eeUG8SEJ5BKdV+7Nq TpmXCJYgafyY9OkeisF8vz2sobW2Mng0/Q== X-Google-Smtp-Source: ABdhPJwhvVHMowC+R8msjTRtVNOFVC/43SpUhUgAQKBGZh+58VrI3l8xbb99EXPB622TBIKOylS4yQ== X-Received: by 2002:ac8:6647:: with SMTP id j7mr19426985qtp.335.1597784725019; Tue, 18 Aug 2020 14:05:25 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id u8sm12711328qkj.9.2020.08.18.14.05.24 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:24 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 04/14] drm/msm/dpu: Replace definitions for dpu debug macros Date: Tue, 18 Aug 2020 17:05:00 -0400 Message-Id: <20200818210510.49730-5-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-5-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 e140cd633071..b1e9c529d3b5 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 Tue Aug 18 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: 11722151 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 8D9CF618 for ; Tue, 18 Aug 2020 21:05:34 +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 6B65720786 for ; Tue, 18 Aug 2020 21:05:34 +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="KPoKMG1M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B65720786 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 68F0F6E159; Tue, 18 Aug 2020 21:05:30 +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 D21026E15C for ; Tue, 18 Aug 2020 21:05:27 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id i20so5464091qkk.8 for ; Tue, 18 Aug 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=bW8e3uBqHkmjmdbdif7X59e+BqToe3orNHNdpYwg/LM=; b=KPoKMG1MW4YqCRwjwUY+SQdeOIEFrF4GZ4ngXt4gt8RCsUSNIrcTMzOYy+XSnM7df9 +WPhpIfUB45+k86MdFLdWJQAFp1V8Z/EJ/n8vvyAi2C5U6GE7BChWL5s1wmAzXNYc9cY 2zVucnY37rVjxo+5l2mImn2uJOWftfBWhASJw/Q0iLAP0x3P7A2u3n0DV01VZv/l0RfO tVjnzV5ImKCdvVkQfYK5/sz5i6RoWX6mWJbmM/3tdfLEE6yraCtfo7pVaiqZWqtF4lAz 9xrBiJbXvvO+19MQUcoLehjnaf9iBAClcDRSM/g8zIPDNUA59+VKVs8qAIpGmTQXhs9O YAgQ== 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=bW8e3uBqHkmjmdbdif7X59e+BqToe3orNHNdpYwg/LM=; b=cIYq5xJSDjZM+TYr00FV31IZ7ZoNqHp+kdrjhTt2Ob6Ewgy2A0omSe9Vk8CxV3gfbr PMqMzQpw/93jwzT/VIYczLk3UdKJbbvWtOOPv2JXk9WzlunhevX41u6lpvcJyesWfQ1t wxmiSNjl0EVNo9fYSLYvs4IguzqDPqa8Yzq4os2o13XWkXxvllDD5slm3Oj06DnxHsI5 rBhLj8mWt0aHXVwEZvceuyixTdag1SOBCzfLKBpTHLS7JXBoi5nYnxdtNqdgjLDgdX5Q 99DfYH0AZAjgG/IFfLoWmlwGLjf+UFtcOuVDqvHDU0/PPEL9TQfNDkamKrFEAFE+wRy6 H94g== X-Gm-Message-State: AOAM531sKw/WqfiVQ5wif+dDsV7VPabIS51yW78H0xjYJo98cQjoIsae EwStHFiL0Uct4GTcAJxWLtsFMFFzWz1a+Q== X-Google-Smtp-Source: ABdhPJyZ/TfryNxvM/GNsAP2YIQe6hSzgevrcAxOSmfgaycok6dwNP6cZH1Vo4d9BpqAIwrL4YkKOA== X-Received: by 2002:a37:9c58:: with SMTP id f85mr17969190qke.345.1597784726773; Tue, 18 Aug 2020 14:05:26 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id n33sm24445314qtd.43.2020.08.18.14.05.26 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:26 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 05/14] drm/print: rename drm_debug* to be more syslog-centric Date: Tue, 18 Aug 2020 17:05:01 -0400 Message-Id: <20200818210510.49730-6-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-6-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 Tue Aug 18 21:05:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722157 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 A989316B1 for ; Tue, 18 Aug 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 896F520786 for ; Tue, 18 Aug 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="BIuERJfo" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 896F520786 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 9AC1A6E176; Tue, 18 Aug 2020 21:05:38 +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 865036E159 for ; Tue, 18 Aug 2020 21:05:29 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id t23so16272535qto.3 for ; Tue, 18 Aug 2020 14:05: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 :mime-version:content-transfer-encoding; bh=4Jm090YO1+7FHoZ4sEUb6h6tQUSUe1qBtD8vovVHheQ=; b=BIuERJfoHAy4W0RJt9ym3MaPNXjYJxlLvZp5rXjzwEqyUCb4UTlXEYpfhtfrwtbStx 57+FHZo17bUwUj9sTLrPmAVHKM3hxdj4wr2XVYGcnZjYXdO7KmQHJf6qbz3gB/D3TyIH 1FwydMt3EDMQfwECrD0UOX5K6UNJCsQtvUvJFQzdoXuQCY5s6W0wd/+H91HHOXcwgG0Z bM/aBehQlv2hso2Wxgc6O9Kyfx0cHeVW/hm7Wq4qYJtAYOpYbH9E4nYGPxCYl6eImdGa WzzyfuJuojQbNVmvzLSTWnXm1EwOR+Qh+CLgf93LWP0Zkltq9/CWkyWavuXbasqd7fJ8 yDdg== 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=4Jm090YO1+7FHoZ4sEUb6h6tQUSUe1qBtD8vovVHheQ=; b=Ud1pflS+4O0aRBhKAbIp4K/6OLWWoMrqKpX2x7xe17H6dLaHaBUdPdXJIJQHLtucA9 33/BY5acPzxCNgKT7oNHUu7MLfwbbnT+q9Ww1skFMozp3d2Iq9AgISLYOz8EcrXGAjGN GFUFr5qZ+VpcCBAdP9siRXz/IJcU5G9MbONfGZ5ho2goVtVidaHLqC2OxKgG+0uqAcrh ju7iVoyqS1IVfj27Yy2ZXocZl16edr4+eiwfUZhvTqTSoutwzJyNPIBpEkcmsWYVsvAW 7oXPa0VSGA0P1WGWuq9Z+DXVpLBMPhnWK0J7aVEVWO23xEjC2np68MJSCpLC62K8wmmJ ylFg== X-Gm-Message-State: AOAM530q7liQEfTChYqB+yyQXv7dDfcBmHLhzygNiGwHc9O659+NGJz1 WgaAlbZ+PGmf7OjUr2qLnjY3ClAFL94yxQ== X-Google-Smtp-Source: ABdhPJwLf3rAmtoKhmRGtIOjr48woa6GEjQtQQB79JdFPv1Mc+dhngPPiaTi4tia7I0yvfyPnaEHJg== X-Received: by 2002:aed:2542:: with SMTP id w2mr20474156qtc.272.1597784728452; Tue, 18 Aug 2020 14:05:28 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id m26sm26847712qtc.83.2020.08.18.14.05.27 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:28 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 06/14] drm/amd: Gate i2c transaction logs on drm_debug_syslog Date: Tue, 18 Aug 2020 17:05:02 -0400 Message-Id: <20200818210510.49730-7-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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. Acked-by: Christian König Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-7-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 d55bf64770c4..1600a007344b 100644 --- a/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c +++ b/drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c @@ -232,7 +232,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); } @@ -386,7 +386,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 Tue Aug 18 21:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722153 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 30E29618 for ; Tue, 18 Aug 2020 21:05:36 +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 0F8982080C for ; Tue, 18 Aug 2020 21:05:36 +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="bA/MkqMV" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0F8982080C 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 E06906E15F; Tue, 18 Aug 2020 21:05:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 E3DC16E15F for ; Tue, 18 Aug 2020 21:05:30 +0000 (UTC) Received: by mail-qv1-xf43.google.com with SMTP id v1so8429808qvn.3 for ; Tue, 18 Aug 2020 14:05:30 -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=eJajPBJwhf0xkvC8Oc1cscrVWsD0SBsh6BLFW6m+BMo=; b=bA/MkqMVEoqPMDDqXGTMcOuh3vgMaMyUv5v8E918SbT5O5/Bmpo0lcPtKj3mswdGzm t+R1/VaUG4eNeek3lywAebsyEL0uCcBsP8pFrOwrucewqM+1s/ZrbX9P3Ikqt/MKUQi+ An6e45jeHGHbiOXpeHrSrxyn1WD5fWZokV0KgtzAsEhqYAtSmzU6iT2h8V4wEm853a81 +930vtTmZk9p2WRtgRCUPtWUhrX8SAtYHfLeLmFEFh9UVwqHCKAEf7UbjC+ldfPpnST6 JR7zEPPvTZ4xHTy8nil8KUrWiVdVz7CDZ5BabXkECZYI4AFZwrQkdI1MTG13ftSb1ByB RU9A== 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=eJajPBJwhf0xkvC8Oc1cscrVWsD0SBsh6BLFW6m+BMo=; b=Joy++KxIznDIzMxX/JiEObwajnjSPIG3VxRv66v1ZzqVQo5jV5PrFcMRShy9SQ2QY2 4U6gXp8CCWzYTFmQC3YmTyw31aV0hI6/lMFXDIBRiSCAi/2jVcQQecm5+CeNMh6sRIfk Di8CtxUbyIyLiwSo1Tt/mXdicUA2TuXZKnfpSVyQglHpnAXbdlzcawJeIi/59ECEyrjY udBfbh4q1GSFaYn1tJoumm2og9g+CqQBIm2run4xnLgrnkcRa61O9kLt3L8Bo8i/IOLs OClGf1huT75zQMXmbxMq7Wat6cYICGWUyFrYXDJTrhUEEDBohbDTaMGwRGM0tx7XjWQq PKXA== X-Gm-Message-State: AOAM5316kZYDVZ+kn9/YtiUpXzjuU/tSamQG8oibqzHVGkPn0C6oTQfB SpTntSOmZlNDmitKOCG7B7i/XKMyr391hw== X-Google-Smtp-Source: ABdhPJzFRkhP42kRmIrA72EsPkSlVhVJTe/SUAeZKOcCep0nWKpuXKb8zPuX4Qi0U296GzXp53UHuA== X-Received: by 2002:a0c:c409:: with SMTP id r9mr21332693qvi.123.1597784729953; Tue, 18 Aug 2020 14:05:29 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id c70sm22194733qke.109.2020.08.18.14.05.29 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:29 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 07/14] drm/etnaviv: Change buffer dump checks to target syslog Date: Tue, 18 Aug 2020 17:05:03 -0400 Message-Id: <20200818210510.49730-8-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-8-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 Tue Aug 18 21:05:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722155 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 C5B8B618 for ; Tue, 18 Aug 2020 21:05:37 +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 A476420786 for ; Tue, 18 Aug 2020 21:05:37 +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="fK5xL7M0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A476420786 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 15DF46E165; Tue, 18 Aug 2020 21:05:34 +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 A7FA86E15F for ; Tue, 18 Aug 2020 21:05:32 +0000 (UTC) Received: by mail-qk1-x744.google.com with SMTP id p4so19717790qkf.0 for ; Tue, 18 Aug 2020 14:05:32 -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=z3nr2eJmSOi62JFIuGHkSIz5KDvp6E7rh06KhWhu6M8=; b=fK5xL7M0k6zGSuTtpdg61V+WOvN6fcra6ecOTC45D8KXHmU61sCoiWiXdQhvFARlNT /UlTMlnQ88uZUMCqwBTL/L2ZYQpwamFZSbX7eHqVrr4nIgpe99AHkgGz/WBRDNp2O+h+ uDz+91eKI2yLB7HuZtnOCT/LvIIkT1/DP66vyiFbNjxPdVfy4FqIIHMbt9pd9S9S3wqw MQJlER3Rh1iKwkDDmlVrnmfW4BC5VeEF0rTkIHFTEgp7fCGYDozPE5e/X3Y/golxCpBR DTg7hH+suOYTFMcF/gZa/z03ME7hzjXDrbcMKcxCUECFs4vB6fErFrekyCBI/P0HgM+t lUrQ== 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=z3nr2eJmSOi62JFIuGHkSIz5KDvp6E7rh06KhWhu6M8=; b=V25hzAKR+K+JJo0vG8/UT3CNkWOkKjdd/wOxl4i1PZZq11pEZ9PeD8+z7OcZqGyQoq etacuN5rubG3IVG0puIoyBa37kpljN3n1kOeg/z19pGQWxhyxxmuPHfdSbEB4jErgAhR 1AetibQJahvd2kRDSRR3A2jYf26IgDQmEalS//Jw13Z+82URs22v1s+2JnTBTmI/tdNB U54sxNaaR/9NHda16E00pSjKSvpmu/kYjafwmzgDU4+uY/b44GB8B8u/UiN6KUWFtb8Y Ewqp3gw9h000wfHpDy4gt5irTM21igPxOSVtC0TryQPBEcCYakVpW7Oo89c7fjOecVwq e44A== X-Gm-Message-State: AOAM532qKPUSjmTinl2aZ3/hpO8GCgC+bO10F6pZg9lBDXiSbMeQcU4M 6ii5awHWK2vaJulFMh4accVdTcmGWGxK6A== X-Google-Smtp-Source: ABdhPJwDdaIfcdTO4V4WCRpNgAYCfdR3EVtqnS9Tlh/Uw1mZf2TnIM4KC0hAhUoHiwDSypr5cYFatQ== X-Received: by 2002:a37:87c3:: with SMTP id j186mr18302075qkd.480.1597784731525; Tue, 18 Aug 2020 14:05:31 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id z67sm22493006qkb.27.2020.08.18.14.05.30 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:31 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 08/14] drm/nouveau: Change debug checks to specifically target syslog Date: Tue, 18 Aug 2020 17:05:04 -0400 Message-Id: <20200818210510.49730-9-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-9-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -Rebased on drm-tip, changes in dispnv50/disp.h were rebased out --- drivers/gpu/drm/nouveau/nouveau_drv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index f63ac72aa556..70be12038b0c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h @@ -258,11 +258,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 Tue Aug 18 21:05:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722159 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 C99C3618 for ; Tue, 18 Aug 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 A7A48207DE for ; Tue, 18 Aug 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="Fg3syOng" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7A48207DE 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 839536E160; Tue, 18 Aug 2020 21:05:40 +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 6DF566E160 for ; Tue, 18 Aug 2020 21:05:34 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id x12so16275820qtp.1 for ; Tue, 18 Aug 2020 14:05:34 -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=hGd4aWXfsui6GlGvaQ8Y+ngFXo7KbA+/KXZJ2+0qfkQ=; b=Fg3syOngC0WhL1/3cVurqICo1ihaz/AY81Zwb5nvKlGCx6QeyTnJ+JyWZA8vO0+DYY W8n8Q2/J9wt1aK7h+k3+XToVK6jx36q+5NfgCOWfb4+ZgBmiv19FAeuiEiimUIFlvna0 SywoXRXaYiq1saZNysIfROGG2mrfLyRIPxpRAvWgtu9huD285CdmEE2hwoMs1m1ag1Js ZhExWatfLrEZOBrCEq+kRvInvx5GE1vQJomYvLTONqpfge400CimF42ZUxeWfWsHtTZR VD2znQxmPzwUGKT3KV0AWUBDKPA5zyBf+j566dHzbRcWfMhYKBI2n2cGvjBAqHNAfLdK QhrA== 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=hGd4aWXfsui6GlGvaQ8Y+ngFXo7KbA+/KXZJ2+0qfkQ=; b=LBMSdSppGfhSQv1q08uXtaOtuLCl51eSVBLPAS7W3nWbno/8peOjXKbUKHyBy3Royq NYmpjA4D69cMrv0oofp7aYto3QggyZDBkGVj63iyOXnpTfkoEicYHJRnht5cjz14W91j EHZFR4KhnbjAlHxkTFm2SUuZ6n9j+qFBj5lkHMJGiDtkTWSPm2hriqb/K8gmoiW0GyxT 7W6noRCMxTRjmno2njVFQsWJsxLTB+nQ4rLj8g+q5tqTIFsCcmgUeXlKGFCOn9es3GBh MVx68SbUftjgZieEHM19YYug0uDF2FL+OyCZm+eW9inmP6/O31kJ9fGRSeGCHYJ/ed4T 0hfQ== X-Gm-Message-State: AOAM533F5o8YamHMO8FTbQQkU8bjAViObJ+neRzirpUqAu5LJ0HxOP8P Mfiq3Cz7KRAl7P3Appg6YlMI2zGtXextJw== X-Google-Smtp-Source: ABdhPJyDNfsVTu9tBQdql8vBUU/atK304YCY37Ukac/1aFKt92ApZE6UjPUg6gw3v4wptWmbsp/cAg== X-Received: by 2002:ac8:4f4b:: with SMTP id i11mr19238951qtw.379.1597784733310; Tue, 18 Aug 2020 14:05:33 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id k48sm27005393qtk.44.2020.08.18.14.05.32 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:32 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 09/14] drm/i915: Change infoframe debug checks to specify syslog Date: Tue, 18 Aug 2020 17:05:05 -0400 Message-Id: <20200818210510.49730-10-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-10-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 2ddabf92adde..30dcc8a2daa7 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -12908,7 +12908,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); @@ -13551,7 +13551,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 Tue Aug 18 21:05:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722161 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 612A5618 for ; Tue, 18 Aug 2020 21:05:43 +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 403FA207BB for ; Tue, 18 Aug 2020 21:05:43 +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="LVeVX+1F" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 403FA207BB 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 E41776E179; Tue, 18 Aug 2020 21:05:40 +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 30A416E160 for ; Tue, 18 Aug 2020 21:05:36 +0000 (UTC) Received: by mail-qt1-x844.google.com with SMTP id h21so16232884qtp.11 for ; Tue, 18 Aug 2020 14:05:36 -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=YrA4VD7LMt7jGVDFOfcic96wsSZTFB7F/vjDjkwUjIo=; b=LVeVX+1FDqwo3Eapc/1wcVZmMH3yxfGsPsSpjAyyGsddAFR7OxOZEvBIRGHPoSdxf/ GdsDMYnjBRtQmLpK71URDZbBISYHDBD9C3u+5JJxDOU80ODDUNAot/GPhRCQlRh7vcrq KkGyHvPEBFADaAXIGrZwoOWAeD+6aP45rQpp5rwxsopCXzng1AMJ1b/9iOaRWDHI+zrF 3IHPhvnvCa2wOvrj8YjNX77Y0WoPWwHczV6pLT78jioBPLi9/enlj8ge20XvGUKYY88I V5+bmSkvG+nqxDv7WSJoUM3uYop6c5NvkxEYZQVba5K8jWkjJ01e0uCnR7bDwjrNM16q uWQw== 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=YrA4VD7LMt7jGVDFOfcic96wsSZTFB7F/vjDjkwUjIo=; b=r0iHdFYJ3g54L84l9Oomg2yrf9z9bsQoQrjkJ8hzzqPRgHIECNAAVBi/3uhSAXcuZk vitLeZIna8fyYVVqfYNZj1WCKpiufnnlmKAV9Odcnu+iqOxchSSAU87CHv1AjEUtaK0F EC3nU71qo/uj6ouBuVZm+S8hdcFs72qIZRw19m+tNELGefNa61Sm71rcq9sVSRqVBF1i HadPdAf/yzT7FNX5obWAD8KYUYyVjx/4T05oEqTwYyxO9gQbcTeHJqYGnngSvtnpa+e5 RcQ4p+jk1WcXH0gfqPURMmKvHyqSLlk+DSkEGn6lvG26AD9lXdwM2gFiTTF2wB36zaJo ilgg== X-Gm-Message-State: AOAM533JO/3AuoPIVavm1PP0vr9dUxZ+yltGKsOXrRMxo0EuGt9EKdLU dtdDoF4t5NYyQBDdayJRtYK1MO1v2WT4tg== X-Google-Smtp-Source: ABdhPJw5tlCftPr/03lVYNUHKagjgmyNNCOhlgK5OlL4fczrhFOAEBP+hSdfPsKcv/8pfNs2hqPZ9w== X-Received: by 2002:ac8:65d3:: with SMTP id t19mr19722915qto.193.1597784734984; Tue, 18 Aug 2020 14:05:34 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id n23sm21993546qkk.105.2020.08.18.14.05.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:34 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 10/14] drm/print: Add drm_debug_category_printer Date: Tue, 18 Aug 2020 17:05:06 -0400 Message-Id: <20200818210510.49730-11-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-11-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 Tue Aug 18 21:05:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722163 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 CFB3A618 for ; Tue, 18 Aug 2020 21:05: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 ADB0120786 for ; Tue, 18 Aug 2020 21:05: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="ViDs7zy5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADB0120786 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 6AFB96E17E; Tue, 18 Aug 2020 21:05:44 +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 A13B46E160 for ; Tue, 18 Aug 2020 21:05:37 +0000 (UTC) Received: by mail-qk1-x744.google.com with SMTP id j187so19656526qke.11 for ; Tue, 18 Aug 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=7xgwcYWpQF7hmZEi+axwrpWRaGn1fsxoBJfi6eNB9G8=; b=ViDs7zy555y2VrZd/AKA2qOG3phqo/RYe+1TgqDZEMUsdTp2kimaidZm2B2PmcFnki ubW9EEd2veM8uRtXkXCQHg805jRvGBhT5tlSuGCIlzVNVcHBO9K/NcfqXaJaI439H1Xk 9ghx5URmmyegBNY19mQivkoatm5xoeQyijdpzEoJl2dc9kI5vpkJA2GOLcauvLx1rVSO ma+aeb0gikOCpRe67conDu1EfUFmNvn8Q+97rdp+Hcv7aFcw4vJE6nuxChAcbDMzjzJ8 pfMSQHt1nChVxiDnYMStc+FvUMPncWUmurrOoM/bKQI6Byij/J2JqJSYnLp7Be/ppz3z Hq3w== 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=7xgwcYWpQF7hmZEi+axwrpWRaGn1fsxoBJfi6eNB9G8=; b=MJ044j1gEMUVH8qN6CTO0w2GZBpurpb13yxzbUCxfRDMRPpyVBy8/tUEoooYRuY5uY +AE2zP50dtPdAXoHijzEKLh++GBlYj9Tggxyt8Q8y7dBJIJ2vxYqTU7G/1Zk/VsV+Rvu On+Tczbp1JAkLTIBoWNT3QG68imHspG9ASTUJjvj/SXq7GoRg4lSyNblwmOtU5kgYpSr 7lM4SYKCALsvi0yG0iw4Ju1JuubvwYB5MOF2caI2y1LwrevHEs68K1uUNbWYHXCT41Qx +8cPeGDE5tqKPvPQRSLYB1Fk4wUuHTYJ+mzLGMdvcJG0+2Tm6rD0b1RrdvcgmtsU7h1/ W1Rw== X-Gm-Message-State: AOAM533/s8/U/yAmBJIaPaxZq3cSG2bPKI1W7Y4FplKlAJl/5A05Enen 0YUMa4XqxPNr5sJnt9uBGHVa1fTMNJs9Dg== X-Google-Smtp-Source: ABdhPJyISwZDg0v+3Ylyc/Xy5Yr6auZoviHPXm6Kf7ldakzD/vuG7yRbjv40bkilsxxq1yDll4X4GA== X-Received: by 2002:a37:6c3:: with SMTP id 186mr18743961qkg.457.1597784736612; Tue, 18 Aug 2020 14:05:36 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id k5sm24434488qtu.2.2020.08.18.14.05.36 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:36 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 11/14] drm/mst: Convert debug printers to debug category printers Date: Tue, 18 Aug 2020 17:05:07 -0400 Message-Id: <20200818210510.49730-12-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-12-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None Reviewed-by: Lyude Paul --- 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 67dd72ea200e..127120b60580 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1242,7 +1242,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); } @@ -2781,7 +2782,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); @@ -2825,7 +2827,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 Tue Aug 18 21:05:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722165 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 5200614F6 for ; Tue, 18 Aug 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 30F9020786 for ; Tue, 18 Aug 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="MTij03kd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30F9020786 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 7BB8E6E17F; Tue, 18 Aug 2020 21:05:44 +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 33FC56E160 for ; Tue, 18 Aug 2020 21:05:40 +0000 (UTC) Received: by mail-qk1-x744.google.com with SMTP id d14so19669398qke.13 for ; Tue, 18 Aug 2020 14:05:40 -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=QjFDNFT8J4hCdfQ/qctieZPGMH8zAiIH2OxQX1b7gbE=; b=MTij03kdn6A5Fsd3JykXHo9wNSsfiqNiifc+1IfgC88aL65788c3f2GgGiMQG+Eiiu OTGEm7I9C2qJViUMt/UULF5rb3UCWOyBokRDDZWQsYwniEsQc24jX+S/lL3iyZHZOhor O25Sx0WbtK9UPMAnUfyzYYbdKEHV7Hm2oZmtPFiD0UqLyj3YVEZSD0Iybyy7GSpWGha/ +jSE7/ILEBD6FSH+eQqZk42ogIqyz492onMxP2+nWClK1nxdi/yxNt7F8RloSU41vUOJ I7AKzRvfqLvdyZKx2ZBHK+5xEAVRO5l+y6H85BU0Y9UFt5QVu8ls4O/XUpI/jCWP8e6t YLMA== 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=QjFDNFT8J4hCdfQ/qctieZPGMH8zAiIH2OxQX1b7gbE=; b=Vm7wQwCtq/zbgkM8sqDaL+97YkTDjYXLGrj30I+dFAXBXUWvoz92LVPAuF/BRhcSzv iczTR5HMzAa11cRlnJH1lk4W6VkdYp+b4WwEQFXU6M+G0xZzjHSSS8JNCu+HIJ7F3U9y pJkMjJfj8wmQQlJ4vEYsLhv2GbFzBpV4VWK83hoJVJ2I8JPCrgaYCZGd89OEzgGszZC+ KdhMgQyLVPNzJAv604fzOkNUVLMa4h6zEjer4dIK6KtoSEJfAiZ5CGXXdiQZiiPiCnI1 f9Mv752Ou8R1s8iKEO83M1ym/9M5Z7zj/jrfxQFVTLYKM6gC+k9IdZsRGS7NB6m17HAd slXw== X-Gm-Message-State: AOAM532KiyBwRlPeaJc4VTTJzxa2o/dvaemYH1OsMZACz1I0RFZwg4dO Hkw+XI6EZ0fV7k7ogyEqQzJGg4mC7JYDmQ== X-Google-Smtp-Source: ABdhPJzKMXvgx0XyPwX3VoTBfYaw8muEILrg/Io1+tiMnn6bYQVfIzRYesjIuinFMeyiiRKQkYypnA== X-Received: by 2002:ae9:e8ca:: with SMTP id a193mr18933254qkg.6.1597784738227; Tue, 18 Aug 2020 14:05:38 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id n33sm24445866qtd.43.2020.08.18.14.05.37 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:37 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 12/14] drm/i915: Use debug category printer for welcome message Date: Tue, 18 Aug 2020 17:05:08 -0400 Message-Id: <20200818210510.49730-13-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-13-sean@poorly.run #v5 Changes in v5: -Added to the set Changes in v6: -None --- 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 00292a849c34..0206be123b28 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -872,7 +872,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 Tue Aug 18 21:05:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722167 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 031E814F6 for ; Tue, 18 Aug 2020 21:05:49 +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 D620A2078D for ; Tue, 18 Aug 2020 21:05:48 +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="WAutCtk2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D620A2078D 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 E210E6E185; Tue, 18 Aug 2020 21:05:44 +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 1F2B66E17E for ; Tue, 18 Aug 2020 21:05:41 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id 62so19674578qkj.7 for ; Tue, 18 Aug 2020 14:05:41 -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=pXkXss55rzS0+J1j9G8LMC0JZgD8Ur2mdy76naLbvow=; b=WAutCtk2nyozjMSBlmFY17jetDNC4bvP4BhC0GQXYXAfAoFeqajlBOhbc1+/Plpybv IP7ZhsOEYJ//bh4b9uvTFDpPut+1p6mh+4/cPZr5NCMRZqNRwpjnbY5TAvnZdQGq0fNB t7ZwgQpfNYDSEpEjKtyuQDhWvBnFgjXYfh5zCiLtliTfNrXHiX3He8EmFbE4wUmk/+MZ S2SnWFd7+ea+YaqahtcWsDObs+qi+NGdRzxnwUdOKZR49OwPfW+OND/aR9xtt5tcO4GT uSQLJkP0B5fTEZLiH2ga1bx/wlcYIyNX312p3yRLSgemAASX1v1VXuFH0KexhUjTgSIi Hktw== 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=pXkXss55rzS0+J1j9G8LMC0JZgD8Ur2mdy76naLbvow=; b=d5eWJdrxSqHGPw/3XFNTdHrPGUbzY2uuStnVFYo3ft8RUzc0LBaYdkLhN7a1AepgZ+ QSjWm9poMbYoMuO/oIszc+fQf1W/sG3bn0SJtdko7wdu2EG9gx77wm0fLP5izq3XrLa8 +n1moUcJuvjCEy8Q6g/Fnojsss/LTHHJyzj6cMuqPfF83mz2nOolkkNhz8q69pdis4EE sL3q3ySw/rHpnThQLI2gp7CQh/cU6E6V1E+k7rmGb7LHjgN+FYtpB5DiqGTbr4PW7+6k JXO5Qrgj+CxCm1F1Vn0mNmjJj2mUAWa9UCCm++KJ/3fXX3HvPzTNdv/N485GwxBF/G8S RvlQ== X-Gm-Message-State: AOAM533UZpNL00/bEGTaOjtkmHEKNxGezvM6xAuI44j3XzX6SDdTU+8y sJGSpUp0HxNFWp/0g21lq9FiRHtmULdBRQ== X-Google-Smtp-Source: ABdhPJyGv57BDi7otsY4P77LrwXSLTFc/7q5MJRZ7dGvfqc5idTKZescuPzVgq2m+wxYV33subOqAw== X-Received: by 2002:a05:620a:15e9:: with SMTP id p9mr19658161qkm.38.1597784740107; Tue, 18 Aug 2020 14:05:40 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id b37sm26385985qtk.85.2020.08.18.14.05.39 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:39 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 13/14] drm/atomic: Use debug category printer for atomic state printer Date: Tue, 18 Aug 2020 17:05:09 -0400 Message-Id: <20200818210510.49730-14-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul The atomic state is printed if the DRM_UT_STATE is active, but it's printed at INFO level. This patch converts it to use the debug category printer so: a- it's consistent with other DRM_UT_STATE logging b- it's properly routed through drm_trace when introduced Signed-off-by: Sean Paul Changes in v6: -Added to the set --- drivers/gpu/drm/drm_atomic.c | 5 +++-- drivers/gpu/drm/drm_atomic_uapi.c | 2 +- drivers/gpu/drm/drm_crtc_internal.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 58527f151984..96b804e85903 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1543,9 +1543,10 @@ int __drm_atomic_helper_set_config(struct drm_mode_set *set, } EXPORT_SYMBOL(__drm_atomic_helper_set_config); -void drm_atomic_print_state(const struct drm_atomic_state *state) +void drm_atomic_print_state(const struct drm_atomic_state *state, + const char *prefix) { - struct drm_printer p = drm_info_printer(state->dev->dev); + struct drm_printer p = drm_debug_category_printer(DRM_UT_STATE, prefix); struct drm_plane *plane; struct drm_plane_state *plane_state; struct drm_crtc *crtc; diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 25c269bc4681..c6f3c652f47c 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -1413,7 +1413,7 @@ int drm_mode_atomic_ioctl(struct drm_device *dev, ret = drm_atomic_nonblocking_commit(state); } else { if (drm_debug_enabled(DRM_UT_STATE)) - drm_atomic_print_state(state); + drm_atomic_print_state(state, "commit_state"); ret = drm_atomic_commit(state); } diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index da96b2f64d7e..077ea92fb12a 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -233,7 +233,8 @@ int __drm_atomic_helper_disable_plane(struct drm_plane *plane, int __drm_atomic_helper_set_config(struct drm_mode_set *set, struct drm_atomic_state *state); -void drm_atomic_print_state(const struct drm_atomic_state *state); +void drm_atomic_print_state(const struct drm_atomic_state *state, + const char *prefix); /* drm_atomic_uapi.c */ int drm_atomic_connector_commit_dpms(struct drm_atomic_state *state, From patchwork Tue Aug 18 21:05:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11722169 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 7974C618 for ; Tue, 18 Aug 2020 21:05:50 +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 5794920786 for ; Tue, 18 Aug 2020 21:05:50 +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="gWnlyjdc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5794920786 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 57DFE6E182; Tue, 18 Aug 2020 21:05:46 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) by gabe.freedesktop.org (Postfix) with ESMTPS id E92A26E17E for ; Tue, 18 Aug 2020 21:05:43 +0000 (UTC) Received: by mail-qk1-x731.google.com with SMTP id m7so19655386qki.12 for ; Tue, 18 Aug 2020 14:05: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 :mime-version:content-transfer-encoding; bh=mG081VWh41E/74h1YNTDo3z34D+ykCssbL82TFjYiUY=; b=gWnlyjdckR9w9wISCKWoP8VJ3JWSNidL5/I15ThKTdy54xREO0Ux2vbBkOBD12H7cT UNH/+7bsomRF+Wav5eLyLmBGykubhZ7hPcGcbgRKq+z+oZt8J0gLMIxqChNAiORs/mrX O2b/CSc+JggRh9ED4mm/uJjp9U7kwMwGb82e6o6ytRJNpYgwl+TS65laCGDhIh6LPAK1 c/UfNQPBkZy5B9uZAbrQieApSZEl4tR48aElUR6jeONaO5q9ynf0Wue86m72uocjuxY6 hGEfRTX72xKCkfCNNeJbwfoP/O8NHcgb9TiwMFUejseBqEy4EdL/EKT7780RhKBAVllu EkrA== 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=mG081VWh41E/74h1YNTDo3z34D+ykCssbL82TFjYiUY=; b=qvWbdoSoeBYFgSDFqVcDKp5afHB6svjfy/E7s3GhslM74A5sJu7wBNffnF3gkrM0nZ Oo0eykKpFYrZRa1vJp23TUunvcitrndAot183tFZ1pbBErUP98IofYlJBGFrn/VcZODl UhO9sdVC4TQa7skTCHnPqcbQ/WZ7f5Kmhbm8rEympW30hd+/LvijkRRlyq1BSKHdMaSi weghDebzQ5A0xPuMpH2v6rZ65AwKUwFpveT7hnScd6sC3rhRQINxU5u8JTrVDdRbQSsv /nNxrdTySOBe14FqY1cT38aLDlraIjhkzeBhufDkbKyrks+GYtLQ4I/6duZwPhjdQsGj 033Q== X-Gm-Message-State: AOAM530x6boyJQXdmNauHu0JsfT+eAHWORJ9GMR61YI0LhByYjangl96 HHOiS/aHIR0mkBDxY5oedBjO+GGE/ODRdw== X-Google-Smtp-Source: ABdhPJwKpPW/hXejU7QleeDt4A958x/0+e2SWV0cnsIUGRK7yXFTqb18QwZaZi0kX47wMhJGpoOZrw== X-Received: by 2002:a37:5dc6:: with SMTP id r189mr18573740qkb.364.1597784741960; Tue, 18 Aug 2020 14:05:41 -0700 (PDT) Received: from localhost (mobile-166-177-184-140.mycingular.net. [166.177.184.140]) by smtp.gmail.com with ESMTPSA id l189sm22081532qke.67.2020.08.18.14.05.41 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 14:05:41 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, seanpaul@chromium.org, airlied@linux.ie Subject: [PATCH v6 14/14] drm/print: Add tracefs support to the drm logging helpers Date: Tue, 18 Aug 2020 17:05:10 -0400 Message-Id: <20200818210510.49730-15-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818210510.49730-1-sean@poorly.run> References: <20200818210510.49730-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: daniel.vetter@ffwll.ch, Steven Rostedt , Chris Wilson 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 Acked-by: Pekka Paalanen 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200608210505.48519-14-sean@poorly.run #v5 Changes in v5: -Re-write to use trace_array and the tracefs instance support Changes in v6: -Use the new trace_array_init_printk() to initialize global trace buffers Reported-by: kernel test robot --- Documentation/gpu/drm-uapi.rst | 6 + drivers/gpu/drm/drm_drv.c | 3 + drivers/gpu/drm/drm_print.c | 216 ++++++++++++++++++++++++++++----- include/drm/drm_print.h | 63 ++++++++-- 4 files changed, 248 insertions(+), 40 deletions(-) diff --git a/Documentation/gpu/drm-uapi.rst b/Documentation/gpu/drm-uapi.rst index 7dce175f6d75..0297ff71f8f8 100644 --- a/Documentation/gpu/drm-uapi.rst +++ b/Documentation/gpu/drm-uapi.rst @@ -424,6 +424,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 13068fdf4331..555b40580497 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -1107,12 +1107,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..6b11143d1ab2 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,104 @@ 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() +{ + int ret; + + trace_arr = trace_array_get_by_name("drm"); + if (!trace_arr) + return; + + ret = trace_array_init_printk(trace_arr); + if (ret) + drm_trace_cleanup(); +} +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); + trace_arr = NULL; + } +} +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 *