diff options
author | Márton Németh <nm127@freemail.hu> | 2008-01-24 00:58:57 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-02-07 00:09:39 -0500 |
commit | 3e684eae586a9b210a4517da5637a255b1ff5a92 (patch) | |
tree | d8703d708e8fd37f0f1a74d9328e2da3faa555fc /drivers/char/drm/i810_dma.c | |
parent | 4d1f78880e9631fb08052dcc8e3341eecea537e0 (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/i810_dma.c')
-rw-r--r-- | drivers/char/drm/i810_dma.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index aa2fa9b184ac..8d7ea81c4b66 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c | |||
@@ -570,7 +570,7 @@ static void i810EmitState(struct drm_device * dev) | |||
570 | drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; | 570 | drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; |
571 | unsigned int dirty = sarea_priv->dirty; | 571 | unsigned int dirty = sarea_priv->dirty; |
572 | 572 | ||
573 | DRM_DEBUG("%s %x\n", __FUNCTION__, dirty); | 573 | DRM_DEBUG("%x\n", dirty); |
574 | 574 | ||
575 | if (dirty & I810_UPLOAD_BUFFERS) { | 575 | if (dirty & I810_UPLOAD_BUFFERS) { |
576 | i810EmitDestVerified(dev, sarea_priv->BufferState); | 576 | i810EmitDestVerified(dev, sarea_priv->BufferState); |
@@ -802,8 +802,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev) | |||
802 | int pitch = dev_priv->pitch; | 802 | int pitch = dev_priv->pitch; |
803 | RING_LOCALS; | 803 | RING_LOCALS; |
804 | 804 | ||
805 | DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n", | 805 | DRM_DEBUG("page=%d pfCurrentPage=%d\n", |
806 | __FUNCTION__, | ||
807 | dev_priv->current_page, | 806 | dev_priv->current_page, |
808 | dev_priv->sarea_priv->pf_current_page); | 807 | dev_priv->sarea_priv->pf_current_page); |
809 | 808 | ||
@@ -848,8 +847,6 @@ static void i810_dma_quiescent(struct drm_device * dev) | |||
848 | drm_i810_private_t *dev_priv = dev->dev_private; | 847 | drm_i810_private_t *dev_priv = dev->dev_private; |
849 | RING_LOCALS; | 848 | RING_LOCALS; |
850 | 849 | ||
851 | /* printk("%s\n", __FUNCTION__); */ | ||
852 | |||
853 | i810_kernel_lost_context(dev); | 850 | i810_kernel_lost_context(dev); |
854 | 851 | ||
855 | BEGIN_LP_RING(4); | 852 | BEGIN_LP_RING(4); |
@@ -869,8 +866,6 @@ static int i810_flush_queue(struct drm_device * dev) | |||
869 | int i, ret = 0; | 866 | int i, ret = 0; |
870 | RING_LOCALS; | 867 | RING_LOCALS; |
871 | 868 | ||
872 | /* printk("%s\n", __FUNCTION__); */ | ||
873 | |||
874 | i810_kernel_lost_context(dev); | 869 | i810_kernel_lost_context(dev); |
875 | 870 | ||
876 | BEGIN_LP_RING(2); | 871 | BEGIN_LP_RING(2); |
@@ -949,7 +944,7 @@ static int i810_dma_vertex(struct drm_device *dev, void *data, | |||
949 | 944 | ||
950 | LOCK_TEST_WITH_RETURN(dev, file_priv); | 945 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
951 | 946 | ||
952 | DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n", | 947 | DRM_DEBUG("idx %d used %d discard %d\n", |
953 | vertex->idx, vertex->used, vertex->discard); | 948 | vertex->idx, vertex->used, vertex->discard); |
954 | 949 | ||
955 | if (vertex->idx < 0 || vertex->idx > dma->buf_count) | 950 | if (vertex->idx < 0 || vertex->idx > dma->buf_count) |
@@ -987,7 +982,7 @@ static int i810_clear_bufs(struct drm_device *dev, void *data, | |||
987 | static int i810_swap_bufs(struct drm_device *dev, void *data, | 982 | static int i810_swap_bufs(struct drm_device *dev, void *data, |
988 | struct drm_file *file_priv) | 983 | struct drm_file *file_priv) |
989 | { | 984 | { |
990 | DRM_DEBUG("i810_swap_bufs\n"); | 985 | DRM_DEBUG("\n"); |
991 | 986 | ||
992 | LOCK_TEST_WITH_RETURN(dev, file_priv); | 987 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
993 | 988 | ||
@@ -1068,11 +1063,10 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf, | |||
1068 | 1063 | ||
1069 | sarea_priv->dirty = 0x7f; | 1064 | sarea_priv->dirty = 0x7f; |
1070 | 1065 | ||
1071 | DRM_DEBUG("dispatch mc addr 0x%lx, used 0x%x\n", address, used); | 1066 | DRM_DEBUG("addr 0x%lx, used 0x%x\n", address, used); |
1072 | 1067 | ||
1073 | dev_priv->counter++; | 1068 | dev_priv->counter++; |
1074 | DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter); | 1069 | DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter); |
1075 | DRM_DEBUG("i810_dma_dispatch_mc\n"); | ||
1076 | DRM_DEBUG("start : %lx\n", start); | 1070 | DRM_DEBUG("start : %lx\n", start); |
1077 | DRM_DEBUG("used : %d\n", used); | 1071 | DRM_DEBUG("used : %d\n", used); |
1078 | DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4); | 1072 | DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4); |
@@ -1179,7 +1173,7 @@ static void i810_do_init_pageflip(struct drm_device * dev) | |||
1179 | { | 1173 | { |
1180 | drm_i810_private_t *dev_priv = dev->dev_private; | 1174 | drm_i810_private_t *dev_priv = dev->dev_private; |
1181 | 1175 | ||
1182 | DRM_DEBUG("%s\n", __FUNCTION__); | 1176 | DRM_DEBUG("\n"); |
1183 | dev_priv->page_flipping = 1; | 1177 | dev_priv->page_flipping = 1; |
1184 | dev_priv->current_page = 0; | 1178 | dev_priv->current_page = 0; |
1185 | dev_priv->sarea_priv->pf_current_page = dev_priv->current_page; | 1179 | dev_priv->sarea_priv->pf_current_page = dev_priv->current_page; |
@@ -1189,7 +1183,7 @@ static int i810_do_cleanup_pageflip(struct drm_device * dev) | |||
1189 | { | 1183 | { |
1190 | drm_i810_private_t *dev_priv = dev->dev_private; | 1184 | drm_i810_private_t *dev_priv = dev->dev_private; |
1191 | 1185 | ||
1192 | DRM_DEBUG("%s\n", __FUNCTION__); | 1186 | DRM_DEBUG("\n"); |
1193 | if (dev_priv->current_page != 0) | 1187 | if (dev_priv->current_page != 0) |
1194 | i810_dma_dispatch_flip(dev); | 1188 | i810_dma_dispatch_flip(dev); |
1195 | 1189 | ||
@@ -1202,7 +1196,7 @@ static int i810_flip_bufs(struct drm_device *dev, void *data, | |||
1202 | { | 1196 | { |
1203 | drm_i810_private_t *dev_priv = dev->dev_private; | 1197 | drm_i810_private_t *dev_priv = dev->dev_private; |
1204 | 1198 | ||
1205 | DRM_DEBUG("%s\n", __FUNCTION__); | 1199 | DRM_DEBUG("\n"); |
1206 | 1200 | ||
1207 | LOCK_TEST_WITH_RETURN(dev, file_priv); | 1201 | LOCK_TEST_WITH_RETURN(dev, file_priv); |
1208 | 1202 | ||