summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Hughes <gareth@users.sourceforge.net>2000-06-23 17:14:20 +0000
committerGareth Hughes <gareth@users.sourceforge.net>2000-06-23 17:14:20 +0000
commitdc2701a9f6034a04319f71e43e7f928f818be6db (patch)
treedadbe9151443f4c4738c79fb2677ed978a0389ae
parentd399dbcd569a66f5bf4863ffa2aab95fa8ebd5fc (diff)
Update register definitions to match r128_reg.htdfx-2-1-20000711-freeze
-rw-r--r--linux/r128_dma.c2
-rw-r--r--linux/r128_drv.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/r128_dma.c b/linux/r128_dma.c
index 775a80880..16f79c1f6 100644
--- a/linux/r128_dma.c
+++ b/linux/r128_dma.c
@@ -295,7 +295,7 @@ int r128_do_engine_reset(drm_device_t *dev)
mclk_cntl = R128_READ_PLL(dev, R128_MCLK_CNTL);
R128_WRITE_PLL(R128_MCLK_CNTL,
- mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CPP);
+ mclk_cntl | R128_FORCE_GCP | R128_FORCE_PIPE3D_CP);
gen_reset_cntl = R128_READ(R128_GEN_RESET_CNTL);
diff --git a/linux/r128_drv.h b/linux/r128_drv.h
index b0ee6dc6c..81390bb8b 100644
--- a/linux/r128_drv.h
+++ b/linux/r128_drv.h
@@ -136,7 +136,8 @@ extern int r128_context_switch_complete(drm_device_t *dev, int new);
#define R128_MCLK_CNTL 0x000f
# define R128_FORCE_GCP (1 << 16)
-# define R128_FORCE_PIPE3D_CPP (1 << 17)
+# define R128_FORCE_PIPE3D_CP (1 << 17)
+# define R128_FORCE_RCP (1 << 18)
#define R128_GEN_RESET_CNTL 0x00f0
# define R128_SOFT_RESET_GUI (1 << 0)