Hi Dave, Daniel,

We had this i915 series with a single DRM core patch (reviewed) ready for a while - just waiting for an ack to merge it via i915 trees.

Can we proceed with merging it?

Regards,

Tvrtko

On 18/08/16 18:17, Dave Gordon wrote:

We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting.

DRM_ERROR is unchanged, as it's not just a printk wrapper.

v2: Fix whitespace, missing ## (Eric Engestrom)

Signed-off-by: Dave Gordon david.s.gordon@intel.com Reviewed-by: Eric Engestrom eric.engestrom@imgtec.com Cc: dri-devel@lists.freedesktop.org

---

include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/include/drm/drmP.h b/include/drm/drmP.h index f8e87fd..734e4fb 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -163,6 +163,26 @@ void drm_err(const char *format, ...); /** \name Macros to make printk easier */ /*@{*/

+#define _DRM_PRINTK(once, level, fmt, ...) \

• do { \

• printk##once(KERN_##level "[" DRM_NAME "] " fmt,	\
  

• 	     ##__VA_ARGS__);				\
  

• } while (0)

+#define DRM_INFO(fmt, ...) \

• _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__)

+#define DRM_NOTE(fmt, ...) \

• _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__)

+#define DRM_WARN(fmt, ...) \

• _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__)

+#define DRM_INFO_ONCE(fmt, ...) \

• _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__)

+#define DRM_NOTE_ONCE(fmt, ...) \

• _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__)

+#define DRM_WARN_ONCE(fmt, ...) \

• _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__)
• /**
  • Error output.

@@ -188,12 +208,6 @@ void drm_err(const char *format, ...); drm_err(fmt, ##__VA_ARGS__); \ })

-#define DRM_INFO(fmt, ...) \

• printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)

-#define DRM_INFO_ONCE(fmt, ...) \

• printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)
• /**
  • Debug output.