xf86-video-ati: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Tue Aug 25 19:31:29 PDT 2009
src/radeon_commonfuncs.c | 6 ++----
src/radeon_reg.h | 22 ----------------------
2 files changed, 2 insertions(+), 26 deletions(-)
New commits:
commit 04692f80678ffea15ac33820381ce45865e697b8
Author: Dave Airlie <airlied at linux.ie>
Date: Wed Aug 26 05:31:56 2009 +1000
radeon: afaics these aren't radeon regs but r128 regs.
so remove them from radeon use.
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index b6a6d8d..6387e4f 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -789,10 +789,9 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
R200_VAP_VF_MAX_VTX_NUM);
FINISH_ACCEL();
- BEGIN_ACCEL(5);
+ BEGIN_ACCEL(4);
OUT_ACCEL_REG(R200_RE_AUX_SCISSOR_CNTL, 0);
OUT_ACCEL_REG(R200_RE_CNTL, 0);
- OUT_ACCEL_REG(RADEON_AUX_SC_CNTL, 0);
OUT_ACCEL_REG(RADEON_RB3D_PLANEMASK, 0xffffffff);
OUT_ACCEL_REG(RADEON_SE_CNTL, (RADEON_DIFFUSE_SHADE_GOURAUD |
RADEON_BFACE_SOLID |
@@ -813,8 +812,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
RADEON_TEX1_W_ROUTING_USE_W0);
FINISH_ACCEL();
- BEGIN_ACCEL(3);
- OUT_ACCEL_REG(RADEON_AUX_SC_CNTL, 0);
+ BEGIN_ACCEL(2);
OUT_ACCEL_REG(RADEON_RB3D_PLANEMASK, 0xffffffff);
OUT_ACCEL_REG(RADEON_SE_CNTL, (RADEON_DIFFUSE_SHADE_GOURAUD |
RADEON_BFACE_SOLID |
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
index 9df7fff..3a4eda1 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
@@ -103,28 +103,6 @@
#define RADEON_ATTRDR 0x03c1 /* VGA */
#define RADEON_ATTRDW 0x03c0 /* VGA */
#define RADEON_ATTRX 0x03c0 /* VGA */
-#define RADEON_AUX_SC_CNTL 0x1660
-# define RADEON_AUX1_SC_EN (1 << 0)
-# define RADEON_AUX1_SC_MODE_OR (0 << 1)
-# define RADEON_AUX1_SC_MODE_NAND (1 << 1)
-# define RADEON_AUX2_SC_EN (1 << 2)
-# define RADEON_AUX2_SC_MODE_OR (0 << 3)
-# define RADEON_AUX2_SC_MODE_NAND (1 << 3)
-# define RADEON_AUX3_SC_EN (1 << 4)
-# define RADEON_AUX3_SC_MODE_OR (0 << 5)
-# define RADEON_AUX3_SC_MODE_NAND (1 << 5)
-#define RADEON_AUX1_SC_BOTTOM 0x1670
-#define RADEON_AUX1_SC_LEFT 0x1664
-#define RADEON_AUX1_SC_RIGHT 0x1668
-#define RADEON_AUX1_SC_TOP 0x166c
-#define RADEON_AUX2_SC_BOTTOM 0x1680
-#define RADEON_AUX2_SC_LEFT 0x1674
-#define RADEON_AUX2_SC_RIGHT 0x1678
-#define RADEON_AUX2_SC_TOP 0x167c
-#define RADEON_AUX3_SC_BOTTOM 0x1690
-#define RADEON_AUX3_SC_LEFT 0x1684
-#define RADEON_AUX3_SC_RIGHT 0x1688
-#define RADEON_AUX3_SC_TOP 0x168c
#define RADEON_AUX_WINDOW_HORZ_CNTL 0x02d8
#define RADEON_AUX_WINDOW_VERT_CNTL 0x02dc
More information about the xorg-commit
mailing list