From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2016 00:35:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm-intel/for-linux-next'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1b86f0b8b3a3beb62cdfdef9954a66fb40e3e0f5;p=deliverable%2Flinux.git

Merge remote-tracking branch 'drm-intel/for-linux-next'
---

1b86f0b8b3a3beb62cdfdef9954a66fb40e3e0f5
diff --cc include/drm/drmP.h
index 94eb138753a9,734e4fb11f52..e341e7f6eef5
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@@ -194,26 -205,8 +214,23 @@@ void drm_printk(const char *level, unsi
  				      DEFAULT_RATELIMIT_BURST);		\
  									\
  	if (__ratelimit(&_rs))						\
 -		drm_err(fmt, ##__VA_ARGS__);				\
 +		DRM_DEV_ERROR(dev, fmt, ##__VA_ARGS__);			\
 +})
 +#define DRM_ERROR_RATELIMITED(fmt, ...)					\
 +	DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__)
 +
 +#define DRM_DEV_INFO(dev, fmt, ...)					\
 +	drm_dev_printk(dev, KERN_INFO, DRM_UT_NONE, __func__, "", fmt,	\
 +		       ##__VA_ARGS__)
- #define DRM_INFO(fmt, ...)						\
- 	drm_printk(KERN_INFO, DRM_UT_NONE, __func__, "", fmt, ##__VA_ARGS__)
 +
 +#define DRM_DEV_INFO_ONCE(dev, fmt, ...)				\
 +({									\
 +	static bool __print_once __read_mostly;				\
 +	if (!__print_once) {						\
 +		__print_once = true;					\
 +		DRM_DEV_INFO(dev, fmt, ##__VA_ARGS__);			\
 +	}								\
  })
- #define DRM_INFO_ONCE(fmt, ...) DRM_DEV_INFO_ONCE(NULL, fmt, ##__VA_ARGS__)
  
  /**
   * Debug output.