diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-09-12 13:38:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 13:13:11 +1000 |
| commit | aa74c3755ecc24914f9b3aaf5ba1436836697a7d (patch) | |
| tree | d7fce949134a6cdba4f86bb5bb3a8cb98a05f267 | |
| parent | fa6df8c163ddf1fba658059695ab9587f344712c (diff) | |
| download | linux-aa74c3755ecc24914f9b3aaf5ba1436836697a7d.tar.gz linux-aa74c3755ecc24914f9b3aaf5ba1436836697a7d.tar.bz2 linux-aa74c3755ecc24914f9b3aaf5ba1436836697a7d.zip | |
drm/nouveau: have drm debugging macros build on top of core macros
May kill the DRM version completely at some point, undecided..
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h index ab0c17430c66..3c12e9862e37 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.h +++ b/drivers/gpu/drm/nouveau/nouveau_drm.h @@ -132,20 +132,13 @@ nouveau_dev(struct drm_device *dev) int nouveau_drm_suspend(struct pci_dev *, pm_message_t); int nouveau_drm_resume(struct pci_dev *); -#define NV_PRINTK(level, code, drm, fmt, args...) \ - printk(level "nouveau " code "[ DRM][%s] " fmt, \ - pci_name((drm)->dev->pdev), ##args) -#define NV_FATAL(drm, fmt, args...) \ - NV_PRINTK(KERN_CRIT, "!", (drm), fmt, ##args) -#define NV_ERROR(drm, fmt, args...) \ - NV_PRINTK(KERN_ERR, "E", (drm), fmt, ##args) -#define NV_WARN(drm, fmt, args...) \ - NV_PRINTK(KERN_WARNING, "W", (drm), fmt, ##args) -#define NV_INFO(drm, fmt, args...) \ - NV_PRINTK(KERN_INFO, " ", (drm), fmt, ##args) -#define NV_DEBUG(drm, fmt, args...) do { \ +#define NV_FATAL(cli, fmt, args...) nv_fatal((cli), fmt, ##args) +#define NV_ERROR(cli, fmt, args...) nv_error((cli), fmt, ##args) +#define NV_WARN(cli, fmt, args...) nv_warn((cli), fmt, ##args) +#define NV_INFO(cli, fmt, args...) nv_info((cli), fmt, ##args) +#define NV_DEBUG(cli, fmt, args...) do { \ if (drm_debug & DRM_UT_DRIVER) \ - NV_PRINTK(KERN_DEBUG, "D", drm, fmt, ##args); \ + nv_info((cli), fmt, ##args); \ } while (0) #endif |