From: Jani Nikula <jani.nikula@intel.com>
To: Sam Ravnborg <sam@ravnborg.org>,
dri-devel@lists.freedesktop.org, Daniel Vetter <daniel@ffwll.ch>
Cc: Joe Perches <joe@perches.com>, Sam Ravnborg <sam@ravnborg.org>,
Sean Paul <sean@poorly.run>
Subject: Re: [PATCH v1 3/8] drm/print: add new logging helper for drm logging
Date: Mon, 23 Dec 2019 13:16:01 +0200 [thread overview]
Message-ID: <8736dbwavi.fsf@intel.com> (raw)
In-Reply-To: <20191221095553.13332-4-sam@ravnborg.org>
On Sat, 21 Dec 2019, Sam Ravnborg <sam@ravnborg.org> wrote:
> Add new helper so logging can use the standard logging
> functions without an extra helper function.
The main functional change here is that this will no longer print the
function names in the debug logs. I am not sure if we want to make that
change.
BR,
Jani.
>
> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
> Cc: Jani Nikula <jani.nikula@intel.com>
> Cc: Sean Paul <sean@poorly.run>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> ---
> include/drm/drm_print.h | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
> index d2b9ac6a6e18..c1d333bb7534 100644
> --- a/include/drm/drm_print.h
> +++ b/include/drm/drm_print.h
> @@ -403,10 +403,15 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
> * Prefer drm_device based logging over device or printk based logging.
> */
>
> -/* Helper for struct drm_device based logging. */
> +/* Helpers for struct drm_device based logging. */
> #define __drm_printk(drm, level, type, fmt, ...) \
> dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__)
>
> +#define __drm_cat_printk(drm, cat, fmt, ...) \
> +({ \
> + if (drm_debug_enabled(cat)) \
> + dev_dbg((drm)->dev, "[drm] " fmt, ##__VA_ARGS__); \
> +})
>
> #define drm_info(drm, fmt, ...) \
> __drm_printk((drm), info,, fmt, ##__VA_ARGS__)
> @@ -430,24 +435,23 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
> __drm_printk((drm), err, _ratelimited, "*ERROR* " fmt, ##__VA_ARGS__)
>
> #define drm_dbg_core(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_CORE, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_CORE, fmt, ##__VA_ARGS__)
> #define drm_dbg(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__)
> #define drm_dbg_kms(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_KMS, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_KMS, fmt, ##__VA_ARGS__)
> #define drm_dbg_prime(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__)
> #define drm_dbg_atomic(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)
> #define drm_dbg_vbl(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_VBL, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_VBL, fmt, ##__VA_ARGS__)
> #define drm_dbg_state(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_STATE, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_STATE, fmt, ##__VA_ARGS__)
> #define drm_dbg_lease(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> + __drm_cat_printk((drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__)
> #define drm_dbg_dp(drm, fmt, ...) \
> - drm_dev_dbg((drm)->dev, DRM_UT_DP, fmt, ##__VA_ARGS__)
> -
> + __drm_cat_printk((drm), DRM_UT_DP, fmt, ##__VA_ARGS__)
>
> /*
> * LEGACY logging support - do not use in new code
--
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-12-23 11:16 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 9:55 [RFC PATCH 0/9] drm: add more new-style logging functions Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 1/8] drm/print: document " Sam Ravnborg
2019-12-23 11:23 ` Jani Nikula
2019-12-23 12:07 ` Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 2/8] drm/print: move new style " Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 3/8] drm/print: add new logging helper for drm logging Sam Ravnborg
2019-12-23 11:16 ` Jani Nikula [this message]
2019-12-23 11:18 ` Joe Perches
2019-12-23 12:10 ` Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 4/8] drm/print: add kernel-doc for drm_debug_enabled Sam Ravnborg
2019-12-23 11:18 ` Jani Nikula
2019-12-21 9:55 ` [PATCH v1 5/8] drm/print: rename drm_dev_dbg Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 6/8] drm/print: add drm_dev_* logging functions Sam Ravnborg
2019-12-21 13:56 ` Joe Perches
2019-12-21 14:48 ` Sam Ravnborg
2019-12-23 11:21 ` Jani Nikula
2019-12-23 11:29 ` Jani Nikula
2019-12-23 12:35 ` Sam Ravnborg
2019-12-31 14:35 ` Jani Nikula
2019-12-21 9:55 ` [PATCH v1 7/8] drm/print: add drm_pr_ logging Sam Ravnborg
2019-12-21 9:55 ` [PATCH v1 8/8] drm/print: let legacy logging use new style functions Sam Ravnborg
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=8736dbwavi.fsf@intel.com \
--to=jani.nikula@intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=joe@perches.com \
--cc=sam@ravnborg.org \
--cc=sean@poorly.run \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox