From 1a0cb72e796111cadb83cc17050381417f0712dc Mon Sep 17 00:00:00 2001
From: nick <nick@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 14 Dec 2001 16:48:36 +0000
Subject: Tuned some values: - OV0_BASE_ADDR exists only on Radeons - hacked
 OV0_FILTER_CNTL values - extpanded IDCT stuff by MC (probably)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3488 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 drivers/radeon/radeon.h     | 23 ++++++++++++-----------
 drivers/radeon/radeon_vid.c |  6 ++++--
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'drivers')

diff --git a/drivers/radeon/radeon.h b/drivers/radeon/radeon.h
index ec9f01916a..9fe457f187 100644
--- a/drivers/radeon/radeon.h
+++ b/drivers/radeon/radeon.h
@@ -587,7 +587,9 @@
 #define	OV0_P23_BLANK_LINES_AT_TOP		0x0434
 #	define P23_BLNK_LN_AT_TOP_M1_MASK	0x000007ffL
 #	define P23_ACTIVE_LINES_M1		0x07ff0000L
+#ifndef RAGE28
 #define	OV0_BASE_ADDR				0x043C
+#endif
 #define	OV0_VID_BUF0_BASE_ADRS			0x0440
 #	define VIF_BUF0_PITCH_SEL		0x00000001L
 #	define VIF_BUF0_TILE_ADRS		0x00000002L
@@ -641,17 +643,7 @@
 #define	OV0_P2_X_START_END			0x0498
 #define	OV0_P3_X_START_END			0x049C
 #define	OV0_FILTER_CNTL				0x04A0
-/*
-  radeon notes:
-  value	0x0 makes green	background only
-  value	0x1 passes only	green colors (probably U or V)
-  value	0x2 passes only	red colors   (probably U or V)
-  value	0x3 makes full colored output
-  value	0x4 ???
-  value	0x8 ???
-  value	0xffffffff doesn't make	any visible effects
-*/
-
+#	define FILTER_HARDCODED_COEF		0x0000000F
 /*
    Top quality 4x4-tap filtered vertical and horizontal scaler.
    It allows up to 64:1 upscaling and downscaling without
@@ -718,6 +710,15 @@
 #define IDCT_AUTH				0x1F8C
 #define IDCT_CONTROL				0x1FBC
 
+#define SE_MC_SRC2_CNTL				0x19D4
+#define SE_MC_SRC1_CNTL				0x19D8
+#define SE_MC_DST_CNTL				0x19DC
+#define SE_MC_CNTL_START			0x19E0
+#ifndef RAGE128
+#define SE_MC_BUF_BASE				0x19E4
+#define PP_MC_CONTEXT				0x19E8
+#define PP_MISC					0x1C14
+#endif
 /*
    SUBPICTURE UNIT:
    Decompressing, scaling and alpha blending the compressed bitmap on the fly.
diff --git a/drivers/radeon/radeon_vid.c b/drivers/radeon/radeon_vid.c
index b8f61ab07c..cfa46643eb 100644
--- a/drivers/radeon/radeon_vid.c
+++ b/drivers/radeon/radeon_vid.c
@@ -200,7 +200,9 @@ static video_registers_t vregs[] =
   DECLARE_VREG(OV0_P23_V_ACCUM_INIT),
   DECLARE_VREG(OV0_P1_BLANK_LINES_AT_TOP),
   DECLARE_VREG(OV0_P23_BLANK_LINES_AT_TOP),
+#ifdef RADEON
   DECLARE_VREG(OV0_BASE_ADDR),
+#endif
   DECLARE_VREG(OV0_VID_BUF0_BASE_ADRS),
   DECLARE_VREG(OV0_VID_BUF1_BASE_ADRS),
   DECLARE_VREG(OV0_VID_BUF2_BASE_ADRS),
@@ -398,7 +400,7 @@ static void radeon_vid_stop_video( void )
     OUTREG(OV0_SCALE_CNTL, SCALER_SOFT_RESET);
     OUTREG(OV0_EXCLUSIVE_HORZ, 0);
     OUTREG(OV0_AUTO_FLIP_CNTL, 0);   /* maybe */
-    OUTREG(OV0_FILTER_CNTL, 0x0000000f);
+    OUTREG(OV0_FILTER_CNTL, FILTER_HARDCODED_COEF);
     OUTREG(OV0_KEY_CNTL, GRAPHIC_KEY_FN_NE);
     OUTREG(OV0_TEST, 0);
 }
@@ -444,7 +446,7 @@ static void radeon_vid_display_video( void )
     OUTREG(OV0_P1_X_START_END,		besr.p1_x_start_end);
     OUTREG(OV0_P2_X_START_END,		besr.p2_x_start_end);
     OUTREG(OV0_P3_X_START_END,		besr.p3_x_start_end);
-#if 0
+#ifdef RADEON
     OUTREG(OV0_BASE_ADDR,		besr.base_addr);
 #endif
     OUTREG(OV0_VID_BUF0_BASE_ADRS,	besr.vid_buf0_base_adrs);
-- 
cgit v1.2.3