| Message ID | 18b5b91e62d071675a651f6f91c58f05ad74134a.1705410327.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: drm debug and error logging improvements | expand |
On Tue, 2024-01-16 at 15:07 +0200, Jani Nikula wrote: > 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> > --- > drivers/gpu/drm/drm_modeset_lock.c | 2 +- > drivers/gpu/drm/drm_print.c | 7 ------- > drivers/gpu/drm/ttm/ttm_bo.c | 2 +- > include/drm/drm_print.h | 17 ----------------- > 4 files changed, 2 insertions(+), 26 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c > index 918065982db4..7694b85e75e3 100644 > --- a/drivers/gpu/drm/drm_modeset_lock.c > +++ b/drivers/gpu/drm/drm_modeset_lock.c > @@ -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) > { > - 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 int nr_entries; > char *buf; > diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c > index 673b29c732ea..699b7dbffd7b 100644 > --- a/drivers/gpu/drm/drm_print.c > +++ b/drivers/gpu/drm/drm_print.c > @@ -182,13 +182,6 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf) > } > 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) > { > const struct drm_device *drm = p->arg; > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index edf10618fe2b..30e1fe864826 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -49,7 +49,7 @@ > static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo, > 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; > int i, mem_type; > > diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h > index 27e23c06dad4..9cc473e5d353 100644 > --- a/include/drm/drm_print.h > +++ b/include/drm/drm_print.h > @@ -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_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_debug(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); > > @@ -317,22 +316,6 @@ static inline struct drm_printer drm_info_printer(struct device *dev) > 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: the &struct drm_device pointer, or NULL Why did you choose to make the last changes together with the patch that removed the old version entirely? Was it because you didn't to have any commit where the old version is defined but not used? In any case, this is fine with me, so: Reviewed-by: Luca Coelho <luciano.coelho@intel.com> -- Cheers, Luca.
diff --git a/drivers/gpu/drm/drm_modeset_lock.c b/drivers/gpu/drm/drm_modeset_lock.c index 918065982db4..7694b85e75e3 100644 --- a/drivers/gpu/drm/drm_modeset_lock.c +++ b/drivers/gpu/drm/drm_modeset_lock.c @@ -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) { - 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 int nr_entries; char *buf; diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 673b29c732ea..699b7dbffd7b 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -182,13 +182,6 @@ void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf) } 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) { const struct drm_device *drm = p->arg; diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index edf10618fe2b..30e1fe864826 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -49,7 +49,7 @@ static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo, 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; int i, mem_type; diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 27e23c06dad4..9cc473e5d353 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -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_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_debug(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); @@ -317,22 +316,6 @@ static inline struct drm_printer drm_info_printer(struct device *dev) 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: the &struct drm_device pointer, or NULL
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> --- drivers/gpu/drm/drm_modeset_lock.c | 2 +- drivers/gpu/drm/drm_print.c | 7 ------- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- include/drm/drm_print.h | 17 ----------------- 4 files changed, 2 insertions(+), 26 deletions(-)