summaryrefslogtreecommitdiffstats
path: root/sys/dev/drm/r128_state.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/drm/r128_state.c')
-rw-r--r--sys/dev/drm/r128_state.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/drm/r128_state.c b/sys/dev/drm/r128_state.c
index ac086be..94ba460 100644
--- a/sys/dev/drm/r128_state.c
+++ b/sys/dev/drm/r128_state.c
@@ -51,7 +51,7 @@ static void r128_emit_clip_rects( drm_r128_private_t *dev_priv,
{
u32 aux_sc_cntl = 0x00000000;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 17 );
@@ -94,7 +94,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_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 2 );
@@ -109,7 +109,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_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 13 );
@@ -135,7 +135,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_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 3 );
@@ -151,7 +151,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_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 5 );
@@ -170,7 +170,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_context_regs_t *ctx = &sarea_priv->context_state;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 2 );
@@ -187,7 +187,7 @@ static __inline__ void r128_emit_tex0( drm_r128_private_t *dev_priv )
drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[0];
int i;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 7 + R128_MAX_TEXTURE_LEVELS );
@@ -213,7 +213,7 @@ static __inline__ void r128_emit_tex1( drm_r128_private_t *dev_priv )
drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1];
int i;
RING_LOCALS;
- DRM_DEBUG( " %s\n", __FUNCTION__ );
+ DRM_DEBUG( " %s\n", __func__ );
BEGIN_RING( 5 + R128_MAX_TEXTURE_LEVELS );
@@ -236,7 +236,7 @@ static __inline__ void r128_emit_state( drm_r128_private_t *dev_priv )
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
unsigned int dirty = sarea_priv->dirty;
- DRM_DEBUG( "%s: dirty=0x%08x\n", __FUNCTION__, dirty );
+ DRM_DEBUG( "%s: dirty=0x%08x\n", __func__, dirty );
if ( dirty & R128_UPLOAD_CORE ) {
r128_emit_core( dev_priv );
@@ -377,7 +377,7 @@ static void r128_cce_dispatch_clear( drm_device_t *dev,
unsigned int flags = clear->flags;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
if ( dev_priv->page_flipping && dev_priv->current_page == 1 ) {
unsigned int tmp = flags;
@@ -480,7 +480,7 @@ static void r128_cce_dispatch_swap( drm_device_t *dev )
drm_clip_rect_t *pbox = sarea_priv->boxes;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
#if R128_PERFORMANCE_BOXES
/* Do some trivial performance monitoring...
@@ -536,7 +536,7 @@ static void r128_cce_dispatch_flip( drm_device_t *dev )
{
drm_r128_private_t *dev_priv = dev->dev_private;
RING_LOCALS;
- DRM_DEBUG( "%s: page=%d\n", __FUNCTION__, dev_priv->current_page );
+ DRM_DEBUG( "%s: page=%d\n", __func__, dev_priv->current_page );
#if R128_PERFORMANCE_BOXES
/* Do some trivial performance monitoring...
@@ -586,7 +586,7 @@ static void r128_cce_dispatch_vertex( drm_device_t *dev,
int i = 0;
RING_LOCALS;
DRM_DEBUG( "%s: buf=%d nbox=%d\n",
- __FUNCTION__, buf->idx, sarea_priv->nbox );
+ __func__, buf->idx, sarea_priv->nbox );
if ( 0 )
r128_print_dirty( "dispatch_vertex", sarea_priv->dirty );
@@ -797,7 +797,7 @@ static int r128_cce_dispatch_blit( drm_device_t *dev,
u32 *data;
int dword_shift, dwords;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
/* The compiler won't optimize away a division by a variable,
* even if the only legal values are powers of two. Thus, we'll
@@ -907,7 +907,7 @@ static int r128_cce_dispatch_write_span( drm_device_t *dev,
u8 *mask;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
count = depth->n;
if ( DRM_OS_COPYFROMUSR( &x, depth->x, sizeof(x) ) ) {
@@ -1000,7 +1000,7 @@ static int r128_cce_dispatch_write_pixels( drm_device_t *dev,
u8 *mask;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
count = depth->n;
@@ -1115,7 +1115,7 @@ static int r128_cce_dispatch_read_span( drm_device_t *dev,
drm_r128_private_t *dev_priv = dev->dev_private;
int count, x, y;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
count = depth->n;
if ( DRM_OS_COPYFROMUSR( &x, depth->x, sizeof(x) ) ) {
@@ -1157,7 +1157,7 @@ static int r128_cce_dispatch_read_pixels( drm_device_t *dev,
int count, *x, *y;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
count = depth->n;
if ( count > dev_priv->depth_pitch ) {
@@ -1224,7 +1224,7 @@ static void r128_cce_dispatch_stipple( drm_device_t *dev, u32 *stipple )
drm_r128_private_t *dev_priv = dev->dev_private;
int i;
RING_LOCALS;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
BEGIN_RING( 33 );
@@ -1247,7 +1247,7 @@ int r128_cce_clear( DRM_OS_IOCTL )
drm_r128_private_t *dev_priv = dev->dev_private;
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
drm_r128_clear_t clear;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
LOCK_TEST_WITH_RETURN( dev );
@@ -1273,7 +1273,7 @@ int r128_cce_swap( DRM_OS_IOCTL )
DRM_OS_DEVICE;
drm_r128_private_t *dev_priv = dev->dev_private;
drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv;
- DRM_DEBUG( "%s\n", __FUNCTION__ );
+ DRM_DEBUG( "%s\n", __func__ );
LOCK_TEST_WITH_RETURN( dev );
@@ -1305,7 +1305,7 @@ int r128_cce_vertex( DRM_OS_IOCTL )
LOCK_TEST_WITH_RETURN( dev );
if ( !dev_priv ) {
- DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+ DRM_ERROR( "%s called with no initialization\n", __func__ );
return DRM_OS_ERR(EINVAL);
}
@@ -1313,7 +1313,7 @@ int r128_cce_vertex( DRM_OS_IOCTL )
sizeof(vertex) );
DRM_DEBUG( "%s: pid=%d index=%d count=%d discard=%d\n",
- __FUNCTION__, DRM_OS_CURRENTPID,
+ __func__, DRM_OS_CURRENTPID,
vertex.idx, vertex.count, vertex.discard );
if ( vertex.idx < 0 || vertex.idx >= dma->buf_count ) {
@@ -1365,7 +1365,7 @@ int r128_cce_indices( DRM_OS_IOCTL )
LOCK_TEST_WITH_RETURN( dev );
if ( !dev_priv ) {
- DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+ DRM_ERROR( "%s called with no initialization\n", __func__ );
return DRM_OS_ERR(EINVAL);
}
@@ -1373,7 +1373,7 @@ int r128_cce_indices( DRM_OS_IOCTL )
sizeof(elts) );
DRM_DEBUG( "%s: pid=%d buf=%d s=%d e=%d d=%d\n",
- __FUNCTION__, DRM_OS_CURRENTPID,
+ __func__, DRM_OS_CURRENTPID,
elts.idx, elts.start, elts.end, elts.discard );
if ( elts.idx < 0 || elts.idx >= dma->buf_count ) {
@@ -1437,7 +1437,7 @@ int r128_cce_blit( DRM_OS_IOCTL )
sizeof(blit) );
DRM_DEBUG( "%s: pid=%d index=%d\n",
- __FUNCTION__, DRM_OS_CURRENTPID, blit.idx );
+ __func__, DRM_OS_CURRENTPID, blit.idx );
if ( blit.idx < 0 || blit.idx >= dma->buf_count ) {
DRM_ERROR( "buffer index %d (of %d max)\n",
@@ -1516,7 +1516,7 @@ int r128_cce_indirect( DRM_OS_IOCTL )
LOCK_TEST_WITH_RETURN( dev );
if ( !dev_priv ) {
- DRM_ERROR( "%s called with no initialization\n", __FUNCTION__ );
+ DRM_ERROR( "%s called with no initialization\n", __func__ );
return DRM_OS_ERR(EINVAL);
}
OpenPOWER on IntegriCloud