diff options
| author | Gareth Hughes <gareth@users.sourceforge.net> | 2000-10-10 12:44:04 +0000 |
|---|---|---|
| committer | Gareth Hughes <gareth@users.sourceforge.net> | 2000-10-10 12:44:04 +0000 |
| commit | 4f1b6b9f2bd339d28d1624c3f737ca6183378338 (patch) | |
| tree | 8af5ba424ba9e9dde79e1f844f62e376116a4e67 | |
| parent | 9ae70d65072fcc1dffc99312a3ce000bedb7cfe0 (diff) | |
Minor updates after trunk merge:
- Fix front, back and depth pitch calculations
- Implement immediate mode triangle optimizations (Keith Whitwell)
- Some minor cleanups
| -rw-r--r-- | linux/r128_cce.c | 15 | ||||
| -rw-r--r-- | linux/r128_state.c | 11 |
2 files changed, 11 insertions, 15 deletions
diff --git a/linux/r128_cce.c b/linux/r128_cce.c index 60a0fef8..cb84b760 100644 --- a/linux/r128_cce.c +++ b/linux/r128_cce.c @@ -433,10 +433,10 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init ) dev_priv->back_y = init->back_y; dev_priv->depth_bpp = init->depth_bpp; - dev_priv->back_offset = init->depth_offset; - dev_priv->back_pitch = init->depth_pitch; - dev_priv->back_x = init->depth_x; - dev_priv->back_y = init->depth_y; + dev_priv->depth_offset = init->depth_offset; + dev_priv->depth_pitch = init->depth_pitch; + dev_priv->depth_x = init->depth_x; + dev_priv->depth_y = init->depth_y; /* FIXME: We want multiple shared areas, including one shared * only by the X Server and kernel module. @@ -493,13 +493,6 @@ static int r128_do_init_cce( drm_device_t *dev, drm_r128_init_t *init ) dev_priv->submit_age = 0; R128_WRITE( R128_VB_AGE_REG, dev_priv->submit_age ); - DRM_INFO( "agp=0x%08x ring=0x%08x rtpr=0x%08x\n", - dev->agp->base, - dev_priv->cce_ring->offset, - dev_priv->ring_rptr->offset - ); - - r128_cce_init_ring_buffer( dev ); r128_cce_load_microcode( dev_priv ); r128_do_engine_reset( dev ); diff --git a/linux/r128_state.c b/linux/r128_state.c index b9ea930b..4b0e7a9c 100644 --- a/linux/r128_state.c +++ b/linux/r128_state.c @@ -356,7 +356,8 @@ static void r128_cce_dispatch_clear( drm_device_t *dev, int fx = x + dev_priv->front_x; int fy = y + dev_priv->front_y; - DRM_DEBUG( "clear front\n"); + DRM_DEBUG( "clear front: x=%d y=%d\n", + dev_priv->front_x, dev_priv->front_y ); BEGIN_RING( 5 ); OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 3 ) ); @@ -377,7 +378,8 @@ static void r128_cce_dispatch_clear( drm_device_t *dev, int bx = x + dev_priv->back_x; int by = y + dev_priv->back_y; - DRM_DEBUG( "clear back\n" ); + DRM_DEBUG( "clear back: x=%d y=%d\n", + dev_priv->back_x, dev_priv->back_y ); BEGIN_RING( 5 ); OUT_RING( CCE_PACKET3( R128_CNTL_PAINT_MULTI, 3 ) ); @@ -398,7 +400,8 @@ static void r128_cce_dispatch_clear( drm_device_t *dev, int dx = x + dev_priv->depth_x; int dy = y + dev_priv->depth_y; - DRM_DEBUG( "clear depth\n" ); + DRM_DEBUG( "clear depth: x=%d y=%d\n", + dev_priv->depth_x, dev_priv->depth_y ); BEGIN_RING( 7 ); OUT_RING( CCE_PACKET0( R128_DP_WRITE_MASK, 0 ) ); @@ -429,7 +432,7 @@ static void r128_cce_dispatch_swap( drm_device_t *dev ) u32 fb_bpp; int i; RING_LOCALS; - DRM_INFO( "%s\n", __FUNCTION__ ); + DRM_DEBUG( "%s\n", __FUNCTION__ ); switch ( dev_priv->fb_bpp ) { case 16: |