From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 6CB82C7EE23 for ; Wed, 7 Jun 2023 08:46:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 21D0E10E474; Wed, 7 Jun 2023 08:45:43 +0000 (UTC) Received: from sender-of-o51.zoho.in (sender-of-o51.zoho.in [103.117.158.51]) by gabe.freedesktop.org (Postfix) with ESMTPS id BC57310E257 for ; Tue, 6 Jun 2023 18:30:36 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1686076228; cv=none; d=zohomail.in; s=zohoarc; b=Tno1bljdkHcYVc6K+67s1v9F18IfA0aJ74noJFJd+XRISspolsMlQFQpC9FFFVPu65dnQntpkbQcO+ZjRnwFHJihuYaHDmuLsY9HngaThOL8EYJEr/x5M/U/optSWoe+9aEPN8t4j+eWWrYY+5ixx+Ozjr0FSbm9CAO7PsnKbO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1686076228; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=E3wsEOm0W4tH0/8fNIF9dAj0SXCaI/2HSNkzbMWF33M=; b=AFPJ/xgKUgxslrmCA5n/qWdWfd5cP/C2yT9zngJW2yG2xVgqt/5xRL2mtxkQozWqKOxRaa6PfD/Llozh+h7i7GZd916WfFzzeWGCw9ihYU43kZTlVjNAC6gfIEBuDG7b3GbDEYGWz0dh32G/GjF+/ILVxih+BRy4BV3Oz2LsmKs= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1686076228; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=E3wsEOm0W4tH0/8fNIF9dAj0SXCaI/2HSNkzbMWF33M=; b=kT04OZUyINNnU2sA56CYvwdAwq4qGoQVx4d7KY0Hh14wASxUdaJtbYNy8M9KGHTU bkqtwgHRDGjwpl+CpLnGJq4QQ3vRz14Njf4qA8OqmksgsXil+vbEJ/Debureek6ztYS 2q9kjulAq6L8abdhSIR8ZRPTDhS1QXgw70veLnb8= Received: from kampyooter.. (122.176.141.156 [122.176.141.156]) by mx.zoho.in with SMTPS id 1686076227912514.4061259697124; Wed, 7 Jun 2023 00:00:27 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Jani Nikula , Laurent Pinchart Message-ID: Subject: [PATCH v10 2/9] drm/print: Fix and add support for NULL as first argument in drm_* macros Date: Wed, 7 Jun 2023 00:00:03 +0530 X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset=utf8 X-Mailman-Approved-At: Wed, 07 Jun 2023 08:45:25 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Suraj Upadhyay Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Comments say macros DRM_DEBUG_* are deprecated in favor of drm_dbg_*(NULL, ...), but they have broken support for it, as the macro will result in `(NULL) ? (NULL)->dev : NULL`. Thus, fix them by separating logic to get dev ptr in a new function, which will return the dev ptr if arg is not NULL. Use it in drm_dbg_*, and also in __DRM_DEFINE_DBG_RATELIMITED, where a similar (but correct) NULL check was in place. Also, add support for NULL in __drm_printk, so that all the drm_* macros will hence support NULL as the first argument. This also means that deprecation comments mentioning pr_()* can now be changed to the drm equivalents. Reviewed-by: Laurent Pinchart Signed-off-by: Siddh Raman Pant --- include/drm/drm_print.h | 79 +++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 27 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a93a387f8a1a..4b8532cf2ae6 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -34,6 +34,7 @@ #include =20 #include +#include =20 /* Do *not* use outside of drm_print.[ch]! */ extern unsigned long __drm_debug; @@ -451,9 +452,32 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct = device *dev, * Prefer drm_device based logging over device or prink based logging. */ =20 +/* Helpers for struct drm_device based logging. */ + +/** + * __drm_dev_ptr - Helper function to get drm->dev pointer. + * @drm: struct drm_device pointer. + * + * RETURNS: + * The struct device pointer (NULL if @drm is NULL). + */ +static inline struct device *__drm_dev_ptr(const struct drm_device *drm) +{ +=09if (drm) +=09=09return drm->dev; + +=09return NULL; +} + /* Helper for struct drm_device based logging. */ #define __drm_printk(drm, level, type, fmt, ...)=09=09=09\ -=09dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__) +({=09=09=09=09=09=09=09=09=09\ +=09struct device *__dev_ =3D __drm_dev_ptr(drm);=09=09=09\ +=09if (__dev_)=09=09=09=09=09=09=09\ +=09=09dev_##level##type(__dev_, "[drm] " fmt, ##__VA_ARGS__);=09\ +=09else=09=09=09=09=09=09=09=09\ +=09=09pr_##level##type("[drm] " fmt, ##__VA_ARGS__);=09=09\ +}) =20 =20 #define drm_info(drm, fmt, ...)=09=09=09=09=09\ @@ -487,25 +511,25 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct= device *dev, =20 =20 #define drm_dbg_core(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__) -#define drm_dbg_driver(drm, fmt, ...)=09=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS_= _) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_CORE, fmt, ##__VA_ARGS__) +#define drm_dbg_driver(drm, fmt, ...)=09=09=09=09=09\ +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__) #define drm_dbg_kms(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_KMS, fmt, ##__VA_ARGS__) #define drm_dbg_prime(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__= ) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__) #define drm_dbg_atomic(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS_= _) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) #define drm_dbg_vbl(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_VBL, fmt, ##__VA_ARGS__) #define drm_dbg_state(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__= ) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_STATE, fmt, ##__VA_ARGS__) #define drm_dbg_lease(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__= ) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__) #define drm_dbg_dp(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_DP, fmt, ##__VA_ARGS__) #define drm_dbg_drmres(drm, fmt, ...)=09=09=09=09=09\ -=09drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS_= _) +=09drm_dev_dbg(__drm_dev_ptr(drm), DRM_UT_DRMRES, fmt, ##__VA_ARGS__) =20 #define drm_dbg(drm, fmt, ...)=09drm_dbg_driver(drm, fmt, ##__VA_ARGS__) =20 @@ -533,31 +557,31 @@ void __drm_err(const char *format, ...); #define _DRM_PRINTK(once, level, fmt, ...)=09=09=09=09\ =09printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_info(). */ +/* NOTE: this is deprecated in favor of drm_info(NULL, ...). */ #define DRM_INFO(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice(). */ +/* NOTE: this is deprecated in favor of drm_notice(NULL, ...). */ #define DRM_NOTE(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn(). */ +/* NOTE: this is deprecated in favor of drm_warn(NULL, ...). */ #define DRM_WARN(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_info_once(). */ +/* NOTE: this is deprecated in favor of drm_info_once(NULL, ...). */ #define DRM_INFO_ONCE(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice_once(). */ +/* NOTE: this is deprecated in favor of drm_notice_once(NULL, ...). */ #define DRM_NOTE_ONCE(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn_once(). */ +/* NOTE: this is deprecated in favor of drm_warn_once(NULL, ...). */ #define DRM_WARN_ONCE(fmt, ...)=09=09=09=09=09=09\ =09_DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_err(). */ +/* NOTE: this is deprecated in favor of drm_err(NULL, ...). */ #define DRM_ERROR(fmt, ...)=09=09=09=09=09=09\ =09__drm_err(fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_err_ratelimited(). */ +/* NOTE: this is deprecated in favor of drm_err_ratelimited(NULL, ...). */ #define DRM_ERROR_RATELIMITED(fmt, ...)=09=09=09=09=09\ =09DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__) =20 @@ -593,13 +617,14 @@ void __drm_err(const char *format, ...); #define DRM_DEBUG_DP(fmt, ...)=09=09=09=09=09=09\ =09__drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__) =20 -#define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...)=09=09=09=09= =09\ -({=09=09=09=09=09=09=09=09=09=09=09=09\ -=09static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_= RATELIMIT_BURST);\ -=09const struct drm_device *drm_ =3D (drm);=09=09=09=09=09=09=09\ -=09=09=09=09=09=09=09=09=09=09=09=09\ -=09if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_))=09=09= =09\ -=09=09drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARG= S__);=09\ +#define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...)=09=09\ +({=09=09=09=09=09=09=09=09=09\ +=09static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL,=09\ +=09=09=09=09 DEFAULT_RATELIMIT_BURST);=09=09\ +=09=09=09=09=09=09=09=09=09\ +=09if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_))\ +=09=09drm_dev_printk(__drm_dev_ptr(drm), KERN_DEBUG,=09=09\ +=09=09=09 fmt, ## __VA_ARGS__);=09=09=09\ }) =20 #define drm_dbg_kms_ratelimited(drm, fmt, ...) \ --=20 2.39.2