diff options
| author | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-05-14 06:27:24 +0000 |
|---|---|---|
| committer | Leif Delgass <ldelgass@users.sourceforge.net> | 2003-05-14 06:27:24 +0000 |
| commit | 653afc7fa6eef8797e8398cc56a58a27425e5ef0 (patch) | |
| tree | b64be0114e1791923b5130089b5f3793b0c0d22c | |
| parent | 1c26adbc4aea957ad6fc15d8b71898628d3ee67c (diff) | |
more missing merge bits
| -rw-r--r-- | shared-core/radeon_cp.c | 1 | ||||
| -rw-r--r-- | shared-core/radeon_drv.h | 1 | ||||
| -rw-r--r-- | shared/radeon_cp.c | 1 | ||||
| -rw-r--r-- | shared/radeon_drv.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c index 5503cff9..6cc50669 100644 --- a/shared-core/radeon_cp.c +++ b/shared-core/radeon_cp.c @@ -1209,7 +1209,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) (dev_priv->ring.size / sizeof(u32)) - 1; dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK; - dev_priv->ring.ring_rptr = dev_priv->ring_rptr; #if __REALLY_HAVE_SG if ( dev_priv->is_pci ) { diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h index f64acbff..3e3b263e 100644 --- a/shared-core/radeon_drv.h +++ b/shared-core/radeon_drv.h @@ -52,7 +52,6 @@ typedef struct drm_radeon_ring_buffer { int space; int high_mark; - drm_local_map_t *ring_rptr; } drm_radeon_ring_buffer_t; typedef struct drm_radeon_depth_clear_t { diff --git a/shared/radeon_cp.c b/shared/radeon_cp.c index 5503cff9..6cc50669 100644 --- a/shared/radeon_cp.c +++ b/shared/radeon_cp.c @@ -1209,7 +1209,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init ) (dev_priv->ring.size / sizeof(u32)) - 1; dev_priv->ring.high_mark = RADEON_RING_HIGH_MARK; - dev_priv->ring.ring_rptr = dev_priv->ring_rptr; #if __REALLY_HAVE_SG if ( dev_priv->is_pci ) { diff --git a/shared/radeon_drv.h b/shared/radeon_drv.h index f64acbff..3e3b263e 100644 --- a/shared/radeon_drv.h +++ b/shared/radeon_drv.h @@ -52,7 +52,6 @@ typedef struct drm_radeon_ring_buffer { int space; int high_mark; - drm_local_map_t *ring_rptr; } drm_radeon_ring_buffer_t; typedef struct drm_radeon_depth_clear_t { |