aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/radeon_state.c
diff options
context:
space:
mode:
authorMárton Németh <nm127@freemail.hu>2008-01-24 00:58:57 -0500
committerDave Airlie <airlied@redhat.com>2008-02-07 00:09:39 -0500
commit3e684eae586a9b210a4517da5637a255b1ff5a92 (patch)
treed8703d708e8fd37f0f1a74d9328e2da3faa555fc /drivers/char/drm/radeon_state.c
parent4d1f78880e9631fb08052dcc8e3341eecea537e0 (diff)
drm: cleanup DRM_DEBUG() parameters
As DRM_DEBUG macro already prints out the __FUNCTION__ string (see drivers/char/drm/drmP.h), it is not worth doing this again. At some other places the ending "\n" was added. airlied:- I cleaned up a few that this patch missed also Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/radeon_state.c')
-rw-r--r--drivers/char/drm/radeon_state.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index f824f2f5fdc2..1dffdc3e7ef0 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -898,7 +898,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
898 int w = pbox[i].x2 - x; 898 int w = pbox[i].x2 - x;
899 int h = pbox[i].y2 - y; 899 int h = pbox[i].y2 - y;
900 900
901 DRM_DEBUG("dispatch clear %d,%d-%d,%d flags 0x%x\n", 901 DRM_DEBUG("%d,%d-%d,%d flags 0x%x\n",
902 x, y, w, h, flags); 902 x, y, w, h, flags);
903 903
904 if (flags & RADEON_FRONT) { 904 if (flags & RADEON_FRONT) {
@@ -1368,7 +1368,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev)
1368 int w = pbox[i].x2 - x; 1368 int w = pbox[i].x2 - x;
1369 int h = pbox[i].y2 - y; 1369 int h = pbox[i].y2 - y;
1370 1370
1371 DRM_DEBUG("dispatch swap %d,%d-%d,%d\n", x, y, w, h); 1371 DRM_DEBUG("%d,%d-%d,%d\n", x, y, w, h);
1372 1372
1373 BEGIN_RING(9); 1373 BEGIN_RING(9);
1374 1374
@@ -1422,8 +1422,7 @@ static void radeon_cp_dispatch_flip(struct drm_device * dev)
1422 int offset = (dev_priv->sarea_priv->pfCurrentPage == 1) 1422 int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
1423 ? dev_priv->front_offset : dev_priv->back_offset; 1423 ? dev_priv->front_offset : dev_priv->back_offset;
1424 RING_LOCALS; 1424 RING_LOCALS;
1425 DRM_DEBUG("%s: pfCurrentPage=%d\n", 1425 DRM_DEBUG("pfCurrentPage=%d\n",
1426 __FUNCTION__,
1427 dev_priv->sarea_priv->pfCurrentPage); 1426 dev_priv->sarea_priv->pfCurrentPage);
1428 1427
1429 /* Do some trivial performance monitoring... 1428 /* Do some trivial performance monitoring...
@@ -1562,7 +1561,7 @@ static void radeon_cp_dispatch_indirect(struct drm_device * dev,
1562{ 1561{
1563 drm_radeon_private_t *dev_priv = dev->dev_private; 1562 drm_radeon_private_t *dev_priv = dev->dev_private;
1564 RING_LOCALS; 1563 RING_LOCALS;
1565 DRM_DEBUG("indirect: buf=%d s=0x%x e=0x%x\n", buf->idx, start, end); 1564 DRM_DEBUG("buf=%d s=0x%x e=0x%x\n", buf->idx, start, end);
1566 1565
1567 if (start != end) { 1566 if (start != end) {
1568 int offset = (dev_priv->gart_buffers_offset 1567 int offset = (dev_priv->gart_buffers_offset
@@ -1758,7 +1757,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
1758 buf = radeon_freelist_get(dev); 1757 buf = radeon_freelist_get(dev);
1759 } 1758 }
1760 if (!buf) { 1759 if (!buf) {
1761 DRM_DEBUG("radeon_cp_dispatch_texture: EAGAIN\n"); 1760 DRM_DEBUG("EAGAIN\n");
1762 if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image))) 1761 if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
1763 return -EFAULT; 1762 return -EFAULT;
1764 return -EAGAIN; 1763 return -EAGAIN;
@@ -2413,7 +2412,7 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil
2413 2412
2414 LOCK_TEST_WITH_RETURN(dev, file_priv); 2413 LOCK_TEST_WITH_RETURN(dev, file_priv);
2415 2414
2416 DRM_DEBUG("indirect: idx=%d s=%d e=%d d=%d\n", 2415 DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
2417 indirect->idx, indirect->start, indirect->end, 2416 indirect->idx, indirect->start, indirect->end,
2418 indirect->discard); 2417 indirect->discard);
2419 2418
@@ -2779,7 +2778,7 @@ static int radeon_emit_wait(struct drm_device * dev, int flags)
2779 drm_radeon_private_t *dev_priv = dev->dev_private; 2778 drm_radeon_private_t *dev_priv = dev->dev_private;
2780 RING_LOCALS; 2779 RING_LOCALS;
2781 2780
2782 DRM_DEBUG("%s: %x\n", __FUNCTION__, flags); 2781 DRM_DEBUG("%x\n", flags);
2783 switch (flags) { 2782 switch (flags) {
2784 case RADEON_WAIT_2D: 2783 case RADEON_WAIT_2D:
2785 BEGIN_RING(2); 2784 BEGIN_RING(2);