aboutsummaryrefslogtreecommitdiff
path: root/linux/radeon_cp.c
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@fairlite.demon.co.uk>2001-09-25 09:32:16 +0000
committerAlan Hourihane <alanh@fairlite.demon.co.uk>2001-09-25 09:32:16 +0000
commitca820fca877faf4776be142417795a5945c606e6 (patch)
tree3b43fba2476fcbd4f81fa26b400549ad1df766f7 /linux/radeon_cp.c
parent390440c9399a3c01811f3b37c2628d6e905656e8 (diff)
merge with 2.4.10 kernel
Diffstat (limited to 'linux/radeon_cp.c')
-rw-r--r--linux/radeon_cp.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/linux/radeon_cp.c b/linux/radeon_cp.c
index fa74e9b9..904c8b77 100644
--- a/linux/radeon_cp.c
+++ b/linux/radeon_cp.c
@@ -543,8 +543,7 @@ static int radeon_do_engine_reset( drm_device_t *dev )
RADEON_SOFT_RESET_RE |
RADEON_SOFT_RESET_PP |
RADEON_SOFT_RESET_E2 |
- RADEON_SOFT_RESET_RB |
- RADEON_SOFT_RESET_HDP ) );
+ RADEON_SOFT_RESET_RB ) );
RADEON_READ( RADEON_RBBM_SOFT_RESET );
RADEON_WRITE( RADEON_RBBM_SOFT_RESET, ( rbbm_soft_reset &
~( RADEON_SOFT_RESET_CP |
@@ -553,8 +552,7 @@ static int radeon_do_engine_reset( drm_device_t *dev )
RADEON_SOFT_RESET_RE |
RADEON_SOFT_RESET_PP |
RADEON_SOFT_RESET_E2 |
- RADEON_SOFT_RESET_RB |
- RADEON_SOFT_RESET_HDP ) ) );
+ RADEON_SOFT_RESET_RB ) ) );
RADEON_READ( RADEON_RBBM_SOFT_RESET );
@@ -622,20 +620,12 @@ static void radeon_cp_init_ring_buffer( drm_device_t *dev,
tmp_ofs = dev_priv->ring_rptr->offset - dev->sg->handle;
page_ofs = tmp_ofs >> PAGE_SHIFT;
-#if defined(__alpha__)
+
RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
entry->busaddr[page_ofs]);
DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
entry->busaddr[page_ofs],
entry->handle + tmp_ofs );
-#else
- RADEON_WRITE( RADEON_CP_RB_RPTR_ADDR,
- page_to_bus(entry->pagelist[page_ofs]));
-
- DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
- page_to_bus(entry->pagelist[page_ofs]),
- entry->handle + tmp_ofs );
-#endif
}
/* Set ring buffer size */