aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-11-21 00:02:47 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-11-28 18:56:36 -0500
commit9da49599a70eceac405287f34485ed57fe035393 (patch)
tree204a295710952d40ea24e136146a8ccf198aa485
parentd432a2db7df5d089bb022d8cbb30f6d6dc785039 (diff)
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: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_connector.c3
-rw-r--r--drivers/gpu/drm/nouveau/nv04_display.c5
-rw-r--r--drivers/gpu/drm/nouveau/nv50_crtc.c11
-rw-r--r--drivers/gpu/drm/nouveau/nv50_cursor.c4
-rw-r--r--drivers/gpu/drm/nouveau/nv50_dac.c3
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c6
-rw-r--r--drivers/gpu/drm/nouveau/nv50_sor.c7
7 files changed, 0 insertions, 39 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 9a6e2cb282dc..98d7e9238f6d 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -110,7 +110,6 @@ nouveau_connector_destroy(struct drm_connector *connector)
110 dev = nv_connector->base.dev; 110 dev = nv_connector->base.dev;
111 drm = nouveau_drm(dev); 111 drm = nouveau_drm(dev);
112 gpio = nouveau_gpio(drm->device); 112 gpio = nouveau_gpio(drm->device);
113 NV_DEBUG(drm, "\n");
114 113
115 if (gpio && nv_connector->hpd != DCB_GPIO_UNUSED) { 114 if (gpio && nv_connector->hpd != DCB_GPIO_UNUSED) {
116 gpio->isr_del(gpio, 0, nv_connector->hpd, 0xff, 115 gpio->isr_del(gpio, 0, nv_connector->hpd, 0xff,
@@ -929,8 +928,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
929 int type, ret = 0; 928 int type, ret = 0;
930 bool dummy; 929 bool dummy;
931 930
932 NV_DEBUG(drm, "\n");
933
934 list_for_each_entry(connector, &dev->mode_config.connector_list, head) { 931 list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
935 nv_connector = nouveau_connector(connector); 932 nv_connector = nouveau_connector(connector);
936 if (nv_connector->index == index) 933 if (nv_connector->index == index)
diff --git a/drivers/gpu/drm/nouveau/nv04_display.c b/drivers/gpu/drm/nouveau/nv04_display.c
index 846050f04c23..2cd6fb8c548e 100644
--- a/drivers/gpu/drm/nouveau/nv04_display.c
+++ b/drivers/gpu/drm/nouveau/nv04_display.c
@@ -60,8 +60,6 @@ nv04_display_create(struct drm_device *dev)
60 struct nv04_display *disp; 60 struct nv04_display *disp;
61 int i, ret; 61 int i, ret;
62 62
63 NV_DEBUG(drm, "\n");
64
65 disp = kzalloc(sizeof(*disp), GFP_KERNEL); 63 disp = kzalloc(sizeof(*disp), GFP_KERNEL);
66 if (!disp) 64 if (!disp)
67 return -ENOMEM; 65 return -ENOMEM;
@@ -132,13 +130,10 @@ nv04_display_create(struct drm_device *dev)
132void 130void
133nv04_display_destroy(struct drm_device *dev) 131nv04_display_destroy(struct drm_device *dev)
134{ 132{
135 struct nouveau_drm *drm = nouveau_drm(dev);
136 struct nv04_display *disp = nv04_display(dev); 133 struct nv04_display *disp = nv04_display(dev);
137 struct drm_encoder *encoder; 134 struct drm_encoder *encoder;
138 struct drm_crtc *crtc; 135 struct drm_crtc *crtc;
139 136
140 NV_DEBUG(drm, "\n");
141
142 /* Turn every CRTC off. */ 137 /* Turn every CRTC off. */
143 list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { 138 list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
144 struct drm_mode_set modeset = { 139 struct drm_mode_set modeset = {
diff --git a/drivers/gpu/drm/nouveau/nv50_crtc.c b/drivers/gpu/drm/nouveau/nv50_crtc.c
index 222de77d6269..1ba98059a417 100644
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
@@ -42,13 +42,10 @@
42static void 42static void
43nv50_crtc_lut_load(struct drm_crtc *crtc) 43nv50_crtc_lut_load(struct drm_crtc *crtc)
44{ 44{
45 struct nouveau_drm *drm = nouveau_drm(crtc->dev);
46 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); 45 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
47 void __iomem *lut = nvbo_kmap_obj_iovirtual(nv_crtc->lut.nvbo); 46 void __iomem *lut = nvbo_kmap_obj_iovirtual(nv_crtc->lut.nvbo);
48 int i; 47 int i;
49 48
50 NV_DEBUG(drm, "\n");
51
52 for (i = 0; i < 256; i++) { 49 for (i = 0; i < 256; i++) {
53 writew(nv_crtc->lut.r[i] >> 2, lut + 8*i + 0); 50 writew(nv_crtc->lut.r[i] >> 2, lut + 8*i + 0);
54 writew(nv_crtc->lut.g[i] >> 2, lut + 8*i + 2); 51 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 int scaling_mode, ret; 236 int scaling_mode, ret;
240 u32 ctrl = 0, oX, oY; 237 u32 ctrl = 0, oX, oY;
241 238
242 NV_DEBUG(drm, "\n");
243
244 nv_connector = nouveau_crtc_connector_get(nv_crtc); 239 nv_connector = nouveau_crtc_connector_get(nv_crtc);
245 if (!nv_connector || !nv_connector->native_mode) { 240 if (!nv_connector || !nv_connector->native_mode) {
246 NV_ERROR(drm, "no native mode, forcing panel scaling\n"); 241 NV_ERROR(drm, "no native mode, forcing panel scaling\n");
@@ -343,9 +338,6 @@ static void
343nv50_crtc_destroy(struct drm_crtc *crtc) 338nv50_crtc_destroy(struct drm_crtc *crtc)
344{ 339{
345 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); 340 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
346 struct nouveau_drm *drm = nouveau_drm(crtc->dev);
347
348 NV_DEBUG(drm, "\n");
349 341
350 nouveau_bo_unmap(nv_crtc->lut.nvbo); 342 nouveau_bo_unmap(nv_crtc->lut.nvbo);
351 nouveau_bo_ref(NULL, &nv_crtc->lut.nvbo); 343 nouveau_bo_ref(NULL, &nv_crtc->lut.nvbo);
@@ -702,12 +694,9 @@ static const struct drm_crtc_helper_funcs nv50_crtc_helper_funcs = {
702int 694int
703nv50_crtc_create(struct drm_device *dev, int index) 695nv50_crtc_create(struct drm_device *dev, int index)
704{ 696{
705 struct nouveau_drm *drm = nouveau_drm(dev);
706 struct nouveau_crtc *nv_crtc = NULL; 697 struct nouveau_crtc *nv_crtc = NULL;
707 int ret, i; 698 int ret, i;
708 699
709 NV_DEBUG(drm, "\n");
710
711 nv_crtc = kzalloc(sizeof(*nv_crtc), GFP_KERNEL); 700 nv_crtc = kzalloc(sizeof(*nv_crtc), GFP_KERNEL);
712 if (!nv_crtc) 701 if (!nv_crtc)
713 return -ENOMEM; 702 return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv50_cursor.c b/drivers/gpu/drm/nouveau/nv50_cursor.c
index 223da113ceee..230b270bc318 100644
--- a/drivers/gpu/drm/nouveau/nv50_cursor.c
+++ b/drivers/gpu/drm/nouveau/nv50_cursor.c
@@ -39,8 +39,6 @@ nv50_cursor_show(struct nouveau_crtc *nv_crtc, bool update)
39 struct nouveau_channel *evo = nv50_display(dev)->master; 39 struct nouveau_channel *evo = nv50_display(dev)->master;
40 int ret; 40 int ret;
41 41
42 NV_DEBUG(drm, "\n");
43
44 if (update && nv_crtc->cursor.visible) 42 if (update && nv_crtc->cursor.visible)
45 return; 43 return;
46 44
@@ -74,8 +72,6 @@ nv50_cursor_hide(struct nouveau_crtc *nv_crtc, bool update)
74 struct nouveau_channel *evo = nv50_display(dev)->master; 72 struct nouveau_channel *evo = nv50_display(dev)->master;
75 int ret; 73 int ret;
76 74
77 NV_DEBUG(drm, "\n");
78
79 if (update && !nv_crtc->cursor.visible) 75 if (update && !nv_crtc->cursor.visible)
80 return; 76 return;
81 77
diff --git a/drivers/gpu/drm/nouveau/nv50_dac.c b/drivers/gpu/drm/nouveau/nv50_dac.c
index 6a30a1748573..de964e84c74f 100644
--- a/drivers/gpu/drm/nouveau/nv50_dac.c
+++ b/drivers/gpu/drm/nouveau/nv50_dac.c
@@ -279,13 +279,10 @@ static void
279nv50_dac_destroy(struct drm_encoder *encoder) 279nv50_dac_destroy(struct drm_encoder *encoder)
280{ 280{
281 struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); 281 struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
282 struct nouveau_drm *drm = nouveau_drm(encoder->dev);
283 282
284 if (!encoder) 283 if (!encoder)
285 return; 284 return;
286 285
287 NV_DEBUG(drm, "\n");
288
289 drm_encoder_cleanup(encoder); 286 drm_encoder_cleanup(encoder);
290 kfree(nv_encoder); 287 kfree(nv_encoder);
291} 288}
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index f97b42cbb6bb..9c849e5347dd 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -122,8 +122,6 @@ nv50_display_init(struct drm_device *dev)
122 int ret, i; 122 int ret, i;
123 u32 val; 123 u32 val;
124 124
125 NV_DEBUG(drm, "\n");
126
127 nv_wr32(device, 0x00610184, nv_rd32(device, 0x00614004)); 125 nv_wr32(device, 0x00610184, nv_rd32(device, 0x00614004));
128 126
129 /* 127 /*
@@ -239,8 +237,6 @@ nv50_display_fini(struct drm_device *dev)
239 struct drm_crtc *drm_crtc; 237 struct drm_crtc *drm_crtc;
240 int ret, i; 238 int ret, i;
241 239
242 NV_DEBUG(drm, "\n");
243
244 list_for_each_entry(drm_crtc, &dev->mode_config.crtc_list, head) { 240 list_for_each_entry(drm_crtc, &dev->mode_config.crtc_list, head) {
245 struct nouveau_crtc *crtc = nouveau_crtc(drm_crtc); 241 struct nouveau_crtc *crtc = nouveau_crtc(drm_crtc);
246 242
@@ -307,8 +303,6 @@ nv50_display_create(struct drm_device *dev)
307 struct nv50_display *priv; 303 struct nv50_display *priv;
308 int ret, i; 304 int ret, i;
309 305
310 NV_DEBUG(drm, "\n");
311
312 priv = kzalloc(sizeof(*priv), GFP_KERNEL); 306 priv = kzalloc(sizeof(*priv), GFP_KERNEL);
313 if (!priv) 307 if (!priv)
314 return -ENOMEM; 308 return -ENOMEM;
diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
index b562b59e1326..9b903ca1d1b9 100644
--- a/drivers/gpu/drm/nouveau/nv50_sor.c
+++ b/drivers/gpu/drm/nouveau/nv50_sor.c
@@ -474,12 +474,8 @@ static void
474nv50_sor_destroy(struct drm_encoder *encoder) 474nv50_sor_destroy(struct drm_encoder *encoder)
475{ 475{
476 struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); 476 struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
477 struct nouveau_drm *drm = nouveau_drm(encoder->dev);
478
479 NV_DEBUG(drm, "\n");
480 477
481 drm_encoder_cleanup(encoder); 478 drm_encoder_cleanup(encoder);
482
483 kfree(nv_encoder); 479 kfree(nv_encoder);
484} 480}
485 481
@@ -492,12 +488,9 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *entry)
492{ 488{
493 struct nouveau_encoder *nv_encoder = NULL; 489 struct nouveau_encoder *nv_encoder = NULL;
494 struct drm_device *dev = connector->dev; 490 struct drm_device *dev = connector->dev;
495 struct nouveau_drm *drm = nouveau_drm(dev);
496 struct drm_encoder *encoder; 491 struct drm_encoder *encoder;
497 int type; 492 int type;
498 493
499 NV_DEBUG(drm, "\n");
500
501 switch (entry->type) { 494 switch (entry->type) {
502 case DCB_OUTPUT_TMDS: 495 case DCB_OUTPUT_TMDS:
503 case DCB_OUTPUT_DP: 496 case DCB_OUTPUT_DP: