From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH RESEND 7/8] drm/print: group logging functions by prink or device based
Date: Fri, 1 Nov 2019 13:25:51 -0700 [thread overview]
Message-ID: <20191101202551.GL20514@intel.com> (raw)
In-Reply-To: <51c70d80e7dd06c49ba3be56fbb6ae70edddc102.1572258936.git.jani.nikula@intel.com>
On Mon, Oct 28, 2019 at 12:38:21PM +0200, Jani Nikula wrote:
> In preparation for adding struct drm_device based logging, group the
> existing functions by prink or struct device based logging. No
> functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> include/drm/drm_print.h | 135 ++++++++++++++++++++++------------------
> 1 file changed, 74 insertions(+), 61 deletions(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 13f65394376e..085a9685270c 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -320,6 +320,10 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
> return unlikely(__drm_debug & category);
> }
>
> +/*
> + * struct device based logging
> + */
> +
> __printf(3, 4)
> void drm_dev_printk(const struct device *dev, const char *level,
> const char *format, ...);
> @@ -327,30 +331,6 @@ __printf(3, 4)
> void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
> const char *format, ...);
>
> -__printf(2, 3)
> -void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> -__printf(1, 2)
> -void __drm_err(const char *format, ...);
> -
> -/* Macros to make printk easier */
> -
> -#define _DRM_PRINTK(once, level, fmt, ...) \
> - printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO(fmt, ...) \
> - _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE(fmt, ...) \
> - _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN(fmt, ...) \
> - _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> -
> /**
> * Error output.
> *
> @@ -359,8 +339,6 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_ERROR(dev, fmt, ...) \
> drm_dev_printk(dev, KERN_ERR, "*ERROR* " fmt, ##__VA_ARGS__)
> -#define DRM_ERROR(fmt, ...) \
> - __drm_err(fmt, ##__VA_ARGS__)
>
> /**
> * Rate limited error output. Like DRM_ERROR() but won't flood the log.
> @@ -377,10 +355,8 @@ void __drm_err(const char *format, ...);
> if (__ratelimit(&_rs)) \
> DRM_DEV_ERROR(dev, fmt, ##__VA_ARGS__); \
> })
> -#define DRM_ERROR_RATELIMITED(fmt, ...) \
> - DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> -#define DRM_DEV_INFO(dev, fmt, ...) \
> +#define DRM_DEV_INFO(dev, fmt, ...) \
I believe you could skip this chunk...
other than this:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> drm_dev_printk(dev, KERN_INFO, fmt, ##__VA_ARGS__)
>
> #define DRM_DEV_INFO_ONCE(dev, fmt, ...) \
> @@ -400,41 +376,18 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_DEBUG(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG(fmt, ...) \
> - __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER(fmt, ...) \
> - __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS(fmt, ...) \
> - __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_PRIME(fmt, ...) \
> - __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_ATOMIC(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_ATOMIC(fmt, ...) \
> - __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_VBL(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_VBL(fmt, ...) \
> - __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -
> -#define DRM_DEBUG_LEASE(fmt, ...) \
> - __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DP(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DP, fmt, ## __VA_ARGS__)
> -#define DRM_DEBUG_DP(fmt, ...) \
> - __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
>
> #define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, category, fmt, ...) \
> ({ \
> @@ -454,24 +407,84 @@ void __drm_err(const char *format, ...);
> #define DRM_DEV_DEBUG_RATELIMITED(dev, fmt, ...) \
> _DEV_DRM_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_CORE, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_DRIVER, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_KMS, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_PRIME, \
> fmt, ##__VA_ARGS__)
> +
> +/*
> + * printk based logging
> + */
> +
> +__printf(2, 3)
> +void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> +__printf(1, 2)
> +void __drm_err(const char *format, ...);
> +
> +/* Macros to make printk easier */
> +
> +#define _DRM_PRINTK(once, level, fmt, ...) \
> + printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO(fmt, ...) \
> + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE(fmt, ...) \
> + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN(fmt, ...) \
> + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR(fmt, ...) \
> + __drm_err(fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR_RATELIMITED(fmt, ...) \
> + DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG(fmt, ...) \
> + __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER(fmt, ...) \
> + __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS(fmt, ...) \
> + __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_PRIME(fmt, ...) \
> + __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_ATOMIC(fmt, ...) \
> + __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_VBL(fmt, ...) \
> + __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_LEASE(fmt, ...) \
> + __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DP(fmt, ...) \
> + __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
> +
> +
> +#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> #define DRM_DEBUG_PRIME_RATELIMITED(fmt, ...) \
> DRM_DEV_DEBUG_PRIME_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH RESEND 7/8] drm/print: group logging functions by prink or device based
Date: Fri, 1 Nov 2019 13:25:51 -0700 [thread overview]
Message-ID: <20191101202551.GL20514@intel.com> (raw)
Message-ID: <20191101202551.BM6WOTzzvcNC9IqofcYbjj5SYpifP2wag1nycny8PG0@z> (raw)
In-Reply-To: <51c70d80e7dd06c49ba3be56fbb6ae70edddc102.1572258936.git.jani.nikula@intel.com>
On Mon, Oct 28, 2019 at 12:38:21PM +0200, Jani Nikula wrote:
> In preparation for adding struct drm_device based logging, group the
> existing functions by prink or struct device based logging. No
> functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> include/drm/drm_print.h | 135 ++++++++++++++++++++++------------------
> 1 file changed, 74 insertions(+), 61 deletions(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 13f65394376e..085a9685270c 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -320,6 +320,10 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
> return unlikely(__drm_debug & category);
> }
>
> +/*
> + * struct device based logging
> + */
> +
> __printf(3, 4)
> void drm_dev_printk(const struct device *dev, const char *level,
> const char *format, ...);
> @@ -327,30 +331,6 @@ __printf(3, 4)
> void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
> const char *format, ...);
>
> -__printf(2, 3)
> -void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> -__printf(1, 2)
> -void __drm_err(const char *format, ...);
> -
> -/* Macros to make printk easier */
> -
> -#define _DRM_PRINTK(once, level, fmt, ...) \
> - printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO(fmt, ...) \
> - _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE(fmt, ...) \
> - _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN(fmt, ...) \
> - _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> -
> /**
> * Error output.
> *
> @@ -359,8 +339,6 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_ERROR(dev, fmt, ...) \
> drm_dev_printk(dev, KERN_ERR, "*ERROR* " fmt, ##__VA_ARGS__)
> -#define DRM_ERROR(fmt, ...) \
> - __drm_err(fmt, ##__VA_ARGS__)
>
> /**
> * Rate limited error output. Like DRM_ERROR() but won't flood the log.
> @@ -377,10 +355,8 @@ void __drm_err(const char *format, ...);
> if (__ratelimit(&_rs)) \
> DRM_DEV_ERROR(dev, fmt, ##__VA_ARGS__); \
> })
> -#define DRM_ERROR_RATELIMITED(fmt, ...) \
> - DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> -#define DRM_DEV_INFO(dev, fmt, ...) \
> +#define DRM_DEV_INFO(dev, fmt, ...) \
I believe you could skip this chunk...
other than this:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> drm_dev_printk(dev, KERN_INFO, fmt, ##__VA_ARGS__)
>
> #define DRM_DEV_INFO_ONCE(dev, fmt, ...) \
> @@ -400,41 +376,18 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_DEBUG(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG(fmt, ...) \
> - __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER(fmt, ...) \
> - __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS(fmt, ...) \
> - __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_PRIME(fmt, ...) \
> - __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_ATOMIC(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_ATOMIC(fmt, ...) \
> - __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_VBL(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_VBL(fmt, ...) \
> - __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -
> -#define DRM_DEBUG_LEASE(fmt, ...) \
> - __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DP(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DP, fmt, ## __VA_ARGS__)
> -#define DRM_DEBUG_DP(fmt, ...) \
> - __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
>
> #define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, category, fmt, ...) \
> ({ \
> @@ -454,24 +407,84 @@ void __drm_err(const char *format, ...);
> #define DRM_DEV_DEBUG_RATELIMITED(dev, fmt, ...) \
> _DEV_DRM_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_CORE, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_DRIVER, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_KMS, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_PRIME, \
> fmt, ##__VA_ARGS__)
> +
> +/*
> + * printk based logging
> + */
> +
> +__printf(2, 3)
> +void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> +__printf(1, 2)
> +void __drm_err(const char *format, ...);
> +
> +/* Macros to make printk easier */
> +
> +#define _DRM_PRINTK(once, level, fmt, ...) \
> + printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO(fmt, ...) \
> + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE(fmt, ...) \
> + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN(fmt, ...) \
> + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR(fmt, ...) \
> + __drm_err(fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR_RATELIMITED(fmt, ...) \
> + DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG(fmt, ...) \
> + __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER(fmt, ...) \
> + __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS(fmt, ...) \
> + __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_PRIME(fmt, ...) \
> + __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_ATOMIC(fmt, ...) \
> + __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_VBL(fmt, ...) \
> + __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_LEASE(fmt, ...) \
> + __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DP(fmt, ...) \
> + __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
> +
> +
> +#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> #define DRM_DEBUG_PRIME_RATELIMITED(fmt, ...) \
> DRM_DEV_DEBUG_PRIME_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: Jani Nikula <jani.nikula@intel.com>
Cc: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH RESEND 7/8] drm/print: group logging functions by prink or device based
Date: Fri, 1 Nov 2019 13:25:51 -0700 [thread overview]
Message-ID: <20191101202551.GL20514@intel.com> (raw)
Message-ID: <20191101202551.snvKjZX-hkKPYjpBzSHwFMejUYVkJyEzvKZg4dj0_fA@z> (raw)
In-Reply-To: <51c70d80e7dd06c49ba3be56fbb6ae70edddc102.1572258936.git.jani.nikula@intel.com>
On Mon, Oct 28, 2019 at 12:38:21PM +0200, Jani Nikula wrote:
> In preparation for adding struct drm_device based logging, group the
> existing functions by prink or struct device based logging. No
> functional changes.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> include/drm/drm_print.h | 135 ++++++++++++++++++++++------------------
> 1 file changed, 74 insertions(+), 61 deletions(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index 13f65394376e..085a9685270c 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -320,6 +320,10 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
> return unlikely(__drm_debug & category);
> }
>
> +/*
> + * struct device based logging
> + */
> +
> __printf(3, 4)
> void drm_dev_printk(const struct device *dev, const char *level,
> const char *format, ...);
> @@ -327,30 +331,6 @@ __printf(3, 4)
> void drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
> const char *format, ...);
>
> -__printf(2, 3)
> -void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> -__printf(1, 2)
> -void __drm_err(const char *format, ...);
> -
> -/* Macros to make printk easier */
> -
> -#define _DRM_PRINTK(once, level, fmt, ...) \
> - printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO(fmt, ...) \
> - _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE(fmt, ...) \
> - _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN(fmt, ...) \
> - _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> -
> -#define DRM_INFO_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> -#define DRM_NOTE_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> -#define DRM_WARN_ONCE(fmt, ...) \
> - _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> -
> /**
> * Error output.
> *
> @@ -359,8 +339,6 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_ERROR(dev, fmt, ...) \
> drm_dev_printk(dev, KERN_ERR, "*ERROR* " fmt, ##__VA_ARGS__)
> -#define DRM_ERROR(fmt, ...) \
> - __drm_err(fmt, ##__VA_ARGS__)
>
> /**
> * Rate limited error output. Like DRM_ERROR() but won't flood the log.
> @@ -377,10 +355,8 @@ void __drm_err(const char *format, ...);
> if (__ratelimit(&_rs)) \
> DRM_DEV_ERROR(dev, fmt, ##__VA_ARGS__); \
> })
> -#define DRM_ERROR_RATELIMITED(fmt, ...) \
> - DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> -#define DRM_DEV_INFO(dev, fmt, ...) \
> +#define DRM_DEV_INFO(dev, fmt, ...) \
I believe you could skip this chunk...
other than this:
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> drm_dev_printk(dev, KERN_INFO, fmt, ##__VA_ARGS__)
>
> #define DRM_DEV_INFO_ONCE(dev, fmt, ...) \
> @@ -400,41 +376,18 @@ void __drm_err(const char *format, ...);
> */
> #define DRM_DEV_DEBUG(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG(fmt, ...) \
> - __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER(fmt, ...) \
> - __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS(fmt, ...) \
> - __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_PRIME(fmt, ...) \
> - __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_ATOMIC(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_ATOMIC(fmt, ...) \
> - __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_VBL(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_VBL(fmt, ...) \
> - __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> -
> -#define DRM_DEBUG_LEASE(fmt, ...) \
> - __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DP(dev, fmt, ...) \
> drm_dev_dbg(dev, DRM_UT_DP, fmt, ## __VA_ARGS__)
> -#define DRM_DEBUG_DP(fmt, ...) \
> - __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
>
> #define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, category, fmt, ...) \
> ({ \
> @@ -454,24 +407,84 @@ void __drm_err(const char *format, ...);
> #define DRM_DEV_DEBUG_RATELIMITED(dev, fmt, ...) \
> _DEV_DRM_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_CORE, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_DRIVER_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_DRIVER, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_KMS_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_KMS, \
> fmt, ##__VA_ARGS__)
> -#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> - DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> -
> #define DRM_DEV_DEBUG_PRIME_RATELIMITED(dev, fmt, ...) \
> _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, DRM_UT_PRIME, \
> fmt, ##__VA_ARGS__)
> +
> +/*
> + * printk based logging
> + */
> +
> +__printf(2, 3)
> +void __drm_dbg(enum drm_debug_category category, const char *format, ...);
> +__printf(1, 2)
> +void __drm_err(const char *format, ...);
> +
> +/* Macros to make printk easier */
> +
> +#define _DRM_PRINTK(once, level, fmt, ...) \
> + printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO(fmt, ...) \
> + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE(fmt, ...) \
> + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN(fmt, ...) \
> + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_INFO_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)
> +#define DRM_NOTE_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)
> +#define DRM_WARN_ONCE(fmt, ...) \
> + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR(fmt, ...) \
> + __drm_err(fmt, ##__VA_ARGS__)
> +
> +#define DRM_ERROR_RATELIMITED(fmt, ...) \
> + DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG(fmt, ...) \
> + __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER(fmt, ...) \
> + __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS(fmt, ...) \
> + __drm_dbg(DRM_UT_KMS, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_PRIME(fmt, ...) \
> + __drm_dbg(DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_ATOMIC(fmt, ...) \
> + __drm_dbg(DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_VBL(fmt, ...) \
> + __drm_dbg(DRM_UT_VBL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_LEASE(fmt, ...) \
> + __drm_dbg(DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DP(fmt, ...) \
> + __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__)
> +
> +
> +#define DRM_DEBUG_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_DRIVER_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_DRIVER_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> +#define DRM_DEBUG_KMS_RATELIMITED(fmt, ...) \
> + DRM_DEV_DEBUG_KMS_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
> +
> #define DRM_DEBUG_PRIME_RATELIMITED(fmt, ...) \
> DRM_DEV_DEBUG_PRIME_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
>
> --
> 2.20.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2019-11-01 20:25 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 10:38 [PATCH RESEND 0/8] drm/print: cleanup and new drm_device based logging Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` [PATCH RESEND 1/8] drm/i915: use drm_debug_enabled() to check for debug categories Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
[not found] ` <cover.1572258935.git.jani.nikula-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2019-10-28 10:38 ` [PATCH RESEND 2/8] drm/nouveau: " Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-10-28 10:38 ` [PATCH RESEND 3/8] drm/amdgpu: " Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-10-28 10:38 ` [PATCH RESEND 4/8] drm/print: rename drm_debug to __drm_debug to discourage use Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` [PATCH RESEND 5/8] drm/print: underscore prefix functions that should be private to print Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-11-01 20:16 ` Rodrigo Vivi
2019-11-01 20:16 ` [Intel-gfx] " Rodrigo Vivi
2019-11-01 20:16 ` Rodrigo Vivi
2019-10-28 10:38 ` [PATCH RESEND 6/8] drm/print: convert debug category macros into an enum Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-10-29 9:02 ` Joonas Lahtinen
2019-10-29 9:02 ` [Intel-gfx] " Joonas Lahtinen
2019-10-29 9:02 ` Joonas Lahtinen
2019-10-29 9:27 ` Jani Nikula
2019-10-29 9:27 ` [Intel-gfx] " Jani Nikula
2019-10-29 9:27 ` Jani Nikula
2019-10-28 10:38 ` [PATCH RESEND 7/8] drm/print: group logging functions by prink or device based Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-11-01 20:25 ` Rodrigo Vivi [this message]
2019-11-01 20:25 ` Rodrigo Vivi
2019-11-01 20:25 ` Rodrigo Vivi
2019-10-28 10:38 ` [PATCH RESEND 8/8] drm/print: introduce new struct drm_device based logging macros Jani Nikula
2019-10-28 10:38 ` [Intel-gfx] " Jani Nikula
2019-10-28 10:38 ` Jani Nikula
2019-10-28 17:09 ` Ville Syrjälä
2019-10-28 17:09 ` [Intel-gfx] " Ville Syrjälä
2019-10-28 17:09 ` Ville Syrjälä
2019-11-01 20:27 ` Rodrigo Vivi
2019-11-01 20:27 ` [Intel-gfx] " Rodrigo Vivi
2019-11-01 20:27 ` Rodrigo Vivi
2019-10-28 13:28 ` ✗ Fi.CI.CHECKPATCH: warning for drm/print: cleanup and new drm_device based logging (rev2) Patchwork
2019-10-28 13:28 ` [Intel-gfx] " Patchwork
2019-10-28 13:49 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-10-28 13:49 ` [Intel-gfx] " Patchwork
2019-10-28 18:49 ` ✗ Fi.CI.CHECKPATCH: warning for drm/print: cleanup and new drm_device based logging (rev3) Patchwork
2019-10-28 18:49 ` [Intel-gfx] " Patchwork
2019-10-28 19:30 ` ✓ Fi.CI.BAT: success " Patchwork
2019-10-28 19:30 ` [Intel-gfx] " Patchwork
2019-10-29 13:57 ` ✓ Fi.CI.IGT: " Patchwork
2019-10-29 13:57 ` [Intel-gfx] " Patchwork
2019-11-12 15:21 ` [PATCH RESEND 0/8] drm/print: cleanup and new drm_device based logging Sean Paul
2019-11-12 15:21 ` [Intel-gfx] " Sean Paul
2019-11-12 15:21 ` Sean Paul
2019-11-14 12:27 ` Jani Nikula
2019-11-14 12:27 ` [Intel-gfx] " Jani Nikula
2019-11-14 12:27 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191101202551.GL20514@intel.com \
--to=rodrigo.vivi@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.