Commit 9da49599 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: remove newline-only NV_DEBUG calls

This used to output the function name, now doesn't, so just looks
stupid.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent d432a2db
...@@ -110,7 +110,6 @@ nouveau_connector_destroy(struct drm_connector *connector) ...@@ -110,7 +110,6 @@ nouveau_connector_destroy(struct drm_connector *connector)
dev = nv_connector->base.dev; dev = nv_connector->base.dev;
drm = nouveau_drm(dev); drm = nouveau_drm(dev);
gpio = nouveau_gpio(drm->device); gpio = nouveau_gpio(drm->device);
NV_DEBUG(drm, "\n");
if (gpio && nv_connector->hpd != DCB_GPIO_UNUSED) { if (gpio && nv_connector->hpd != DCB_GPIO_UNUSED) {
gpio->isr_del(gpio, 0, nv_connector->hpd, 0xff, gpio->isr_del(gpio, 0, nv_connector->hpd, 0xff,
...@@ -929,8 +928,6 @@ nouveau_connector_create(struct drm_device *dev, int index) ...@@ -929,8 +928,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
int type, ret = 0; int type, ret = 0;
bool dummy; bool dummy;
NV_DEBUG(drm, "\n");
list_for_each_entry(connector, &dev->mode_config.connector_list, head) { list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
nv_connector = nouveau_connector(connector); nv_connector = nouveau_connector(connector);
if (nv_connector->index == index) if (nv_connector->index == index)
......
...@@ -60,8 +60,6 @@ nv04_display_create(struct drm_device *dev) ...@@ -60,8 +60,6 @@ nv04_display_create(struct drm_device *dev)
struct nv04_display *disp; struct nv04_display *disp;
int i, ret; int i, ret;
NV_DEBUG(drm, "\n");
disp = kzalloc(sizeof(*disp), GFP_KERNEL); disp = kzalloc(sizeof(*disp), GFP_KERNEL);
if (!disp) if (!disp)
return -ENOMEM; return -ENOMEM;
...@@ -132,13 +130,10 @@ nv04_display_create(struct drm_device *dev) ...@@ -132,13 +130,10 @@ nv04_display_create(struct drm_device *dev)
void void
nv04_display_destroy(struct drm_device *dev) nv04_display_destroy(struct drm_device *dev)
{ {
struct nouveau_drm *drm = nouveau_drm(dev);
struct nv04_display *disp = nv04_display(dev); struct nv04_display *disp = nv04_display(dev);
struct drm_encoder *encoder; struct drm_encoder *encoder;
struct drm_crtc *crtc; struct drm_crtc *crtc;
NV_DEBUG(drm, "\n");
/* Turn every CRTC off. */ /* Turn every CRTC off. */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
struct drm_mode_set modeset = { struct drm_mode_set modeset = {
......
...@@ -42,13 +42,10 @@ ...@@ -42,13 +42,10 @@
static void static void
nv50_crtc_lut_load(struct drm_crtc *crtc) nv50_crtc_lut_load(struct drm_crtc *crtc)
{ {
struct nouveau_drm *drm = nouveau_drm(crtc->dev);
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
void __iomem *lut = nvbo_kmap_obj_iovirtual(nv_crtc->lut.nvbo); void __iomem *lut = nvbo_kmap_obj_iovirtual(nv_crtc->lut.nvbo);
int i; int i;
NV_DEBUG(drm, "\n");
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
writew(nv_crtc->lut.r[i] >> 2, lut + 8*i + 0); writew(nv_crtc->lut.r[i] >> 2, lut + 8*i + 0);
writew(nv_crtc->lut.g[i] >> 2, lut + 8*i + 2); writew(nv_crtc->lut.g[i] >> 2, lut + 8*i + 2);
...@@ -239,8 +236,6 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update) ...@@ -239,8 +236,6 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)
int scaling_mode, ret; int scaling_mode, ret;
u32 ctrl = 0, oX, oY; u32 ctrl = 0, oX, oY;
NV_DEBUG(drm, "\n");
nv_connector = nouveau_crtc_connector_get(nv_crtc); nv_connector = nouveau_crtc_connector_get(nv_crtc);
if (!nv_connector || !nv_connector->native_mode) { if (!nv_connector || !nv_connector->native_mode) {
NV_ERROR(drm, "no native mode, forcing panel scaling\n"); NV_ERROR(drm, "no native mode, forcing panel scaling\n");
...@@ -343,9 +338,6 @@ static void ...@@ -343,9 +338,6 @@ static void
nv50_crtc_destroy(struct drm_crtc *crtc) nv50_crtc_destroy(struct drm_crtc *crtc)
{ {
struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
struct nouveau_drm *drm = nouveau_drm(crtc->dev);
NV_DEBUG(drm, "\n");
nouveau_bo_unmap(nv_crtc->lut.nvbo); nouveau_bo_unmap(nv_crtc->lut.nvbo);
nouveau_bo_ref(NULL, &nv_crtc->lut.nvbo); nouveau_bo_ref(NULL, &nv_crtc->lut.nvbo);
...@@ -702,12 +694,9 @@ static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = { ...@@ -702,12 +694,9 @@ static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = {
int int
nv50_crtc_create(struct drm_device *dev, int index) nv50_crtc_create(struct drm_device *dev, int index)
{ {
struct nouveau_drm *drm = nouveau_drm(dev);
struct nouveau_crtc *nv_crtc = NULL; struct nouveau_crtc *nv_crtc = NULL;
int ret, i; int ret, i;
NV_DEBUG(drm, "\n");
nv_crtc = kzalloc(sizeof(*nv_crtc), GFP_KERNEL); nv_crtc = kzalloc(sizeof(*nv_crtc), GFP_KERNEL);
if (!nv_crtc) if (!nv_crtc)
return -ENOMEM; return -ENOMEM;
......
...@@ -39,8 +39,6 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update) ...@@ -39,8 +39,6 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
struct nouveau_channel *evo = nv50_display(dev)->master; struct nouveau_channel *evo = nv50_display(dev)->master;
int ret; int ret;
NV_DEBUG(drm, "\n");
if (update && nv_crtc->cursor.visible) if (update && nv_crtc->cursor.visible)
return; return;
...@@ -74,8 +72,6 @@ nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update) ...@@ -74,8 +72,6 @@ nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
struct nouveau_channel *evo = nv50_display(dev)->master; struct nouveau_channel *evo = nv50_display(dev)->master;
int ret; int ret;
NV_DEBUG(drm, "\n");
if (update && !nv_crtc->cursor.visible) if (update && !nv_crtc->cursor.visible)
return; return;
......
...@@ -279,13 +279,10 @@ static void ...@@ -279,13 +279,10 @@ static void
nv50_dac_destroy(struct drm_encoder *encoder) nv50_dac_destroy(struct drm_encoder *encoder)
{ {
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
struct nouveau_drm *drm = nouveau_drm(encoder->dev);
if (!encoder) if (!encoder)
return; return;
NV_DEBUG(drm, "\n");
drm_encoder_cleanup(encoder); drm_encoder_cleanup(encoder);
kfree(nv_encoder); kfree(nv_encoder);
} }
......
...@@ -122,8 +122,6 @@ nv50_display_init(struct drm_device *dev) ...@@ -122,8 +122,6 @@ nv50_display_init(struct drm_device *dev)
int ret, i; int ret, i;
u32 val; u32 val;
NV_DEBUG(drm, "\n");
nv_wr32(device, 0x00610184, nv_rd32(device, 0x00614004)); nv_wr32(device, 0x00610184, nv_rd32(device, 0x00614004));
/* /*
...@@ -239,8 +237,6 @@ nv50_display_fini(struct drm_device *dev) ...@@ -239,8 +237,6 @@ nv50_display_fini(struct drm_device *dev)
struct drm_crtc *drm_crtc; struct drm_crtc *drm_crtc;
int ret, i; int ret, i;
NV_DEBUG(drm, "\n");
list_for_each_entry(drm_crtc, &dev->mode_config.crtc_list, head) { list_for_each_entry(drm_crtc, &dev->mode_config.crtc_list, head) {
struct nouveau_crtc *crtc = nouveau_crtc(drm_crtc); struct nouveau_crtc *crtc = nouveau_crtc(drm_crtc);
...@@ -307,8 +303,6 @@ nv50_display_create(struct drm_device *dev) ...@@ -307,8 +303,6 @@ nv50_display_create(struct drm_device *dev)
struct nv50_display *priv; struct nv50_display *priv;
int ret, i; int ret, i;
NV_DEBUG(drm, "\n");
priv = kzalloc(sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
......
...@@ -474,12 +474,8 @@ static void ...@@ -474,12 +474,8 @@ static void
nv50_sor_destroy(struct drm_encoder *encoder) nv50_sor_destroy(struct drm_encoder *encoder)
{ {
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
struct nouveau_drm *drm = nouveau_drm(encoder->dev);
NV_DEBUG(drm, "\n");
drm_encoder_cleanup(encoder); drm_encoder_cleanup(encoder);
kfree(nv_encoder); kfree(nv_encoder);
} }
...@@ -492,12 +488,9 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *entry) ...@@ -492,12 +488,9 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *entry)
{ {
struct nouveau_encoder *nv_encoder = NULL; struct nouveau_encoder *nv_encoder = NULL;
struct drm_device *dev = connector->dev; struct drm_device *dev = connector->dev;
struct nouveau_drm *drm = nouveau_drm(dev);
struct drm_encoder *encoder; struct drm_encoder *encoder;
int type; int type;
NV_DEBUG(drm, "\n");
switch (entry->type) { switch (entry->type) {
case DCB_OUTPUT_TMDS: case DCB_OUTPUT_TMDS:
case DCB_OUTPUT_DP: case DCB_OUTPUT_DP:
......
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