drm/nouveau: add Kconfig options for debug control

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 97a81260485a15fb360a4fa6dfc37ac910fca303..8a55beeb8bdc210acec214ee07542f20f63f17df 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -17,6 +17,34 @@ config DRM_NOUVEAU
        help
          Choose this option for open-source nVidia support.
 
+config NOUVEAU_DEBUG
+       int "Maximum debug level"
+       depends on DRM_NOUVEAU
+       range 0 7
+       default 5
+       help
+         Selects the maximum debug level to compile support for.
+
+         0 - fatal
+         1 - error
+         2 - warning
+         3 - info
+         4 - debug
+         5 - trace (recommended)
+         6 - paranoia
+         7 - spam
+
+         The paranoia and spam levels will add a lot of extra checks which
+         may potentially slow down driver operation.
+
+config NOUVEAU_DEBUG_DEFAULT
+       int "Default debug level"
+       depends on DRM_NOUVEAU
+       range 0 7
+       default 3
+       help
+         Selects the default debug level
+
 config DRM_NOUVEAU_BACKLIGHT
        bool "Support for backlight control"
        depends on DRM_NOUVEAU
@@ -25,14 +53,6 @@ config DRM_NOUVEAU_BACKLIGHT
          Say Y here if you want to control the backlight of your display
          (e.g. a laptop panel).
 
-config DRM_NOUVEAU_DEBUG
-       bool "Build in Nouveau's debugfs support"
-       depends on DRM_NOUVEAU && DEBUG_FS
-       default y
-       help
-         Say Y here if you want Nouveau to output debugging information
-         via debugfs.
-
 menu "I2C encoder or helper chips"
      depends on DRM && DRM_KMS_HELPER && I2C
 

diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile
index fe14f4bffde1c14ad15f551fab7dc856da9b9724..97a091961a9b9a014e8c0e1f34e801ec53d56a24 100644 (file)
--- a/drivers/gpu/drm/nouveau/Makefile
+++ b/drivers/gpu/drm/nouveau/Makefile
@@ -2,7 +2,7 @@
 # Makefile for the drm device driver.  This driver provides support for the
 # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
 
-ccflags-y := -Iinclude/drm -DCONFIG_NOUVEAU_DEBUG=7 -DCONFIG_NOUVEAU_DEBUG_DEFAULT=3
+ccflags-y := -Iinclude/drm
 ccflags-y += -I$(src)/core/include
 ccflags-y += -I$(src)/core
 ccflags-y += -I$(src)