Added support of Radeon2 8500 AIW

Ugly fix (from non-x86 point) of FPU problems for Radeons color correction
Added checking of boundaries during color correction on Radeon


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3941 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 55 insertions, 19 deletions

diff --git a/drivers/radeon/Makefile b/drivers/radeon/Makefile
index 12021d6d8f..504e57926d 100644
--- a/drivers/radeon/Makefile
+++ b/drivers/radeon/Makefile
@@ -13,7 +13,7 @@ MOD_PATH=$(MOD_PATH_PREFIX)/lib/modules/$(KERNEL_VERSION)/kernel/drivers/video/
 CPPFLAGS := -D__KERNEL__ -I$(KERNEL_INCLUDES)
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-	-fomit-frame-pointer -fno-strict-aliasing -fno-common\
+	-fomit-frame-pointer -fno-strict-aliasing -fno-common -ffast-math\
 	-D__KERNEL__  -DMODULE  -include $(KERNEL_INCLUDES)/linux/modversions.h
 AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
 
diff --git a/drivers/radeon/radeon.h b/drivers/radeon/radeon.h
index 6bd1511ab4..764e491c00 100644
--- a/drivers/radeon/radeon.h
+++ b/drivers/radeon/radeon.h
@@ -24,6 +24,7 @@
 #define	PCI_DEVICE_ID_RADEON_LW		0x4C57
 #define	PCI_DEVICE_ID_R200_QL		0x514C
 #define	PCI_DEVICE_ID_RV200_QW		0x5157
+#define	PCI_DEVICE_ID_R200_BB		0x4242
 
 #define	RADEON_REGSIZE			0x4000
 
diff --git a/drivers/radeon/radeon_vid.c b/drivers/radeon/radeon_vid.c
index 19f28983de..bb14194391 100644
--- a/drivers/radeon/radeon_vid.c
+++ b/drivers/radeon/radeon_vid.c
@@ -17,7 +17,7 @@
  * Rage128(pro) stuff of this driver.
  */
 
-#define RADEON_VID_VERSION "1.2.0"
+#define RADEON_VID_VERSION "1.2.1"
 
 /*
   It's entirely possible this major conflicts with something else
@@ -38,7 +38,6 @@
   ...........................................................
   BUGS and LACKS:
     Color and video keys don't work
-    Contrast and brightness are unconfigurable on radeons
 */
 
 #include <linux/config.h>
@@ -110,14 +109,37 @@ static int swap_fourcc __initdata = 0;
 #define RTRACE(...)	((void)0)
 #endif
 
+#ifndef RAGE128
+#if defined(__i386__)
+/* Ugly but only way */
+#undef AVOID_FPU
+static double inline __FastSin(double x) 
+{
+   register double res;
+   __asm __volatile("fsin":"=t"(res):"0"(x));
+   return res;
+}
+#undef sin
+#define sin(x) __FastSin(x)
+
+static double inline __FastCos(double x) 
+{
+   register double res;
+   __asm __volatile("fcos":"=t"(res):"0"(x));
+   return res;
+}
+#undef cos
+#define cos(x) __FastCos(x)
+#else
+#define AVOID_FPU
+#warning You have non x86 system. Please port MATH support.
+#endif /*__386__*/
+#endif /*RAGE128*/
+
 #if !defined( RAGE128 ) && !defined( AVOID_FPU )
 #define RADEON_FPU 1
 #endif
 
-#ifdef RADEON_FPU
-#include <math.h>
-#endif
-
 typedef struct bes_registers_s
 {
   /* base address of yuv framebuffer */
@@ -1167,6 +1189,7 @@ const struct ati_card_id_s ati_card_ids[]=
  { PCI_DEVICE_ID_RADEON_LZ, "Radeon M6 LZ " },
  { PCI_DEVICE_ID_RADEON_LW, "Radeon M7 LW " },
  { PCI_DEVICE_ID_R200_QL,   "Radeon2 8500 QL " },
+ { PCI_DEVICE_ID_R200_BB,   "Radeon2 8500 AIW" },
  { PCI_DEVICE_ID_RV200_QW,  "Radeon2 7500 QW " }
 #endif
 };
@@ -1203,6 +1226,7 @@ static int __init radeon_vid_config_card(void)
 	printk(RVID_MSG"Found %s (%uMb memory)\n",ati_card_ids[i].name,radeon_ram_size);
 #ifndef RAGE128	
 	if(ati_card_ids[i].id == PCI_DEVICE_ID_R200_QL || 
+	   ati_card_ids[i].id == PCI_DEVICE_ID_R200_BB || 
 	   ati_card_ids[i].id == PCI_DEVICE_ID_RV200_QW) IsR200 = 1;
 #endif
 	return TRUE;
