Commit 959b077f authored by Jani Nikula's avatar Jani Nikula

drm/print: move drm_debug variable to drm_print.[ch]

Move drm_debug variable declaration and definition to where they are
relevant and needed. No functional changes.
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarEric Engestrom <eric@engestrom.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/71a566c68883b6e6c61414cd9f7c36c84015edb1.1569329774.git.jani.nikula@intel.com
parent e22b86e9
...@@ -46,26 +46,9 @@ ...@@ -46,26 +46,9 @@
#include "drm_internal.h" #include "drm_internal.h"
#include "drm_legacy.h" #include "drm_legacy.h"
/*
* drm_debug: Enable debug output.
* Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
*/
unsigned int drm_debug = 0;
EXPORT_SYMBOL(drm_debug);
MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"); MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl");
MODULE_DESCRIPTION("DRM shared core routines"); MODULE_DESCRIPTION("DRM shared core routines");
MODULE_LICENSE("GPL and additional rights"); MODULE_LICENSE("GPL and additional rights");
MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n"
"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n"
"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n"
"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n"
"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n"
"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n"
"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
module_param_named(debug, drm_debug, int, 0600);
static DEFINE_SPINLOCK(drm_minor_lock); static DEFINE_SPINLOCK(drm_minor_lock);
static struct idr drm_minors_idr; static struct idr drm_minors_idr;
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/moduleparam.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -35,6 +36,24 @@ ...@@ -35,6 +36,24 @@
#include <drm/drm_drv.h> #include <drm/drm_drv.h>
#include <drm/drm_print.h> #include <drm/drm_print.h>
/*
* drm_debug: Enable debug output.
* Bitmask of DRM_UT_x. See include/drm/drm_print.h for details.
*/
unsigned int drm_debug;
EXPORT_SYMBOL(drm_debug);
MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug category.\n"
"\t\tBit 0 (0x01) will enable CORE messages (drm core code)\n"
"\t\tBit 1 (0x02) will enable DRIVER messages (drm controller code)\n"
"\t\tBit 2 (0x04) will enable KMS messages (modesetting code)\n"
"\t\tBit 3 (0x08) will enable PRIME messages (prime code)\n"
"\t\tBit 4 (0x10) will enable ATOMIC messages (atomic code)\n"
"\t\tBit 5 (0x20) will enable VBL messages (vblank code)\n"
"\t\tBit 7 (0x80) will enable LEASE messages (leasing code)\n"
"\t\tBit 8 (0x100) will enable DP messages (displayport code)");
module_param_named(debug, drm_debug, int, 0600);
void __drm_puts_coredump(struct drm_printer *p, const char *str) void __drm_puts_coredump(struct drm_printer *p, const char *str)
{ {
struct drm_print_iterator *iterator = p->arg; struct drm_print_iterator *iterator = p->arg;
......
...@@ -778,8 +778,6 @@ struct drm_driver { ...@@ -778,8 +778,6 @@ struct drm_driver {
int dev_priv_size; int dev_priv_size;
}; };
extern unsigned int drm_debug;
int drm_dev_init(struct drm_device *dev, int drm_dev_init(struct drm_device *dev,
struct drm_driver *driver, struct drm_driver *driver,
struct device *parent); struct device *parent);
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <drm/drm.h> #include <drm/drm.h>
extern unsigned int drm_debug;
/** /**
* DOC: print * DOC: print
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment