aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_modes.c4
-rw-r--r--include/drm/drmP.h7
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index 5eca2d5c5f23..6b4d2dc3cdd9 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -52,7 +52,7 @@
52 */ 52 */
53void drm_mode_debug_printmodeline(struct drm_display_mode *mode) 53void drm_mode_debug_printmodeline(struct drm_display_mode *mode)
54{ 54{
55 DRM_DEBUG_MODE("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d " 55 DRM_DEBUG_KMS("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d "
56 "0x%x 0x%x\n", 56 "0x%x 0x%x\n",
57 mode->base.id, mode->name, mode->vrefresh, mode->clock, 57 mode->base.id, mode->name, mode->vrefresh, mode->clock,
58 mode->hdisplay, mode->hsync_start, 58 mode->hdisplay, mode->hsync_start,
@@ -818,7 +818,7 @@ void drm_mode_prune_invalid(struct drm_device *dev,
818 list_del(&mode->head); 818 list_del(&mode->head);
819 if (verbose) { 819 if (verbose) {
820 drm_mode_debug_printmodeline(mode); 820 drm_mode_debug_printmodeline(mode);
821 DRM_DEBUG_MODE("Not using %s mode %d\n", 821 DRM_DEBUG_KMS("Not using %s mode %d\n",
822 mode->name, mode->status); 822 mode->name, mode->status);
823 } 823 }
824 drm_mode_destroy(dev, mode); 824 drm_mode_destroy(dev, mode);
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index edbdb02a7a3f..6513d16cd029 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -88,7 +88,6 @@ struct drm_device;
88#define DRM_UT_CORE 0x01 88#define DRM_UT_CORE 0x01
89#define DRM_UT_DRIVER 0x02 89#define DRM_UT_DRIVER 0x02
90#define DRM_UT_KMS 0x04 90#define DRM_UT_KMS 0x04
91#define DRM_UT_MODE 0x08
92 91
93extern void drm_ut_debug_printk(unsigned int request_level, 92extern void drm_ut_debug_printk(unsigned int request_level,
94 const char *prefix, 93 const char *prefix,
@@ -184,11 +183,6 @@ extern void drm_ut_debug_printk(unsigned int request_level,
184 drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME, \ 183 drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME, \
185 __func__, fmt, ##args); \ 184 __func__, fmt, ##args); \
186 } while (0) 185 } while (0)
187#define DRM_DEBUG_MODE(fmt, args...) \
188 do { \
189 drm_ut_debug_printk(DRM_UT_MODE, DRM_NAME, \
190 __func__, fmt, ##args); \
191 } while (0)
192#define DRM_LOG(fmt, args...) \ 186#define DRM_LOG(fmt, args...) \
193 do { \ 187 do { \
194 drm_ut_debug_printk(DRM_UT_CORE, NULL, \ 188 drm_ut_debug_printk(DRM_UT_CORE, NULL, \
@@ -212,7 +206,6 @@ extern void drm_ut_debug_printk(unsigned int request_level,
212#else 206#else
213#define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0) 207#define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0)
214#define DRM_DEBUG_KMS(fmt, args...) do { } while (0) 208#define DRM_DEBUG_KMS(fmt, args...) do { } while (0)
215#define DRM_DEBUG_MODE(fmt, args...) do { } while (0)
216#define DRM_DEBUG(fmt, arg...) do { } while (0) 209#define DRM_DEBUG(fmt, arg...) do { } while (0)
217#define DRM_LOG(fmt, arg...) do { } while (0) 210#define DRM_LOG(fmt, arg...) do { } while (0)
218#define DRM_LOG_KMS(fmt, args...) do { } while (0) 211#define DRM_LOG_KMS(fmt, args...) do { } while (0)