Commit a73d4e91 authored by Lespiau, Damien's avatar Lespiau, Damien Committed by Dave Airlie

drm: Pull the test on drm_debug in the logging macros

In the logging code, we are currently checking is we need to output in
drm_ut_debug_printk(). This is too late. The problem is that when we write
something like:

    DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
                     connector->base.id,
                     drm_get_connector_name(connector),
                     connector->encoder->base.id,
                     drm_get_encoder_name(connector->encoder));

We start by evaluating the arguments (so call drm_get_connector_name() and
drm_get_connector_name()) before ending up in drm_ut_debug_printk() which will
then does nothing.

This means we execute a lot of instructions (drm_get_connector_name(), in turn,
calls snprintf() for example) to happily discard them in the normal case,
drm.debug=0.

So, let's put the test on drm_debug earlier, in the macros themselves.
Sprinkle an unlikely() as well for good measure.
Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 8fa6a9e7
...@@ -97,15 +97,13 @@ int drm_err(const char *func, const char *format, ...) ...@@ -97,15 +97,13 @@ int drm_err(const char *func, const char *format, ...)
} }
EXPORT_SYMBOL(drm_err); EXPORT_SYMBOL(drm_err);
void drm_ut_debug_printk(unsigned int request_level, void drm_ut_debug_printk(const char *prefix,
const char *prefix,
const char *function_name, const char *function_name,
const char *format, ...) const char *format, ...)
{ {
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
if (drm_debug & request_level) {
va_start(args, format); va_start(args, format);
vaf.fmt = format; vaf.fmt = format;
vaf.va = &args; vaf.va = &args;
...@@ -115,8 +113,8 @@ void drm_ut_debug_printk(unsigned int request_level, ...@@ -115,8 +113,8 @@ void drm_ut_debug_printk(unsigned int request_level,
function_name, &vaf); function_name, &vaf);
else else
printk(KERN_DEBUG "%pV", &vaf); printk(KERN_DEBUG "%pV", &vaf);
va_end(args); va_end(args);
}
} }
EXPORT_SYMBOL(drm_ut_debug_printk); EXPORT_SYMBOL(drm_ut_debug_printk);
......
...@@ -121,9 +121,8 @@ struct videomode; ...@@ -121,9 +121,8 @@ struct videomode;
#define DRM_UT_KMS 0x04 #define DRM_UT_KMS 0x04
#define DRM_UT_PRIME 0x08 #define DRM_UT_PRIME 0x08
extern __printf(4, 5) extern __printf(3, 4)
void drm_ut_debug_printk(unsigned int request_level, void drm_ut_debug_printk(const char *prefix,
const char *prefix,
const char *function_name, const char *function_name,
const char *format, ...); const char *format, ...);
extern __printf(2, 3) extern __printf(2, 3)
...@@ -209,24 +208,28 @@ int drm_err(const char *func, const char *format, ...); ...@@ -209,24 +208,28 @@ int drm_err(const char *func, const char *format, ...);
#if DRM_DEBUG_CODE #if DRM_DEBUG_CODE
#define DRM_DEBUG(fmt, args...) \ #define DRM_DEBUG(fmt, args...) \
do { \ do { \
drm_ut_debug_printk(DRM_UT_CORE, DRM_NAME, \ if (unlikely(drm_debug & DRM_UT_CORE)) \
__func__, fmt, ##args); \ drm_ut_debug_printk(DRM_NAME, __func__, \
fmt, ##args); \
} while (0) } while (0)
#define DRM_DEBUG_DRIVER(fmt, args...) \ #define DRM_DEBUG_DRIVER(fmt, args...) \
do { \ do { \
drm_ut_debug_printk(DRM_UT_DRIVER, DRM_NAME, \ if (unlikely(drm_debug & DRM_UT_DRIVER)) \
__func__, fmt, ##args); \ drm_ut_debug_printk(DRM_NAME, __func__, \
fmt, ##args); \
} while (0) } while (0)
#define DRM_DEBUG_KMS(fmt, args...) \ #define DRM_DEBUG_KMS(fmt, args...) \
do { \ do { \
drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME, \ if (unlikely(drm_debug & DRM_UT_KMS)) \
__func__, fmt, ##args); \ drm_ut_debug_printk(DRM_NAME, __func__, \
fmt, ##args); \
} while (0) } while (0)
#define DRM_DEBUG_PRIME(fmt, args...) \ #define DRM_DEBUG_PRIME(fmt, args...) \
do { \ do { \
drm_ut_debug_printk(DRM_UT_PRIME, DRM_NAME, \ if (unlikely(drm_debug & DRM_UT_PRIME)) \
__func__, fmt, ##args); \ drm_ut_debug_printk(DRM_NAME, __func__, \
fmt, ##args); \
} while (0) } while (0)
#else #else
#define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0) #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment