mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
db87086492
These macros are similar to the DRM_<LEVEL> with the addition
of a struct device * to the arguments.
Convert the single drm_dev_printk function into 2 separate functions.
drm_dev_printk with a KERN_<LEVEL> * for generic use and drm_dev_dbg
for conditional masked use.
Remove the __func__ argument and use __builtin_return_address(0) to be
similar to the DRM_<LEVEL> macros uses.
Convert the DRM_DEV_<LEVEL> macros to remove now unnecessary arguments
and use a consistent style.
These macros are rarely used in the generic gpu/drm code so the code
size does not change much for a defconfig, but when more drivers are
enabled, there is ~4k savings.
Many of these macros have no existing use at all.
$ size -t drivers/gpu/drm/built-in.a | tail -1
1877530 44651 995 1923176 1d5868 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
1877527 44651 995 1923173 1d5865 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
17166750 2689238 108352 19964340 130a1b4 (TOTALS)
$ size -t drivers/gpu/drm/built-in.a | tail -1
17168888 2691734 108352 19968974 130b3ce (TOTALS)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/e5c164946e15375ac71b69b75f296efdf0b76e6d.1521233717.git.joe@perches.com
144 lines
3.5 KiB
C
144 lines
3.5 KiB
C
/*
|
|
* Copyright (C) 2016 Red Hat
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
* OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Authors:
|
|
* Rob Clark <robdclark@gmail.com>
|
|
*/
|
|
|
|
#define DEBUG /* for pr_debug() */
|
|
|
|
#include <stdarg.h>
|
|
#include <linux/seq_file.h>
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_print.h>
|
|
|
|
void __drm_printfn_seq_file(struct drm_printer *p, struct va_format *vaf)
|
|
{
|
|
seq_printf(p->arg, "%pV", vaf);
|
|
}
|
|
EXPORT_SYMBOL(__drm_printfn_seq_file);
|
|
|
|
void __drm_printfn_info(struct drm_printer *p, struct va_format *vaf)
|
|
{
|
|
dev_info(p->arg, "[" DRM_NAME "] %pV", vaf);
|
|
}
|
|
EXPORT_SYMBOL(__drm_printfn_info);
|
|
|
|
void __drm_printfn_debug(struct drm_printer *p, struct va_format *vaf)
|
|
{
|
|
pr_debug("%s %pV", p->prefix, vaf);
|
|
}
|
|
EXPORT_SYMBOL(__drm_printfn_debug);
|
|
|
|
/**
|
|
* drm_printf - print to a &drm_printer stream
|
|
* @p: the &drm_printer
|
|
* @f: format string
|
|
*/
|
|
void drm_printf(struct drm_printer *p, const char *f, ...)
|
|
{
|
|
va_list args;
|
|
|
|
va_start(args, f);
|
|
drm_vprintf(p, f, &args);
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL(drm_printf);
|
|
|
|
void drm_dev_printk(const struct device *dev, const char *level,
|
|
const char *format, ...)
|
|
{
|
|
struct va_format vaf;
|
|
va_list args;
|
|
|
|
va_start(args, format);
|
|
vaf.fmt = format;
|
|
vaf.va = &args;
|
|
|
|
if (dev)
|
|
dev_printk(level, dev, "[" DRM_NAME ":%ps] %pV",
|
|
__builtin_return_address(0), &vaf);
|
|
else
|
|
printk("%s" "[" DRM_NAME ":%ps] %pV",
|
|
level, __builtin_return_address(0), &vaf);
|
|
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL(drm_dev_printk);
|
|
|
|
void drm_dev_dbg(const struct device *dev, unsigned int category,
|
|
const char *format, ...)
|
|
{
|
|
struct va_format vaf;
|
|
va_list args;
|
|
|
|
if (!(drm_debug & category))
|
|
return;
|
|
|
|
va_start(args, format);
|
|
vaf.fmt = format;
|
|
vaf.va = &args;
|
|
|
|
if (dev)
|
|
dev_printk(KERN_DEBUG, dev, "[" DRM_NAME ":%ps] %pV",
|
|
__builtin_return_address(0), &vaf);
|
|
else
|
|
printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
|
|
__builtin_return_address(0), &vaf);
|
|
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL(drm_dev_dbg);
|
|
|
|
void drm_dbg(unsigned int category, const char *format, ...)
|
|
{
|
|
struct va_format vaf;
|
|
va_list args;
|
|
|
|
if (!(drm_debug & category))
|
|
return;
|
|
|
|
va_start(args, format);
|
|
vaf.fmt = format;
|
|
vaf.va = &args;
|
|
|
|
printk(KERN_DEBUG "[" DRM_NAME ":%ps] %pV",
|
|
__builtin_return_address(0), &vaf);
|
|
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL(drm_dbg);
|
|
|
|
void drm_err(const char *format, ...)
|
|
{
|
|
struct va_format vaf;
|
|
va_list args;
|
|
|
|
va_start(args, format);
|
|
vaf.fmt = format;
|
|
vaf.va = &args;
|
|
|
|
printk(KERN_ERR "[" DRM_NAME ":%ps] *ERROR* %pV",
|
|
__builtin_return_address(0), &vaf);
|
|
|
|
va_end(args);
|
|
}
|
|
EXPORT_SYMBOL(drm_err);
|