Commit 16deeb8e authored by Jim Cromie's avatar Jim Cromie Committed by Greg Kroah-Hartman
Browse files

drm_print: add _ddebug descriptor to drm_*dbg prototypes 



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 they
do none of the dynamic-prefixing done by dynamic_emit_prefix(), which
is currently static.

DRM already has conventions for logging/messaging; just tossing
optional decorations on top probably wouldn't help.  Instead, existing
flags (or new ones, perhaps 'sd' ala lspci) can be used to make
current message conventions optional.  This suggests a new
drmdbg_prefix_emit() to handle prefixing locally.

For CONFIG_DRM_USE_DYNAMIC_DEBUG=N, just pass null descriptor.

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

Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Link: https://lore.kernel.org/r/20220912052852.1123868-10-jim.cromie@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ccc2b496

drivers/gpu/drm/drm_print.c

+5 −3
Original line number Diff line number Diff line
@@ -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;

include/drm/drm_print.h

+12 −11
Original line number Diff line number Diff line
@@ -354,9 +354,10 @@ static inline bool drm_debug_enabled_raw(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.
@@ -406,10 +407,10 @@ 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,			\

	_dynamic_func_call_cls(cat, fmt, __drm_dev_dbg,		\

			       dev, cat, fmt, ##__VA_ARGS__)

#endif
@@ -514,16 +515,16 @@ 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,			\

	_dynamic_func_call_cls(cat, fmt, ___drm_dbg,			\

			       cat, fmt, ##__VA_ARGS__)

#endif