[PATCH] debug mode configure changes

[Leandro D. <ldo...@gm...>]

Changing the enable/disable mechanism for debug in drm, now
it may be defined while configuring the kernel, does not need
to change the source code to enable or disable it, a bit closer
to what has been done in the rest of the kernel.

Signed-off-by: Leandro Dorileo <do...@os...>
---
  drivers/char/drm/Kconfig    |    6 ++++++
  drivers/char/drm/drmP.h     |    5 +----
  drivers/char/drm/drm_proc.c |    6 +++---
  3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/drivers/char/drm/Kconfig b/drivers/char/drm/Kconfig
index 0b7ffa5..2794175 100644
--- a/drivers/char/drm/Kconfig
+++ b/drivers/char/drm/Kconfig
@@ -16,6 +16,12 @@ config DRM
  	  details.  You should also select and configure AGP
  	  (/dev/agpgart) support.
  
+config DRM_DEBUG
+	bool "DRM debuging"
+	depends DRM
+	help
+	  Enables DRM debuging - development only.
+
  config DRM_TDFX
  	tristate "3dfx Banshee/Voodoo3+"
  	depends on DRM && PCI
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0df87fc..babb238 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -105,9 +105,6 @@
  /** \name Begin the DRM... */
  /*@{*/
  
-#define DRM_DEBUG_CODE 2	  /**< Include debugging code if > 1, then
-				     also include looping detection. */
-
  #define DRM_MAGIC_HASH_ORDER  4  /**< Size of key hash table. Must be power of 2. */
  #define DRM_KERNEL_CONTEXT    0	 /**< Change drm_resctx if changed */
  #define DRM_RESERVED_CONTEXTS 1	 /**< Change drm_resctx if changed */
@@ -179,7 +176,7 @@
   * \param fmt printf() like format string.
   * \param arg arguments
   */
-#if DRM_DEBUG_CODE
+#if CONFIG_DRM_DEBUG
  #define DRM_DEBUG(fmt, arg...)						\
  	do {								\
  		if ( drm_debug )			\
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c
index 12dfea8..49cbe09 100644
--- a/drivers/char/drm/drm_proc.c
+++ b/drivers/char/drm/drm_proc.c
@@ -49,7 +49,7 @@ static int drm_queues_info(char *buf, char **start, off_t offset,
  			   int request, int *eof, void *data);
  static int drm_bufs_info(char *buf, char **start, off_t offset,
  			 int request, int *eof, void *data);
-#if DRM_DEBUG_CODE
+#ifdef CONFIG_DRM_DEBUG
  static int drm_vma_info(char *buf, char **start, off_t offset,
  			int request, int *eof, void *data);
  #endif
@@ -67,7 +67,7 @@ static struct drm_proc_list {
  	{"clients", drm_clients_info},
  	{"queues", drm_queues_info},
  	{"bufs", drm_bufs_info},
-#if DRM_DEBUG_CODE
+#if CONFIG_DRM_DEBUG
  	{"vma", drm_vma_info},
  #endif
  };
@@ -471,7 +471,7 @@ static int drm_clients_info(char *buf, char **start, off_t offset,
  	return ret;
  }
  
-#if DRM_DEBUG_CODE
+#if CONFIG_DRM_DEBUG
  
  static int drm__vma_info(char *buf, char **start, off_t offset, int request,
  			 int *eof, void *data)
-- 
1.5.2.4