diff --git a/sys/external/bsd/drm2/dist/drm/drm_print.c b/sys/external/bsd/drm2/dist/drm/drm_print.c index eddb09acf1d7..16231952f0ef 100644 --- a/sys/external/bsd/drm2/dist/drm/drm_print.c +++ b/sys/external/bsd/drm2/dist/drm/drm_print.c @@ -175,19 +175,34 @@ EXPORT_SYMBOL(__drm_printfn_seq_file); void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf) { +#ifdef __NetBSD__ + dev_info(p->arg, "[" DRM_NAME "] "); + pr_info(vaf->fmt, vaf->va); +#else dev_info(p->arg, "[" DRM_NAME "] %pV", vaf); +#endif } EXPORT_SYMBOL(__drm_printfn_info); void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf) { +#ifdef __NetBSD__ + pr_debug("%s ", p->prefix); + pr_debug(vaf->fmt, vaf->va); +#else pr_debug("%s %pV", p->prefix, vaf); +#endif } EXPORT_SYMBOL(__drm_printfn_debug); void __drm_printfn_err(struct drm_printer *p, struct va_format *vaf) { +#ifdef __NetBSD__ + pr_err("*ERROR* %s ", p->prefix); + pr_err(vaf->fmt, vaf->va); +#else pr_err("*ERROR* %s %pV", p->prefix, vaf); +#endif } EXPORT_SYMBOL(__drm_printfn_err); @@ -330,6 +345,8 @@ void __drm_dbg(enum drm_debug_category category, const char *format, ...) if (!(__drm_debug & category)) return; + printf("[" DRM_NAME ":%p] ", __builtin_return_address(0)); + va_start(va, format); vprintf(format, va); va_end(va); @@ -354,6 +371,15 @@ EXPORT_SYMBOL(__drm_dbg); void __drm_err(const char *format, ...) { +#ifdef __NetBSD__ + va_list va; + + printf("[" DRM_NAME ":%p] *ERROR* ", __builtin_return_address(0)); + + va_start(va, format); + vprintf(format, va); + va_end(va); +#else struct va_format vaf; va_list args; @@ -365,6 +391,7 @@ void __drm_err(const char *format, ...) __builtin_return_address(0), &vaf); va_end(args); +#endif } EXPORT_SYMBOL(__drm_err);