Update register definitions to match r128_reg.h

main
Gareth Hughes 2000-06-23 17:14:20 +00:00
parent d399dbcd56
commit dc2701a9f6
2 changed files with 3 additions and 2 deletions

View File

@ -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);

View File

@ -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)