From: Ian R. <id...@fr...> - 2009-07-16 16:31:59
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 yak...@in... wrote: > From: Zhao Yakui <yak...@in...> > > Two macro definitions of DRM_DEBUG_KMS/MODE can be used to add the debug > info related with KMS. It is confusing. > So remove the macro definition of DRM_DEBUG_MODE. Instead it can be replaced > by the DRM_DEBUG_KMS. > > Signed-off-by: Zhao Yakui <yak...@in...> Acked-by: Ian Romanick <ian...@in...> > --- > drivers/gpu/drm/drm_modes.c | 4 ++-- > include/drm/drmP.h | 7 ------- > 2 files changed, 2 insertions(+), 9 deletions(-) > > Index: linux-2.6/drivers/gpu/drm/drm_modes.c > =================================================================== > --- linux-2.6.orig/drivers/gpu/drm/drm_modes.c 2009-07-16 13:53:38.000000000 +0800 > +++ linux-2.6/drivers/gpu/drm/drm_modes.c 2009-07-16 14:03:57.000000000 +0800 > @@ -50,7 +50,7 @@ > */ > void drm_mode_debug_printmodeline(struct drm_display_mode *mode) > { > - DRM_DEBUG_MODE("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d " > + DRM_DEBUG_KMS("Modeline %d:\"%s\" %d %d %d %d %d %d %d %d %d %d " > "0x%x 0x%x\n", > mode->base.id, mode->name, mode->vrefresh, mode->clock, > mode->hdisplay, mode->hsync_start, > @@ -402,7 +402,7 @@ > list_del(&mode->head); > if (verbose) { > drm_mode_debug_printmodeline(mode); > - DRM_DEBUG_MODE("Not using %s mode %d\n", > + DRM_DEBUG_KMS("Not using %s mode %d\n", > mode->name, mode->status); > } > drm_mode_destroy(dev, mode); > Index: linux-2.6/include/drm/drmP.h > =================================================================== > --- linux-2.6.orig/include/drm/drmP.h 2009-07-16 13:53:38.000000000 +0800 > +++ linux-2.6/include/drm/drmP.h 2009-07-16 14:04:44.000000000 +0800 > @@ -88,7 +88,6 @@ > #define DRM_UT_CORE 0x01 > #define DRM_UT_DRIVER 0x02 > #define DRM_UT_KMS 0x04 > -#define DRM_UT_MODE 0x08 > > extern void drm_ut_debug_printk(unsigned int request_level, > const char *prefix, > @@ -184,11 +183,6 @@ > drm_ut_debug_printk(DRM_UT_KMS, DRM_NAME, \ > __func__, fmt, ##args); \ > } while (0) > -#define DRM_DEBUG_MODE(fmt, args...) \ > - do { \ > - drm_ut_debug_printk(DRM_UT_MODE, DRM_NAME, \ > - __func__, fmt, ##args); \ > - } while (0) > #define DRM_LOG(fmt, args...) \ > do { \ > drm_ut_debug_printk(DRM_UT_CORE, NULL, \ > @@ -212,7 +206,6 @@ > #else > #define DRM_DEBUG_DRIVER(fmt, args...) do { } while (0) > #define DRM_DEBUG_KMS(fmt, args...) do { } while (0) > -#define DRM_DEBUG_MODE(fmt, args...) do { } while (0) > #define DRM_DEBUG(fmt, arg...) do { } while (0) > #define DRM_LOG(fmt, arg...) do { } while (0) > #define DRM_LOG_KMS(fmt, args...) do { } while (0) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkpfVa8ACgkQX1gOwKyEAw+OSQCfV+p4AVGEzTJpihHitg4yh1RC T+AAnimh4x7KnB5kTpu9BlkrV64SAOqR =AbYE -----END PGP SIGNATURE----- |