Commit 6bd488db authored by Joe Perches's avatar Joe Perches Committed by Daniel Vetter
Browse files

drm: Simplify drm_printk to reduce object size quite a bit 



Remove function name and special " *ERROR*" from argument list

$ size drivers/gpu/drm/built-in.o* (x86-32 defconfig, most drm selected)
   text	   data	    bss	    dec	    hex	filename
5635366	 182579	  14328	5832273	 58fe51	drivers/gpu/drm/built-in.o.new
5779552	 182579	  14328	5976459	 5b318b	drivers/gpu/drm/built-in.o.old

Using "%ps", __builtin_return_address(0) is the same as "%s", __func__
except for static inlines, but it's more or less the same output.

Miscellanea:

o Convert args... to ##__VA_ARGS__
o The equivalent DRM_DEV_<FOO> macros are rarely used and not
  worth conversion

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/01f976d5ab93c985756fc1b2e83656fb0a2a28c8.1474856262.git.joe@perches.com
parent 8cadab0a

drivers/gpu/drm/drm_drv.c

+3 −2
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ void drm_dev_printk(const struct device *dev, const char *level, 
EXPORT_SYMBOL(drm_dev_printk);



void drm_printk(const char *level, unsigned int category,

		const char *function_name, const char *prefix,

		const char *format, ...)

{

	struct va_format vaf;
@@ -102,7 +101,9 @@ void drm_printk(const char *level, unsigned int category, 
	vaf.fmt = format;

	vaf.va = &args;



	printk("%s" DRM_PRINTK_FMT, level, function_name, prefix, &vaf);

	printk("%s" "[" DRM_NAME ":%ps]%s %pV",

	       level, __builtin_return_address(0),

	       strcmp(level, KERN_ERR) == 0 ? " *ERROR*" : "", &vaf);



	va_end(args);

}

include/drm/drmP.h

+14 −16
Original line number Diff line number Diff line
@@ -141,9 +141,8 @@ void drm_dev_printk(const struct device *dev, const char *level, 
		    unsigned int category, const char *function_name,

		    const char *prefix, const char *format, ...);



extern __printf(5, 6)

extern __printf(3, 4)

void drm_printk(const char *level, unsigned int category,

		const char *function_name, const char *prefix,

		const char *format, ...);



/***********************************************************************/
@@ -199,8 +198,7 @@ void drm_printk(const char *level, unsigned int category, 
	drm_dev_printk(dev, KERN_ERR, DRM_UT_NONE, __func__, " *ERROR*",\

		       fmt, ##__VA_ARGS__)

#define DRM_ERROR(fmt, ...)						\

	drm_printk(KERN_ERR, DRM_UT_NONE, __func__, " *ERROR*", fmt,	\

		   ##__VA_ARGS__)

	drm_printk(KERN_ERR, DRM_UT_NONE, fmt,	##__VA_ARGS__)



/**

 * Rate limited error output.  Like DRM_ERROR() but won't flood the log.
@@ -242,38 +240,38 @@ void drm_printk(const char *level, unsigned int category, 
#define DRM_DEV_DEBUG(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_CORE, __func__, "", fmt,	\

		       ##args)

#define DRM_DEBUG(fmt, args...)						\

	drm_printk(KERN_DEBUG, DRM_UT_CORE, __func__, "", fmt, ##args)

#define DRM_DEBUG(fmt, ...)						\

	drm_printk(KERN_DEBUG, DRM_UT_CORE, fmt, ##__VA_ARGS__)



#define DRM_DEV_DEBUG_DRIVER(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_DRIVER, __func__, "",	\

		       fmt, ##args)

#define DRM_DEBUG_DRIVER(fmt, args...)					\

	drm_printk(KERN_DEBUG, DRM_UT_DRIVER, __func__, "", fmt, ##args)

#define DRM_DEBUG_DRIVER(fmt, ...)					\

	drm_printk(KERN_DEBUG, DRM_UT_DRIVER, fmt, ##__VA_ARGS__)



#define DRM_DEV_DEBUG_KMS(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_KMS, __func__, "", fmt,	\

		       ##args)

#define DRM_DEBUG_KMS(fmt, args...)					\

	drm_printk(KERN_DEBUG, DRM_UT_KMS, __func__, "", fmt, ##args)

#define DRM_DEBUG_KMS(fmt, ...)					\

	drm_printk(KERN_DEBUG, DRM_UT_KMS, fmt, ##__VA_ARGS__)



#define DRM_DEV_DEBUG_PRIME(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_PRIME, __func__, "",	\

		       fmt, ##args)

#define DRM_DEBUG_PRIME(fmt, args...)					\

	drm_printk(KERN_DEBUG, DRM_UT_PRIME, __func__, "", fmt, ##args)

#define DRM_DEBUG_PRIME(fmt, ...)					\

	drm_printk(KERN_DEBUG, DRM_UT_PRIME, fmt, ##__VA_ARGS__)



#define DRM_DEV_DEBUG_ATOMIC(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_ATOMIC, __func__, "",	\

		       fmt, ##args)

#define DRM_DEBUG_ATOMIC(fmt, args...)					\

	drm_printk(KERN_DEBUG, DRM_UT_ATOMIC, __func__, "", fmt, ##args)

#define DRM_DEBUG_ATOMIC(fmt, ...)					\

	drm_printk(KERN_DEBUG, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__)



#define DRM_DEV_DEBUG_VBL(dev, fmt, args...)				\

	drm_dev_printk(dev, KERN_DEBUG, DRM_UT_VBL, __func__, "", fmt,	\

		       ##args)

#define DRM_DEBUG_VBL(fmt, args...)					\

	drm_printk(KERN_DEBUG, DRM_UT_VBL, __func__, "", fmt, ##args)

#define DRM_DEBUG_VBL(fmt, ...)					\

	drm_printk(KERN_DEBUG, DRM_UT_VBL, fmt, ##__VA_ARGS__)



#define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, level, fmt, args...)	\

({									\

CRA Git | Maintained and supported by SUSTech CRA and CCSE