niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm: remove drm_debug_printer in favor of drm_dbg_printer

Browse source 
Convert the remaining drm_debug_printer users over to drm_dbg_printer,
as it can handle the cases without struct drm_device pointer, and also
provides drm debug category and prefix support. Remove drm_debug_printer
altogether.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Acked-by: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/18b5b91e62d071675a651f6f91c58f05ad74134a.1705410327.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2024-01-16 15:07:35 +02:00
parent e7835e023f
commit e154c4fc7b
4 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/drm_modeset_lock.c
View file

@ -91,7 +91,7 @@ static noinline depot_stack_handle_t __drm_stack_depot_save(void)
static void __drm_stack_depot_print(depot_stack_handle_t stack_depot) static void __drm_stack_depot_print(depot_stack_handle_t stack_depot)
{ {
struct drm_printer p = drm_debug_printer("drm_modeset_lock"); struct drm_printer p = drm_dbg_printer(NULL, DRM_UT_KMS, "drm_modeset_lock");
unsigned long *entries; unsigned long *entries;
unsigned int nr_entries; unsigned int nr_entries;
char *buf; char *buf;

7
drivers/gpu/drm/drm_print.c
View file

@ -182,13 +182,6 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
} }
EXPORT_SYMBOL(__drm_printfn_info); EXPORT_SYMBOL(__drm_printfn_info);
void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf)
{
/* pr_debug callsite decorations are unhelpful here */
printk(KERN_DEBUG "%s %pV", p->prefix, vaf);
}
EXPORT_SYMBOL(__drm_printfn_debug);
void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf) void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf)
{ {
const struct drm_device *drm = p->arg; const struct drm_device *drm = p->arg;

2
drivers/gpu/drm/ttm/ttm_bo.c
View file

@ -49,7 +49,7 @@
static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo, static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
struct ttm_placement *placement) struct ttm_placement *placement)
{ {
struct drm_printer p = drm_debug_printer(TTM_PFX); struct drm_printer p = drm_dbg_printer(NULL, DRM_UT_CORE, TTM_PFX);
struct ttm_resource_manager *man; struct ttm_resource_manager *man;
int i, mem_type; int i, mem_type;

17
include/drm/drm_print.h
View file

@ -184,7 +184,6 @@ void __drm_puts_coredump(struct drm_printer *p, const char *str);
void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf);
void __drm_puts_seq_file(struct drm_printer *p, const char *str); void __drm_puts_seq_file(struct drm_printer *p, const char *str);
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_dbg(struct drm_printer *p, struct va_format *vaf);
void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf);
@ -317,22 +316,6 @@ static inline struct drm_printer drm_info_printer(struct device *dev)
return p; return p;
} }
/**
* drm_debug_printer - construct a &drm_printer that outputs to pr_debug()
* @prefix: debug output prefix
*
* RETURNS:
* The &drm_printer object
*/
static inline struct drm_printer drm_debug_printer(const char *prefix)
{
struct drm_printer p = {
.printfn = __drm_printfn_debug,
.prefix = prefix
};
return p;
}
/** /**
* drm_dbg_printer - construct a &drm_printer for drm device specific output * drm_dbg_printer - construct a &drm_printer for drm device specific output
* @drm: the &struct drm_device pointer, or NULL * @drm: the &struct drm_device pointer, or NULL