hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Márton Németh 2008-01-24 15:58:57 +10:00 committed by Dave Airlie
parent 4d1f78880e
commit 3e684eae58
28 changed files with 122 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/drm/ati_pcigart.c
View File

@ -41,7 +41,7 @@ static void *drm_ati_alloc_pcigart_table(int order)
struct page *page; struct page *page;
int i; int i;
DRM_DEBUG("%s: alloc %d order\n", __FUNCTION__, order); DRM_DEBUG("%d order\n", order);
address = __get_free_pages(GFP_KERNEL | __GFP_COMP, address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
order); order);
@ -54,7 +54,7 @@ static void *drm_ati_alloc_pcigart_table(int order)
for (i = 0; i < order; i++, page++) for (i = 0; i < order; i++, page++)
SetPageReserved(page); SetPageReserved(page);
DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address); DRM_DEBUG("returning 0x%08lx\n", address);
return (void *)address; return (void *)address;
} }
@ -63,7 +63,7 @@ static void drm_ati_free_pcigart_table(void *address, int order)
struct page *page; struct page *page;
int i; int i;
int num_pages = 1 << order; int num_pages = 1 << order;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
page = virt_to_page((unsigned long)address); page = virt_to_page((unsigned long)address);

4
drivers/char/drm/drm_irq.c
View File

@ -107,7 +107,7 @@ static int drm_irq_install(struct drm_device * dev)
dev->irq_enabled = 1; dev->irq_enabled = 1;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq); DRM_DEBUG("irq=%d\n", dev->irq);
if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) { if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) {
init_waitqueue_head(&dev->vbl_queue); init_waitqueue_head(&dev->vbl_queue);
@ -164,7 +164,7 @@ int drm_irq_uninstall(struct drm_device * dev)
if (!irq_enabled) if (!irq_enabled)
return -EINVAL; return -EINVAL;
DRM_DEBUG("%s: irq=%d\n", __FUNCTION__, dev->irq); DRM_DEBUG("irq=%d\n", dev->irq);
dev->driver->irq_uninstall(dev); dev->driver->irq_uninstall(dev);

10
drivers/char/drm/drm_scatter.c
View File

@ -67,7 +67,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
struct drm_sg_mem *entry; struct drm_sg_mem *entry;
unsigned long pages, i, j; unsigned long pages, i, j;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
if (!drm_core_check_feature(dev, DRIVER_SG)) if (!drm_core_check_feature(dev, DRIVER_SG))
return -EINVAL; return -EINVAL;
@ -81,7 +81,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
memset(entry, 0, sizeof(*entry)); memset(entry, 0, sizeof(*entry));
pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE; pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
DRM_DEBUG("sg size=%ld pages=%ld\n", request->size, pages); DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);
entry->pages = pages; entry->pages = pages;
entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist), entry->pagelist = drm_alloc(pages * sizeof(*entry->pagelist),
@ -122,8 +122,8 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
entry->handle = ScatterHandle((unsigned long)entry->virtual); entry->handle = ScatterHandle((unsigned long)entry->virtual);
DRM_DEBUG("sg alloc handle = %08lx\n", entry->handle); DRM_DEBUG("handle = %08lx\n", entry->handle);
DRM_DEBUG("sg alloc virtual = %p\n", entry->virtual); DRM_DEBUG("virtual = %p\n", entry->virtual);
for (i = (unsigned long)entry->virtual, j = 0; j < pages; for (i = (unsigned long)entry->virtual, j = 0; j < pages;
i += PAGE_SIZE, j++) { i += PAGE_SIZE, j++) {
@ -210,7 +210,7 @@ int drm_sg_free(struct drm_device *dev, void *data,
if (!entry || entry->handle != request->handle) if (!entry || entry->handle != request->handle)
return -EINVAL; return -EINVAL;
DRM_DEBUG("sg free virtual = %p\n", entry->virtual); DRM_DEBUG("virtual = %p\n", entry->virtual);
drm_sg_cleanup(entry); drm_sg_cleanup(entry);

4
drivers/char/drm/drm_vm.c
View File

@ -180,7 +180,7 @@ static __inline__ struct page *drm_do_vm_shm_nopage(struct vm_area_struct *vma,
return NOPAGE_SIGBUS; return NOPAGE_SIGBUS;
get_page(page); get_page(page);
DRM_DEBUG("shm_nopage 0x%lx\n", address); DRM_DEBUG("0x%lx\n", address);
return page; return page;
} }
@ -294,7 +294,7 @@ static __inline__ struct page *drm_do_vm_dma_nopage(struct vm_area_struct *vma,
get_page(page); get_page(page);
DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr); DRM_DEBUG("0x%lx (page %lu)\n", address, page_nr);
return page; return page;
} }

22
drivers/char/drm/i810_dma.c
View File

@ -570,7 +570,7 @@ static void i810EmitState(struct drm_device * dev)
drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_i810_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty; unsigned int dirty = sarea_priv->dirty;
DRM_DEBUG("%s %x\n", __FUNCTION__, dirty); DRM_DEBUG("%x\n", dirty);
if (dirty & I810_UPLOAD_BUFFERS) { if (dirty & I810_UPLOAD_BUFFERS) {
i810EmitDestVerified(dev, sarea_priv->BufferState); i810EmitDestVerified(dev, sarea_priv->BufferState);
@ -802,8 +802,7 @@ static void i810_dma_dispatch_flip(struct drm_device * dev)
int pitch = dev_priv->pitch; int pitch = dev_priv->pitch;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n", DRM_DEBUG("page=%d pfCurrentPage=%d\n",
__FUNCTION__,
dev_priv->current_page, dev_priv->current_page,
dev_priv->sarea_priv->pf_current_page); dev_priv->sarea_priv->pf_current_page);
@ -848,8 +847,6 @@ static void i810_dma_quiescent(struct drm_device * dev)
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
/* printk("%s\n", __FUNCTION__); */
i810_kernel_lost_context(dev); i810_kernel_lost_context(dev);
BEGIN_LP_RING(4); BEGIN_LP_RING(4);
@ -869,8 +866,6 @@ static int i810_flush_queue(struct drm_device * dev)
int i, ret = 0; int i, ret = 0;
RING_LOCALS; RING_LOCALS;
/* printk("%s\n", __FUNCTION__); */
i810_kernel_lost_context(dev); i810_kernel_lost_context(dev);
BEGIN_LP_RING(2); BEGIN_LP_RING(2);
@ -949,7 +944,7 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
DRM_DEBUG("i810 dma vertex, idx %d used %d discard %d\n", DRM_DEBUG("idx %d used %d discard %d\n",
vertex->idx, vertex->used, vertex->discard); vertex->idx, vertex->used, vertex->discard);
if (vertex->idx < 0 || vertex->idx > dma->buf_count) if (vertex->idx < 0 || vertex->idx > dma->buf_count)
@ -987,7 +982,7 @@ static int i810_clear_bufs(struct drm_device *dev, void *data,
static int i810_swap_bufs(struct drm_device *dev, void *data, static int i810_swap_bufs(struct drm_device *dev, void *data,
struct drm_file *file_priv) struct drm_file *file_priv)
{ {
DRM_DEBUG("i810_swap_bufs\n"); DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
@ -1068,11 +1063,10 @@ static void i810_dma_dispatch_mc(struct drm_device * dev, struct drm_buf * buf,
sarea_priv->dirty = 0x7f; sarea_priv->dirty = 0x7f;
DRM_DEBUG("dispatch mc addr 0x%lx, used 0x%x\n", address, used); DRM_DEBUG("addr 0x%lx, used 0x%x\n", address, used);
dev_priv->counter++; dev_priv->counter++;
DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter); DRM_DEBUG("dispatch counter : %ld\n", dev_priv->counter);
DRM_DEBUG("i810_dma_dispatch_mc\n");
DRM_DEBUG("start : %lx\n", start); DRM_DEBUG("start : %lx\n", start);
DRM_DEBUG("used : %d\n", used); DRM_DEBUG("used : %d\n", used);
DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4); DRM_DEBUG("start + used - 4 : %ld\n", start + used - 4);
@ -1179,7 +1173,7 @@ static void i810_do_init_pageflip(struct drm_device * dev)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
dev_priv->page_flipping = 1; dev_priv->page_flipping = 1;
dev_priv->current_page = 0; dev_priv->current_page = 0;
dev_priv->sarea_priv->pf_current_page = dev_priv->current_page; 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)
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
if (dev_priv->current_page != 0) if (dev_priv->current_page != 0)
i810_dma_dispatch_flip(dev); i810_dma_dispatch_flip(dev);
@ -1202,7 +1196,7 @@ static int i810_flip_bufs(struct drm_device *dev, void *data,
{ {
drm_i810_private_t *dev_priv = dev->dev_private; drm_i810_private_t *dev_priv = dev->dev_private;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);

2
drivers/char/drm/i810_drv.h
View File

@ -145,7 +145,7 @@ extern int i810_max_ioctl;
#define BEGIN_LP_RING(n) do { \ #define BEGIN_LP_RING(n) do { \
if (I810_VERBOSE) \ if (I810_VERBOSE) \
DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", n, __FUNCTION__); \ DRM_DEBUG("BEGIN_LP_RING(%d)\n", n); \
if (dev_priv->ring.space < n*4) \ if (dev_priv->ring.space < n*4) \
i810_wait_ring(dev, n*4); \ i810_wait_ring(dev, n*4); \
dev_priv->ring.space -= n*4; \ dev_priv->ring.space -= n*4; \

3
drivers/char/drm/i830_drv.h
View File

@ -156,8 +156,7 @@ extern int i830_driver_device_is_agp(struct drm_device * dev);
#define BEGIN_LP_RING(n) do { \ #define BEGIN_LP_RING(n) do { \
if (I830_VERBOSE) \ if (I830_VERBOSE) \
printk("BEGIN_LP_RING(%d) in %s\n", \ printk("BEGIN_LP_RING(%d)\n", (n)); \
n, __FUNCTION__); \
if (dev_priv->ring.space < n*4) \ if (dev_priv->ring.space < n*4) \
i830_wait_ring(dev, n*4, __FUNCTION__); \ i830_wait_ring(dev, n*4, __FUNCTION__); \
outcount = 0; \ outcount = 0; \

6
drivers/char/drm/i915_dma.c
View File

@ -657,7 +657,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
int value; int value;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -691,7 +691,7 @@ static int i915_setparam(struct drm_device *dev, void *data,
drm_i915_setparam_t *param = data; drm_i915_setparam_t *param = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -721,7 +721,7 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
drm_i915_hws_addr_t *hws = data; drm_i915_hws_addr_t *hws = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

5
drivers/char/drm/i915_drv.h
View File

@ -253,9 +253,8 @@ extern void i915_mem_release(struct drm_device * dev,
#define BEGIN_LP_RING(n) do { \ #define BEGIN_LP_RING(n) do { \
if (I915_VERBOSE) \ if (I915_VERBOSE) \
DRM_DEBUG("BEGIN_LP_RING(%d) in %s\n", \ DRM_DEBUG("BEGIN_LP_RING(%d)\n", (n)); \
(n), __FUNCTION__); \ if (dev_priv->ring.space < (n)*4) \
if (dev_priv->ring.space < (n)*4) \
i915_wait_ring(dev, (n)*4, __FUNCTION__); \ i915_wait_ring(dev, (n)*4, __FUNCTION__); \
outcount = 0; \ outcount = 0; \
outring = dev_priv->ring.tail; \ outring = dev_priv->ring.tail; \

20
drivers/char/drm/i915_irq.c
View File

@ -276,7 +276,7 @@ static int i915_emit_irq(struct drm_device * dev)
i915_kernel_lost_context(dev); i915_kernel_lost_context(dev);
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter; dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
@ -300,7 +300,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
int ret = 0; int ret = 0;
DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr, DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
READ_BREADCRUMB(dev_priv)); READ_BREADCRUMB(dev_priv));
if (READ_BREADCRUMB(dev_priv) >= irq_nr) if (READ_BREADCRUMB(dev_priv) >= irq_nr)
@ -312,8 +312,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
READ_BREADCRUMB(dev_priv) >= irq_nr); READ_BREADCRUMB(dev_priv) >= irq_nr);
if (ret == -EBUSY) { if (ret == -EBUSY) {
DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n", DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
__FUNCTION__,
READ_BREADCRUMB(dev_priv), (int)dev_priv->counter); READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
} }
@ -329,7 +328,7 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequ
int ret = 0; int ret = 0;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -365,7 +364,7 @@ int i915_irq_emit(struct drm_device *dev, void *data,
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -388,7 +387,7 @@ int i915_irq_wait(struct drm_device *dev, void *data,
drm_i915_irq_wait_t *irqwait = data; drm_i915_irq_wait_t *irqwait = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -418,13 +417,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
drm_i915_vblank_pipe_t *pipe = data; drm_i915_vblank_pipe_t *pipe = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) { if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
DRM_ERROR("%s called with invalid pipe 0x%x\n", DRM_ERROR("called with invalid pipe 0x%x\n", pipe->pipe);
__FUNCTION__, pipe->pipe);
return -EINVAL; return -EINVAL;
} }
@ -443,7 +441,7 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
u16 flag; u16 flag;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

8
drivers/char/drm/i915_mem.c
View File

@ -276,7 +276,7 @@ int i915_mem_alloc(struct drm_device *dev, void *data,
struct mem_block *block, **heap; struct mem_block *block, **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -314,7 +314,7 @@ int i915_mem_free(struct drm_device *dev, void *data,
struct mem_block *block, **heap; struct mem_block *block, **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -342,7 +342,7 @@ int i915_mem_init_heap(struct drm_device *dev, void *data,
struct mem_block **heap; struct mem_block **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -366,7 +366,7 @@ int i915_mem_destroy_heap( struct drm_device *dev, void *data,
struct mem_block **heap; struct mem_block **heap;
if ( !dev_priv ) { if ( !dev_priv ) {
DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ ); DRM_ERROR( "called with no initialization\n" );
return -EINVAL; return -EINVAL;
} }

2
drivers/char/drm/mga_dma.c
View File

@ -1050,7 +1050,7 @@ int mga_dma_flush(struct drm_device *dev, void *data,
#if MGA_DMA_DEBUG #if MGA_DMA_DEBUG
int ret = mga_do_wait_for_idle(dev_priv); int ret = mga_do_wait_for_idle(dev_priv);
if (ret < 0) if (ret < 0)
DRM_INFO("%s: -EBUSY\n", __FUNCTION__); DRM_INFO("-EBUSY\n");
return ret; return ret;
#else #else
return mga_do_wait_for_idle(dev_priv); return mga_do_wait_for_idle(dev_priv);

11
drivers/char/drm/mga_drv.h
View File

@ -249,7 +249,7 @@ do { \
} else if ( dev_priv->prim.space < \ } else if ( dev_priv->prim.space < \
dev_priv->prim.high_mark ) { \ dev_priv->prim.high_mark ) { \
if ( MGA_DMA_DEBUG ) \ if ( MGA_DMA_DEBUG ) \
DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \ DRM_INFO( "wrap...\n"); \
return -EBUSY; \ return -EBUSY; \
} \ } \
} \ } \
@ -260,7 +260,7 @@ do { \
if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \ if ( test_bit( 0, &dev_priv->prim.wrapped ) ) { \
if ( mga_do_wait_for_idle( dev_priv ) < 0 ) { \ if ( mga_do_wait_for_idle( dev_priv ) < 0 ) { \
if ( MGA_DMA_DEBUG ) \ if ( MGA_DMA_DEBUG ) \
DRM_INFO( "%s: wrap...\n", __FUNCTION__ ); \ DRM_INFO( "wrap...\n"); \
return -EBUSY; \ return -EBUSY; \
} \ } \
mga_do_dma_wrap_end( dev_priv ); \ mga_do_dma_wrap_end( dev_priv ); \
@ -280,8 +280,7 @@ do { \
#define BEGIN_DMA( n ) \ #define BEGIN_DMA( n ) \
do { \ do { \
if ( MGA_VERBOSE ) { \ if ( MGA_VERBOSE ) { \
DRM_INFO( "BEGIN_DMA( %d ) in %s\n", \ DRM_INFO( "BEGIN_DMA( %d )\n", (n) ); \
(n), __FUNCTION__ ); \
DRM_INFO( " space=0x%x req=0x%Zx\n", \ DRM_INFO( " space=0x%x req=0x%Zx\n", \
dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \ dev_priv->prim.space, (n) * DMA_BLOCK_SIZE ); \
} \ } \
@ -292,7 +291,7 @@ do { \
#define BEGIN_DMA_WRAP() \ #define BEGIN_DMA_WRAP() \
do { \ do { \
if ( MGA_VERBOSE ) { \ if ( MGA_VERBOSE ) { \
DRM_INFO( "BEGIN_DMA() in %s\n", __FUNCTION__ ); \ DRM_INFO( "BEGIN_DMA()\n" ); \
DRM_INFO( " space=0x%x\n", dev_priv->prim.space ); \ DRM_INFO( " space=0x%x\n", dev_priv->prim.space ); \
} \ } \
prim = dev_priv->prim.start; \ prim = dev_priv->prim.start; \
@ -311,7 +310,7 @@ do { \
#define FLUSH_DMA() \ #define FLUSH_DMA() \
do { \ do { \
if ( 0 ) { \ if ( 0 ) { \
DRM_INFO( "%s:\n", __FUNCTION__ ); \ DRM_INFO( "\n" ); \
DRM_INFO( " tail=0x%06x head=0x%06lx\n", \ DRM_INFO( " tail=0x%06x head=0x%06lx\n", \
dev_priv->prim.tail, \ dev_priv->prim.tail, \
MGA_READ( MGA_PRIMADDRESS ) - \ MGA_READ( MGA_PRIMADDRESS ) - \

14
drivers/char/drm/mga_state.c
View File

@ -619,7 +619,7 @@ static void mga_dma_dispatch_swap(struct drm_device * dev)
FLUSH_DMA(); FLUSH_DMA();
DRM_DEBUG("%s... done.\n", __FUNCTION__); DRM_DEBUG("... done.\n");
} }
static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf) static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
@ -631,7 +631,7 @@ static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * bu
u32 length = (u32) buf->used; u32 length = (u32) buf->used;
int i = 0; int i = 0;
DMA_LOCALS; DMA_LOCALS;
DRM_DEBUG("vertex: buf=%d used=%d\n", buf->idx, buf->used); DRM_DEBUG("buf=%d used=%d\n", buf->idx, buf->used);
if (buf->used) { if (buf->used) {
buf_priv->dispatched = 1; buf_priv->dispatched = 1;
@ -678,7 +678,7 @@ static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * b
u32 address = (u32) buf->bus_address; u32 address = (u32) buf->bus_address;
int i = 0; int i = 0;
DMA_LOCALS; DMA_LOCALS;
DRM_DEBUG("indices: buf=%d start=%d end=%d\n", buf->idx, start, end); DRM_DEBUG("buf=%d start=%d end=%d\n", buf->idx, start, end);
if (start != end) { if (start != end) {
buf_priv->dispatched = 1; buf_priv->dispatched = 1;
@ -955,7 +955,7 @@ static int mga_dma_iload(struct drm_device *dev, void *data, struct drm_file *fi
#if 0 #if 0
if (mga_do_wait_for_idle(dev_priv) < 0) { if (mga_do_wait_for_idle(dev_priv) < 0) {
if (MGA_DMA_DEBUG) if (MGA_DMA_DEBUG)
DRM_INFO("%s: -EBUSY\n", __FUNCTION__); DRM_INFO("-EBUSY\n");
return -EBUSY; return -EBUSY;
} }
#endif #endif
@ -1014,7 +1014,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil
int value; int value;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -1046,7 +1046,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fi
DMA_LOCALS; DMA_LOCALS;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -1075,7 +1075,7 @@ file_priv)
u32 *fence = data; u32 *fence = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

4
drivers/char/drm/r128_cce.c
View File

@ -651,7 +651,7 @@ int r128_cce_start(struct drm_device *dev, void *data, struct drm_file *file_pri
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) { if (dev_priv->cce_running || dev_priv->cce_mode == R128_PM4_NONPM4) {
DRM_DEBUG("%s while CCE running\n", __FUNCTION__); DRM_DEBUG("while CCE running\n");
return 0; return 0;
} }
@ -710,7 +710,7 @@ int r128_cce_reset(struct drm_device *dev, void *data, struct drm_file *file_pri
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_DEBUG("%s called before init done\n", __FUNCTION__); DRM_DEBUG("called before init done\n");
return -EINVAL; return -EINVAL;
} }

3
drivers/char/drm/r128_drv.h
View File

@ -462,8 +462,7 @@ do { \
#define BEGIN_RING( n ) do { \ #define BEGIN_RING( n ) do { \
if ( R128_VERBOSE ) { \ if ( R128_VERBOSE ) { \
DRM_INFO( "BEGIN_RING( %d ) in %s\n", \ DRM_INFO( "BEGIN_RING( %d )\n", (n)); \
(n), __FUNCTION__ ); \
} \ } \
if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \
COMMIT_RING(); \ COMMIT_RING(); \

43
drivers/char/drm/r128_state.c
View File

@ -42,7 +42,7 @@ static void r128_emit_clip_rects(drm_r128_private_t * dev_priv,
{ {
u32 aux_sc_cntl = 0x00000000; u32 aux_sc_cntl = 0x00000000;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING((count < 3 ? count : 3) * 5 + 2); BEGIN_RING((count < 3 ? count : 3) * 5 + 2);
@ -85,7 +85,7 @@ static __inline__ void r128_emit_core(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_context_regs_t *ctx = &sarea_priv->context_state; drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(2); BEGIN_RING(2);
@ -100,7 +100,7 @@ static __inline__ void r128_emit_context(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_context_regs_t *ctx = &sarea_priv->context_state; drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(13); BEGIN_RING(13);
@ -126,7 +126,7 @@ static __inline__ void r128_emit_setup(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_context_regs_t *ctx = &sarea_priv->context_state; drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(3); BEGIN_RING(3);
@ -142,7 +142,7 @@ static __inline__ void r128_emit_masks(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_context_regs_t *ctx = &sarea_priv->context_state; drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(5); BEGIN_RING(5);
@ -161,7 +161,7 @@ static __inline__ void r128_emit_window(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_context_regs_t *ctx = &sarea_priv->context_state; drm_r128_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(2); BEGIN_RING(2);
@ -178,7 +178,7 @@ static __inline__ void r128_emit_tex0(drm_r128_private_t * dev_priv)
drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0]; drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0];
int i; int i;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(7 + R128_MAX_TEXTURE_LEVELS); BEGIN_RING(7 + R128_MAX_TEXTURE_LEVELS);
@ -204,7 +204,7 @@ static __inline__ void r128_emit_tex1(drm_r128_private_t * dev_priv)
drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1]; drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1];
int i; int i;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG(" %s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(5 + R128_MAX_TEXTURE_LEVELS); BEGIN_RING(5 + R128_MAX_TEXTURE_LEVELS);
@ -226,7 +226,7 @@ static void r128_emit_state(drm_r128_private_t * dev_priv)
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty; unsigned int dirty = sarea_priv->dirty;
DRM_DEBUG("%s: dirty=0x%08x\n", __FUNCTION__, dirty); DRM_DEBUG("dirty=0x%08x\n", dirty);
if (dirty & R128_UPLOAD_CORE) { if (dirty & R128_UPLOAD_CORE) {
r128_emit_core(dev_priv); r128_emit_core(dev_priv);
@ -362,7 +362,7 @@ static void r128_cce_dispatch_clear(struct drm_device * dev,
unsigned int flags = clear->flags; unsigned int flags = clear->flags;
int i; int i;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
if (dev_priv->page_flipping && dev_priv->current_page == 1) { if (dev_priv->page_flipping && dev_priv->current_page == 1) {
unsigned int tmp = flags; unsigned int tmp = flags;
@ -466,7 +466,7 @@ static void r128_cce_dispatch_swap(struct drm_device * dev)
struct drm_clip_rect *pbox = sarea_priv->boxes; struct drm_clip_rect *pbox = sarea_priv->boxes;
int i; int i;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
#if R128_PERFORMANCE_BOXES #if R128_PERFORMANCE_BOXES
/* Do some trivial performance monitoring... /* Do some trivial performance monitoring...
@ -528,8 +528,7 @@ static void r128_cce_dispatch_flip(struct drm_device * dev)
{ {
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n", DRM_DEBUG("page=%d pfCurrentPage=%d\n",
__FUNCTION__,
dev_priv->current_page, dev_priv->sarea_priv->pfCurrentPage); dev_priv->current_page, dev_priv->sarea_priv->pfCurrentPage);
#if R128_PERFORMANCE_BOXES #if R128_PERFORMANCE_BOXES
@ -1156,7 +1155,7 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
int count, *x, *y; int count, *x, *y;
int i, xbuf_size, ybuf_size; int i, xbuf_size, ybuf_size;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
count = depth->n; count = depth->n;
if (count > 4096 || count <= 0) if (count > 4096 || count <= 0)
@ -1226,7 +1225,7 @@ static void r128_cce_dispatch_stipple(struct drm_device * dev, u32 * stipple)
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
int i; int i;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
BEGIN_RING(33); BEGIN_RING(33);
@ -1309,7 +1308,7 @@ static int r128_do_cleanup_pageflip(struct drm_device * dev)
static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *file_priv) static int r128_cce_flip(struct drm_device *dev, void *data, struct drm_file *file_priv)
{ {
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
@ -1328,7 +1327,7 @@ static int r128_cce_swap(struct drm_device *dev, void *data, struct drm_file *fi
{ {
drm_r128_private_t *dev_priv = dev->dev_private; drm_r128_private_t *dev_priv = dev->dev_private;
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
@ -1356,7 +1355,7 @@ static int r128_cce_vertex(struct drm_device *dev, void *data, struct drm_file *
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -1412,7 +1411,7 @@ static int r128_cce_indices(struct drm_device *dev, void *data, struct drm_file
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -1557,11 +1556,11 @@ static int r128_cce_indirect(struct drm_device *dev, void *data, struct drm_file
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
DRM_DEBUG("indirect: idx=%d s=%d e=%d d=%d\n", DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
indirect->idx, indirect->start, indirect->end, indirect->idx, indirect->start, indirect->end,
indirect->discard); indirect->discard);
@ -1622,7 +1621,7 @@ static int r128_getparam(struct drm_device *dev, void *data, struct drm_file *fi
int value; int value;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

8
drivers/char/drm/radeon_cp.c
View File

@ -1852,12 +1852,12 @@ int radeon_cp_start(struct drm_device *dev, void *data, struct drm_file *file_pr
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (dev_priv->cp_running) { if (dev_priv->cp_running) {
DRM_DEBUG("%s while CP running\n", __FUNCTION__); DRM_DEBUG("while CP running\n");
return 0; return 0;
} }
if (dev_priv->cp_mode == RADEON_CSQ_PRIDIS_INDDIS) { if (dev_priv->cp_mode == RADEON_CSQ_PRIDIS_INDDIS) {
DRM_DEBUG("%s called with bogus CP mode (%d)\n", DRM_DEBUG("called with bogus CP mode (%d)\n",
__FUNCTION__, dev_priv->cp_mode); dev_priv->cp_mode);
return 0; return 0;
} }
@ -1962,7 +1962,7 @@ int radeon_cp_reset(struct drm_device *dev, void *data, struct drm_file *file_pr
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_DEBUG("%s called before init done\n", __FUNCTION__); DRM_DEBUG("called before init done\n");
return -EINVAL; return -EINVAL;
} }

3
drivers/char/drm/radeon_drv.h
View File

@ -1114,8 +1114,7 @@ do { \
#define BEGIN_RING( n ) do { \ #define BEGIN_RING( n ) do { \
if ( RADEON_VERBOSE ) { \ if ( RADEON_VERBOSE ) { \
DRM_INFO( "BEGIN_RING( %d ) in %s\n", \ DRM_INFO( "BEGIN_RING( %d )\n", (n)); \
n, __FUNCTION__ ); \
} \ } \
if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \
COMMIT_RING(); \ COMMIT_RING(); \

6
drivers/char/drm/radeon_irq.c
View File

@ -154,7 +154,7 @@ static int radeon_driver_vblank_do_wait(struct drm_device * dev,
int ack = 0; int ack = 0;
atomic_t *counter; atomic_t *counter;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -205,7 +205,7 @@ int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_pr
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -227,7 +227,7 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr
drm_radeon_irq_wait_t *irqwait = data; drm_radeon_irq_wait_t *irqwait = data;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

6
drivers/char/drm/radeon_mem.c
View File

@ -224,7 +224,7 @@ int radeon_mem_alloc(struct drm_device *dev, void *data, struct drm_file *file_p
struct mem_block *block, **heap; struct mem_block *block, **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -259,7 +259,7 @@ int radeon_mem_free(struct drm_device *dev, void *data, struct drm_file *file_pr
struct mem_block *block, **heap; struct mem_block *block, **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -285,7 +285,7 @@ int radeon_mem_init_heap(struct drm_device *dev, void *data, struct drm_file *fi
struct mem_block **heap; struct mem_block **heap;
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }

15
drivers/char/drm/radeon_state.c
View File

@ -898,7 +898,7 @@ static void radeon_cp_dispatch_clear(struct drm_device * dev,
int w = pbox[i].x2 - x; int w = pbox[i].x2 - x;
int h = pbox[i].y2 - y; int h = pbox[i].y2 - y;
DRM_DEBUG("dispatch clear %d,%d-%d,%d flags 0x%x\n", DRM_DEBUG("%d,%d-%d,%d flags 0x%x\n",
x, y, w, h, flags); x, y, w, h, flags);
if (flags & RADEON_FRONT) { if (flags & RADEON_FRONT) {
@ -1368,7 +1368,7 @@ static void radeon_cp_dispatch_swap(struct drm_device * dev)
int w = pbox[i].x2 - x; int w = pbox[i].x2 - x;
int h = pbox[i].y2 - y; int h = pbox[i].y2 - y;
DRM_DEBUG("dispatch swap %d,%d-%d,%d\n", x, y, w, h); DRM_DEBUG("%d,%d-%d,%d\n", x, y, w, h);
BEGIN_RING(9); BEGIN_RING(9);
@ -1422,8 +1422,7 @@ static void radeon_cp_dispatch_flip(struct drm_device * dev)
int offset = (dev_priv->sarea_priv->pfCurrentPage == 1) int offset = (dev_priv->sarea_priv->pfCurrentPage == 1)
? dev_priv->front_offset : dev_priv->back_offset; ? dev_priv->front_offset : dev_priv->back_offset;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s: pfCurrentPage=%d\n", DRM_DEBUG("pfCurrentPage=%d\n",
__FUNCTION__,
dev_priv->sarea_priv->pfCurrentPage); dev_priv->sarea_priv->pfCurrentPage);
/* Do some trivial performance monitoring... /* Do some trivial performance monitoring...
@ -1562,7 +1561,7 @@ static void radeon_cp_dispatch_indirect(struct drm_device * dev,
{ {
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("indirect: buf=%d s=0x%x e=0x%x\n", buf->idx, start, end); DRM_DEBUG("buf=%d s=0x%x e=0x%x\n", buf->idx, start, end);
if (start != end) { if (start != end) {
int offset = (dev_priv->gart_buffers_offset int offset = (dev_priv->gart_buffers_offset
@ -1758,7 +1757,7 @@ static int radeon_cp_dispatch_texture(struct drm_device * dev,
buf = radeon_freelist_get(dev); buf = radeon_freelist_get(dev);
} }
if (!buf) { if (!buf) {
DRM_DEBUG("radeon_cp_dispatch_texture: EAGAIN\n"); DRM_DEBUG("EAGAIN\n");
if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image))) if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
return -EFAULT; return -EFAULT;
return -EAGAIN; return -EAGAIN;
@ -2413,7 +2412,7 @@ static int radeon_cp_indirect(struct drm_device *dev, void *data, struct drm_fil
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
DRM_DEBUG("indirect: idx=%d s=%d e=%d d=%d\n", DRM_DEBUG("idx=%d s=%d e=%d d=%d\n",
indirect->idx, indirect->start, indirect->end, indirect->idx, indirect->start, indirect->end,
indirect->discard); indirect->discard);
@ -2779,7 +2778,7 @@ static int radeon_emit_wait(struct drm_device * dev, int flags)
drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_private_t *dev_priv = dev->dev_private;
RING_LOCALS; RING_LOCALS;
DRM_DEBUG("%s: %x\n", __FUNCTION__, flags); DRM_DEBUG("%x\n", flags);
switch (flags) { switch (flags) {
case RADEON_WAIT_2D: case RADEON_WAIT_2D:
BEGIN_RING(2); BEGIN_RING(2);

4
drivers/char/drm/sis_mm.c
View File

@ -115,7 +115,7 @@ static int sis_fb_init(struct drm_device *dev, void *data, struct drm_file *file
dev_priv->vram_offset = fb->offset; dev_priv->vram_offset = fb->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size); DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
return 0; return 0;
} }
@ -205,7 +205,7 @@ static int sis_ioctl_agp_init(struct drm_device *dev, void *data,
dev_priv->agp_offset = agp->offset; dev_priv->agp_offset = agp->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u", agp->offset, agp->size); DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
return 0; return 0;
} }

20
drivers/char/drm/via_dma.c
View File

@ -179,14 +179,12 @@ static int via_initialize(struct drm_device * dev,
} }
if (dev_priv->ring.virtual_start != NULL) { if (dev_priv->ring.virtual_start != NULL) {
DRM_ERROR("%s called again without calling cleanup\n", DRM_ERROR("called again without calling cleanup\n");
__FUNCTION__);
return -EFAULT; return -EFAULT;
} }
if (!dev->agp || !dev->agp->base) { if (!dev->agp || !dev->agp->base) {
DRM_ERROR("%s called with no agp memory available\n", DRM_ERROR("called with no agp memory available\n");
__FUNCTION__);
return -EFAULT; return -EFAULT;
} }
@ -267,8 +265,7 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
dev_priv = (drm_via_private_t *) dev->dev_private; dev_priv = (drm_via_private_t *) dev->dev_private;
if (dev_priv->ring.virtual_start == NULL) { if (dev_priv->ring.virtual_start == NULL) {
DRM_ERROR("%s called without initializing AGP ring buffer.\n", DRM_ERROR("called without initializing AGP ring buffer.\n");
__FUNCTION__);
return -EFAULT; return -EFAULT;
} }
@ -337,8 +334,7 @@ static int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *fi
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
DRM_DEBUG("via cmdbuffer, buf %p size %lu\n", cmdbuf->buf, DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
cmdbuf->size);
ret = via_dispatch_cmdbuffer(dev, cmdbuf); ret = via_dispatch_cmdbuffer(dev, cmdbuf);
if (ret) { if (ret) {
@ -379,8 +375,7 @@ static int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
DRM_DEBUG("via_pci_cmdbuffer, buf %p size %lu\n", cmdbuf->buf, DRM_DEBUG("buf %p size %lu\n", cmdbuf->buf, cmdbuf->size);
cmdbuf->size);
ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf); ret = via_dispatch_pci_cmdbuffer(dev, cmdbuf);
if (ret) { if (ret) {
@ -648,14 +643,13 @@ static int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *
uint32_t tmp_size, count; uint32_t tmp_size, count;
drm_via_private_t *dev_priv; drm_via_private_t *dev_priv;
DRM_DEBUG("via cmdbuf_size\n"); DRM_DEBUG("\n");
LOCK_TEST_WITH_RETURN(dev, file_priv); LOCK_TEST_WITH_RETURN(dev, file_priv);
dev_priv = (drm_via_private_t *) dev->dev_private; dev_priv = (drm_via_private_t *) dev->dev_private;
if (dev_priv->ring.virtual_start == NULL) { if (dev_priv->ring.virtual_start == NULL) {
DRM_ERROR("%s called without initializing AGP ring buffer.\n", DRM_ERROR("called without initializing AGP ring buffer.\n");
__FUNCTION__);
return -EFAULT; return -EFAULT;
} }

26
drivers/char/drm/via_irq.c
View File

@ -169,9 +169,9 @@ int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
unsigned int cur_vblank; unsigned int cur_vblank;
int ret = 0; int ret = 0;
DRM_DEBUG("viadrv_vblank_wait\n"); DRM_DEBUG("\n");
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
@ -201,24 +201,23 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
maskarray_t *masks; maskarray_t *masks;
int real_irq; int real_irq;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
if (!dev_priv) { if (!dev_priv) {
DRM_ERROR("%s called with no initialization\n", __FUNCTION__); DRM_ERROR("called with no initialization\n");
return -EINVAL; return -EINVAL;
} }
if (irq >= drm_via_irq_num) { if (irq >= drm_via_irq_num) {
DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__, DRM_ERROR("Trying to wait on unknown irq %d\n", irq);
irq);
return -EINVAL; return -EINVAL;
} }
real_irq = dev_priv->irq_map[irq]; real_irq = dev_priv->irq_map[irq];
if (real_irq < 0) { if (real_irq < 0) {
DRM_ERROR("%s Video IRQ %d not available on this hardware.\n", DRM_ERROR("Video IRQ %d not available on this hardware.\n",
__FUNCTION__, irq); irq);
return -EINVAL; return -EINVAL;
} }
@ -251,7 +250,7 @@ void via_driver_irq_preinstall(struct drm_device * dev)
drm_via_irq_t *cur_irq; drm_via_irq_t *cur_irq;
int i; int i;
DRM_DEBUG("driver_irq_preinstall: dev_priv: %p\n", dev_priv); DRM_DEBUG("dev_priv: %p\n", dev_priv);
if (dev_priv) { if (dev_priv) {
cur_irq = dev_priv->via_irqs; cur_irq = dev_priv->via_irqs;
@ -298,7 +297,7 @@ void via_driver_irq_postinstall(struct drm_device * dev)
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
u32 status; u32 status;
DRM_DEBUG("via_driver_irq_postinstall\n"); DRM_DEBUG("\n");
if (dev_priv) { if (dev_priv) {
status = VIA_READ(VIA_REG_INTERRUPT); status = VIA_READ(VIA_REG_INTERRUPT);
VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL
@ -317,7 +316,7 @@ void via_driver_irq_uninstall(struct drm_device * dev)
drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private; drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
u32 status; u32 status;
DRM_DEBUG("driver_irq_uninstall)\n"); DRM_DEBUG("\n");
if (dev_priv) { if (dev_priv) {
/* Some more magic, oh for some data sheets ! */ /* Some more magic, oh for some data sheets ! */
@ -344,7 +343,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
return -EINVAL; return -EINVAL;
if (irqwait->request.irq >= dev_priv->num_irqs) { if (irqwait->request.irq >= dev_priv->num_irqs) {
DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__, DRM_ERROR("Trying to wait on unknown irq %d\n",
irqwait->request.irq); irqwait->request.irq);
return -EINVAL; return -EINVAL;
} }
@ -362,8 +361,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
} }
if (irqwait->request.type & VIA_IRQ_SIGNAL) { if (irqwait->request.type & VIA_IRQ_SIGNAL) {
DRM_ERROR("%s Signals on Via IRQs not implemented yet.\n", DRM_ERROR("Signals on Via IRQs not implemented yet.\n");
__FUNCTION__);
return -EINVAL; return -EINVAL;
} }

4
drivers/char/drm/via_map.c
View File

@ -29,7 +29,7 @@ static int via_do_init_map(struct drm_device * dev, drm_via_init_t * init)
{ {
drm_via_private_t *dev_priv = dev->dev_private; drm_via_private_t *dev_priv = dev->dev_private;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
dev_priv->sarea = drm_getsarea(dev); dev_priv->sarea = drm_getsarea(dev);
if (!dev_priv->sarea) { if (!dev_priv->sarea) {
@ -79,7 +79,7 @@ int via_map_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
{ {
drm_via_init_t *init = data; drm_via_init_t *init = data;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
switch (init->func) { switch (init->func) {
case VIA_INIT_MAP: case VIA_INIT_MAP:

4
drivers/char/drm/via_mm.c
View File

@ -53,7 +53,7 @@ int via_agp_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
dev_priv->agp_offset = agp->offset; dev_priv->agp_offset = agp->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u", agp->offset, agp->size); DRM_DEBUG("offset = %u, size = %u\n", agp->offset, agp->size);
return 0; return 0;
} }
@ -77,7 +77,7 @@ int via_fb_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
dev_priv->vram_offset = fb->offset; dev_priv->vram_offset = fb->offset;
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
DRM_DEBUG("offset = %u, size = %u", fb->offset, fb->size); DRM_DEBUG("offset = %u, size = %u\n", fb->offset, fb->size);
return 0; return 0;

4
drivers/char/drm/via_video.c
View File

@ -33,7 +33,7 @@ void via_init_futex(drm_via_private_t * dev_priv)
{ {
unsigned int i; unsigned int i;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) { for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) {
DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i])); DRM_INIT_WAITQUEUE(&(dev_priv->decoder_queue[i]));
@ -73,7 +73,7 @@ int via_decoder_futex(struct drm_device *dev, void *data, struct drm_file *file_
drm_via_sarea_t *sAPriv = dev_priv->sarea_priv; drm_via_sarea_t *sAPriv = dev_priv->sarea_priv;
int ret = 0; int ret = 0;
DRM_DEBUG("%s\n", __FUNCTION__); DRM_DEBUG("\n");
if (fx->lock > VIA_NR_XVMC_LOCKS) if (fx->lock > VIA_NR_XVMC_LOCKS)
return -EFAULT; return -EFAULT;