summaryrefslogtreecommitdiff
path: root/linux/radeon_cp.c
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2001-06-14 22:23:44 +0000
committerDavid Dawes <dawes@xfree86.org>2001-06-14 22:23:44 +0000
commitd87c873df05eb3a110316c7af2358553fa7f988e (patch)
treee6ac996160b926f4af69d0db523db1a773435897 /linux/radeon_cp.c
parent334e134918ee2ece3e845cd55c49c9709b67ee6c (diff)
First pass of 4.1.0 merge.
Diffstat (limited to 'linux/radeon_cp.c')
-rw-r--r--linux/radeon_cp.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/radeon_cp.c b/linux/radeon_cp.c
index 670c3dd4..d8b85949 100644
--- a/linux/radeon_cp.c
+++ b/linux/radeon_cp.c
@@ -910,12 +910,6 @@ static int radeon_do_init_cp( drm_device_t *dev, drm_radeon_init_t *init )
*/
RADEON_WRITE( RADEON_MC_AGP_LOCATION, 0xffffffc0 ); /* ?? */
RADEON_WRITE( RADEON_AGP_COMMAND, 0 ); /* clear AGP_COMMAND */
-#if defined(__alpha__)
- /* HACK! something is clobbering MEM_CNTL on Alpha! */
- DRM_ERROR( "MEM_CNTL 0x%x\n",
- RADEON_READ(0x0140) );
- RADEON_WRITE(0x0140, 0x29002901);
-#endif
} else {
/* Turn off PCI GART
*/