lkml.org 
[lkml]   [2022]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 30/33] drm_print: add _ddebug descriptor to drm_*dbg prototypes
    Date
    upgrade the callchain to drm_dbg() and drm_dev_dbg(); add a struct
    _ddebug ptr parameter to them, and supply that additional param by
    replacing the '_no_desc' flavor of dyndbg Factory macro currently used
    with the flavor that supplies the descriptor.

    NOTES:

    The descriptor gives these fns access to the decorator flags, but does
    none of the dynamic-prefixing done by __dynamic_emit_prefix().

    DRM already has conventions for logging/messaging; just tossing
    optional decorations on top may not help. Instead, existing flags (or
    new ones) can be used to make current conventions optional.

    For CONFIG_DRM_USE_DYNAMIC_DEBUG=N, just pass null.

    Note: desc->class_id is redundant with category parameter, but its
    availability is dependent on desc.

    Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
    ---
    drivers/gpu/drm/drm_print.c | 8 +++++---
    include/drm/drm_print.h | 23 ++++++++++++-----------
    2 files changed, 17 insertions(+), 14 deletions(-)

    diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c
    index ec477c44a784..5b93c11895bb 100644
    --- a/drivers/gpu/drm/drm_print.c
    +++ b/drivers/gpu/drm/drm_print.c
    @@ -29,6 +29,7 @@
    #include <linux/moduleparam.h>
    #include <linux/seq_file.h>
    #include <linux/slab.h>
    +#include <linux/dynamic_debug.h>

    #include <drm/drm.h>
    #include <drm/drm_drv.h>
    @@ -278,8 +279,8 @@ void drm_dev_printk(const struct device *dev, const char *level,
    }
    EXPORT_SYMBOL(drm_dev_printk);

    -void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
    - const char *format, ...)
    +void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
    + enum drm_debug_category category, const char *format, ...)
    {
    struct va_format vaf;
    va_list args;
    @@ -287,6 +288,7 @@ void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
    if (!__drm_debug_enabled(category))
    return;

    + /* we know we are printing for either syslog, tracefs, or both */
    va_start(args, format);
    vaf.fmt = format;
    vaf.va = &args;
    @@ -302,7 +304,7 @@ void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
    }
    EXPORT_SYMBOL(__drm_dev_dbg);

    -void ___drm_dbg(enum drm_debug_category category, const char *format, ...)
    +void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...)
    {
    struct va_format vaf;
    va_list args;
    diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h
    index 7631b5fb669e..46f14cfb401e 100644
    --- a/include/drm/drm_print.h
    +++ b/include/drm/drm_print.h
    @@ -363,9 +363,10 @@ static inline bool drm_debug_enabled(enum drm_debug_category category)
    __printf(3, 4)
    void drm_dev_printk(const struct device *dev, const char *level,
    const char *format, ...);
    -__printf(3, 4)
    -void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
    - const char *format, ...);
    +struct _ddebug;
    +__printf(4, 5)
    +void __drm_dev_dbg(struct _ddebug *desc, const struct device *dev,
    + enum drm_debug_category category, const char *format, ...);

    /**
    * DRM_DEV_ERROR() - Error output.
    @@ -415,11 +416,11 @@ void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,

    #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
    #define drm_dev_dbg(dev, cat, fmt, ...) \
    - __drm_dev_dbg(dev, cat, fmt, ##__VA_ARGS__)
    + __drm_dev_dbg(NULL, dev, cat, fmt, ##__VA_ARGS__)
    #else
    #define drm_dev_dbg(dev, cat, fmt, ...) \
    - _dynamic_func_call_no_desc(fmt, __drm_dev_dbg, \
    - dev, cat, fmt, ##__VA_ARGS__)
    + _dynamic_func_call_cls(cat, fmt, __drm_dev_dbg, \
    + dev, cat, fmt, ##__VA_ARGS__)
    #endif

    /**
    @@ -523,17 +524,17 @@ void __drm_dev_dbg(const struct device *dev, enum drm_debug_category category,
    * Prefer drm_device based logging over device or prink based logging.
    */

    -__printf(2, 3)
    -void ___drm_dbg(enum drm_debug_category category, const char *format, ...);
    +__printf(3, 4)
    +void ___drm_dbg(struct _ddebug *desc, enum drm_debug_category category, const char *format, ...);
    __printf(1, 2)
    void __drm_err(const char *format, ...);

    #if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG)
    -#define __drm_dbg(fmt, ...) ___drm_dbg(fmt, ##__VA_ARGS__)
    +#define __drm_dbg(fmt, ...) ___drm_dbg(NULL, fmt, ##__VA_ARGS__)
    #else
    #define __drm_dbg(cat, fmt, ...) \
    - _dynamic_func_call_no_desc(fmt, ___drm_dbg, \
    - cat, fmt, ##__VA_ARGS__)
    + _dynamic_func_call_cls(cat, fmt, ___drm_dbg, \
    + cat, fmt, ##__VA_ARGS__)
    #endif

    /* Macros to make printk easier */
    --
    2.37.1
    \
     
     \ /
      Last update: 2022-08-05 23:58    [W:4.404 / U:0.936 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site