@@ -1276,6 +1300,10 @@ static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_
 #define RTFBrightness(a)   (((a)*1.0)/2000.0)
 #define RTFContrast(a)   (1.0 + ((a)*1.0)/1000.0)
 #define RTFHue(a)   (((a)*3.1416)/1000.0)
+#define RadeonSetParm(a,b,c,d) if((b)>=(c)&&(b)<=(d)) { (a)=(b);\
+	radeon_set_transform(RTFBrightness(ovBrightness),RTFContrast(ovContrast)\
+			    ,RTFSaturation(ovSaturation),RTFHue(ovHue),ov_trans_idx); }
+
 
 static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
@@ -1307,30 +1335,30 @@ static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count
 #ifdef RADEON_FPU
     if(memcmp(buf,PARAM_BRIGHTNESS,min(count,strlen(PARAM_BRIGHTNESS))) == 0)
     {
-      ovBrightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10);
-      radeon_set_transform(RTFBrightness(ovBrightness),RTFContrast(ovContrast)
-			   ,RTFSaturation(ovSaturation),RTFHue(ovHue),ov_trans_idx);
+      int tmp;
+      tmp=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10);
+      RadeonSetParm(ovBrightness,tmp,-1000,1000);
     }
     else
     if(memcmp(buf,PARAM_SATURATION,min(count,strlen(PARAM_SATURATION))) == 0)
     {
-      ovSaturation=simple_strtol(&buf[strlen(PARAM_SATURATION)],NULL,10);
-      radeon_set_transform(RTFBrightness(ovBrightness),RTFContrast(ovContrast)
-			   ,RTFSaturation(ovSaturation),RTFHue(ovHue),ov_trans_idx);
+      int tmp;
+      tmp=simple_strtol(&buf[strlen(PARAM_SATURATION)],NULL,10);
+      RadeonSetParm(ovSaturation,tmp,-1000,1000);
     }
     else
     if(memcmp(buf,PARAM_CONTRAST,min(count,strlen(PARAM_CONTRAST))) == 0)
     {
-      ovContrast=simple_strtol(&buf[strlen(PARAM_CONTRAST)],NULL,10);
-      radeon_set_transform(RTFBrightness(ovBrightness),RTFContrast(ovContrast)
-			   ,RTFSaturation(ovSaturation),RTFHue(ovHue),ov_trans_idx);
+      int tmp;
+      tmp=simple_strtol(&buf[strlen(PARAM_CONTRAST)],NULL,10);
+      RadeonSetParm(ovContrast,tmp,-1000,1000);
     }
     else
     if(memcmp(buf,PARAM_HUE,min(count,strlen(PARAM_HUE))) == 0)
     {
-      ovHue=simple_strtol(&buf[strlen(PARAM_HUE)],NULL,10);
-      radeon_set_transform(RTFBrightness(ovBrightness),RTFContrast(ovContrast)
-			   ,RTFSaturation(ovSaturation),RTFHue(ovHue),ov_trans_idx);
+      int tmp;
+      tmp=simple_strtol(&buf[strlen(PARAM_HUE)],NULL,10);
+      RadeonSetParm(ovHue,tmp,-1000,1000);
     }
     else
 #endif
diff --git a/drivers/radeon/radeonfb.c b/drivers/radeon/radeonfb.c
index 556532f644..69d29afb54 100644
--- a/drivers/radeon/radeonfb.c
+++ b/drivers/radeon/radeonfb.c
@@ -124,6 +124,7 @@ enum radeon_chips {
 	RADEON_LZ,
 	RADEON_LW,
 	R200_QL,
+	R200_BB,
 	RV200_QW
 };
 
@@ -148,6 +149,7 @@ static struct pci_device_id radeonfb_pci_table[] __devinitdata = {
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LZ, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LZ},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RADEON_LW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RADEON_LW},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_R200_QL, PCI_ANY_ID, PCI_ANY_ID, 0, 0, R200_QL},
+	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_R200_BB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, R200_BB},
 	{ PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_RV200_QW, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RV200_QW},
 	{ 0, }
 };
@@ -1081,6 +1083,11 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
 			rinfo->isR200 = 1;
 			strcpy(rinfo->name, "Radeon2 8500 QL ");
 			break;
+		case PCI_DEVICE_ID_R200_BB:
+			rinfo->hasCRTC2 = 1;
+			rinfo->isR200 = 1;
+			strcpy(rinfo->name, "Radeon2 8500 AIW");
+			break;
 		case PCI_DEVICE_ID_RV200_QW:
 			rinfo->hasCRTC2 = 1;
 			rinfo->isM7 = 1;