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

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_audio.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge

diff --cc include/drm/drmP.h
index 94eb138753a98be2be27bd06188adc14a02030f7,734e4fb11f52f8ce972f9af644f063decab9146f..e341e7f6eef5d564fd47dfd49ca5ea2fc1cd4c6d
--- 1/include/drm/drmP.h
--- 2/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.