diff options
Diffstat (limited to 'drivers/char/drm/r128_drv.h')
| -rw-r--r-- | drivers/char/drm/r128_drv.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h index 5041bd8dbed8..011105e51ac6 100644 --- a/drivers/char/drm/r128_drv.h +++ b/drivers/char/drm/r128_drv.h | |||
| @@ -462,8 +462,7 @@ do { \ | |||
| 462 | 462 | ||
| 463 | #define BEGIN_RING( n ) do { \ | 463 | #define BEGIN_RING( n ) do { \ |
| 464 | if ( R128_VERBOSE ) { \ | 464 | if ( R128_VERBOSE ) { \ |
| 465 | DRM_INFO( "BEGIN_RING( %d ) in %s\n", \ | 465 | DRM_INFO( "BEGIN_RING( %d )\n", (n)); \ |
| 466 | (n), __FUNCTION__ ); \ | ||
| 467 | } \ | 466 | } \ |
| 468 | if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ | 467 | if ( dev_priv->ring.space <= (n) * sizeof(u32) ) { \ |
| 469 | COMMIT_RING(); \ | 468 | COMMIT_RING(); \ |
| @@ -493,7 +492,7 @@ do { \ | |||
| 493 | write * sizeof(u32) ); \ | 492 | write * sizeof(u32) ); \ |
| 494 | } \ | 493 | } \ |
| 495 | if (((dev_priv->ring.tail + _nr) & tail_mask) != write) { \ | 494 | if (((dev_priv->ring.tail + _nr) & tail_mask) != write) { \ |
| 496 | DRM_ERROR( \ | 495 | DRM_ERROR( \ |
| 497 | "ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n", \ | 496 | "ADVANCE_RING(): mismatch: nr: %x write: %x line: %d\n", \ |
| 498 | ((dev_priv->ring.tail + _nr) & tail_mask), \ | 497 | ((dev_priv->ring.tail + _nr) & tail_mask), \ |
| 499 | write, __LINE__); \ | 498 | write, __LINE__); \ |