mplayer.hg: drivers/radeon/radeon

comparison drivers/radeon/radeon_vid.c @ 3250:61b1441c0f8c

More configurable stuff

author	nick
date	Sat, 01 Dec 2001 17:57:49 +0000
parents	7cec2396bde3
children	e714f1e4ab27

comparison

equal deleted inserted replaced

-:49a0d462dffe
+:61b1441c0f8c
 * This file is partly based on mga_vid and sis_vid stuff from
 * mplayer's package.
 * Also here was used code from CVS of GATOS project and X11 trees.
 */
-#define RADEON_VID_VERSION "1.0.0"
+#define RADEON_VID_VERSION "1.0.1"
 /*
 It's entirely possible this major conflicts with something else
 mknod /dev/radeon_vid c 178 0
 or
 -----------------------------------------------------------
 TODO:
 Highest priority: fbvid.h compatibility
 High priority: RGB/BGR 2-32, YVU9, IF09 support
 Middle priority:
-OV0_COLOUR_CNTL         brightness saturation
 SCALER_GAMMA_SEL_BRIGHT  gamma correction ???
-OV0_GRAPHICS_KEY_CLR    color key
 OV0_AUTO_FLIP_CNTL
 OV0_FILTER_CNTL
 OV0_VIDEO_KEY_CLR
 OV0_KEY_CNTL
 Low priority:  CLPL, IYU1, IYU2, UYNV, CYUV
 uint32_t p23_h_accum_init;
 uint32_t scale_cntl;
 uint32_t exclusive_horz;
 uint32_t auto_flip_cntl;
 uint32_t filter_cntl;
+uint32_t graphics_key_msk;
+uint32_t key_cntl;
+uint32_t test;
+/* Configurable stuff */
+int double_buff;
 int brightness;
 int saturation;
-uint32_t graphics_key_msk;
 uint32_t graphics_key_clr;
-uint32_t key_cntl;
+int deinterlace_on;
-uint32_t test;
+uint32_t deinterlace_pattern;
 } bes_registers_t;
 typedef struct video_registers_s
 {
 uint32_t name;
 static uint32_t radeon_vid_in_use = 0;
 static uint8_t *radeon_mmio_base = 0;
 static uint32_t radeon_mem_base = 0;
 static int32_t radeon_overlay_off = 0;
-static int radeon_double_buff=1;
 static uint32_t radeon_ram_size = 0;
 static mga_vid_config_t radeon_config;
 #undef DEBUG
 {
 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_COLOUR_CNTL, (brightness & 0x7f) |
-			    (saturation << 8) |
-			    (saturation << 16));
-OUTREG(OV0_GRAPHICS_KEY_MSK, (1 << depth) - 1);
-OUTREG(OV0_GRAPHICS_KEY_CLR, colorKey);
-*/
 OUTREG(OV0_KEY_CNTL, GRAPHIC_KEY_FN_NE);
 OUTREG(OV0_TEST, 0);
 }
 static void radeon_vid_display_video( void )
 OUTREG(OV0_REG_LOAD_CNTL,		REG_LD_CTL_LOCK);
 while(!(INREG(OV0_REG_LOAD_CNTL)&REG_LD_CTL_LOCK_READBACK));
 OUTREG(OV0_AUTO_FLIP_CNTL,OV0_AUTO_FLIP_CNTL_SOFT_BUF_ODD);
-OUTREG(OV0_DEINTERLACE_PATTERN,0x900AAAAA);
+OUTREG(OV0_DEINTERLACE_PATTERN,besr.deinterlace_pattern);
 OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE));
 OUTREG(OV0_AUTO_FLIP_CNTL,(INREG(OV0_AUTO_FLIP_CNTL)^OV0_AUTO_FLIP_CNTL_SOFT_EOF_TOGGLE));
 OUTREG(OV0_H_INC,			besr.h_inc);
 OUTREG(OV0_P1_H_ACCUM_INIT,		besr.p1_h_accum_init);
 OUTREG(OV0_P23_H_ACCUM_INIT,	besr.p23_h_accum_init);
 OUTREG(OV0_P23_V_ACCUM_INIT,	besr.p23_v_accum_init);
 bes_flags = SCALER_ENABLE |
-SCALER_ADAPTIVE_DEINT |
 SCALER_SMART_SWITCH |
 SCALER_HORZ_PICK_NEAREST;
-if(radeon_double_buff) bes_flags |= SCALER_DOUBLE_BUFFER;
+if(besr.double_buff) bes_flags |= SCALER_DOUBLE_BUFFER;
+if(besr.deinterlace_on) bes_flags |= SCALER_ADAPTIVE_DEINT;
 #ifdef RAGE128
 bes_flags |= SCALER_BURST_PER_PLANE;
 #endif
 switch(besr.fourcc)
 {
 	case IMGFMT_YUY2:
 	default:           bes_flags |= SCALER_SOURCE_VYUY422; break;
 }
 RTRACE(RVID_MSG"OV0: SCALER=%x\n",bes_flags);
 OUTREG(OV0_SCALE_CNTL,		bes_flags);
-/*
-TODO:
-brightness: -64 : +63
-saturation: 0 : 31
-	OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) |
-				(saturation << 8) |
-				(saturation << 16));
-	OUTREG(OV0_GRAPHICS_KEY_CLR, colkey_red | colkey_green << 8 | colkey_blue << 16);
-*/
 OUTREG(OV0_REG_LOAD_CNTL,		0);
 }
 #define XXX_SRC_X   0
 #define XXX_SRC_Y   0
 }
 static void radeon_vid_frame_sel(int frame)
 {
 uint32_t off0,off1,off2;
-if(!radeon_double_buff) return;
+if(!besr.double_buff) return;
 if(frame%2)
 {
 off0 = besr.vid_buf3_base_adrs;
 off1 = besr.vid_buf4_base_adrs;
 off2 = besr.vid_buf5_base_adrs;
 OUTREG(OV0_VID_BUF1_BASE_ADRS,	off1);
 OUTREG(OV0_VID_BUF2_BASE_ADRS,	off2);
 OUTREG(OV0_REG_LOAD_CNTL,		0);
 }
+static void radeon_vid_make_default(void)
+{
+besr.deinterlace_pattern = 0x900AAAAA;
+OUTREG(OV0_DEINTERLACE_PATTERN,besr.deinterlace_pattern);
+besr.deinterlace_on=1;
+besr.double_buff=1;
+}
 static void radeon_vid_preset(void)
 {
 unsigned tmp;
 tmp = INREG(OV0_COLOUR_CNTL);
 besr.saturation = (tmp>>8)&0x1f;
 besr.brightness = tmp & 0x7f;
+besr.graphics_key_clr = INREG(OV0_GRAPHICS_KEY_CLR);
+besr.deinterlace_pattern = INREG(OV0_DEINTERLACE_PATTERN);
 }
 static int video_on = 0;
 static int radeon_vid_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 }
 #define PARAM_BRIGHTNESS "brightness="
 #define PARAM_SATURATION "saturation="
 #define PARAM_DOUBLE_BUFF "double_buff="
+#define PARAM_COLOUR_KEY "colour_key="
+#define PARAM_DEINTERLACE "deinterlace="
+#define PARAM_DEINTERLACE_PATTERN "deinterlace_pattern="
 static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
 unsigned len,saturation;
 long brightness;
 brightness = besr.brightness;
 saturation = besr.saturation;
 len = 0;
 len += sprintf(&buf[len],"Chip: %s\n",ati_card_ids[detected_chip].name);
 len += sprintf(&buf[len],"Memory: %p:%x\n",radeon_mem_base,radeon_ram_size*0x100000);
-len += sprintf(&buf[len],"MMIO: %p\n",radeon_mmio_base);
+len += sprintf(&buf[len],"MMIO: %p\n\n",radeon_mmio_base);
 len += sprintf(&buf[len],"Configurable stuff:\n");
-len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",radeon_double_buff?"on":"off");
+len += sprintf(&buf[len],"~~~~~~~~~~~~~~~~~~~\n");
+len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",besr.double_buff?"on":"off");
 len += sprintf(&buf[len],PARAM_BRIGHTNESS"%i\n",brightness);
 len += sprintf(&buf[len],PARAM_SATURATION"%u\n",saturation);
+len += sprintf(&buf[len],PARAM_COLOUR_KEY"%X\n",besr.graphics_key_clr);
+len += sprintf(&buf[len],PARAM_DEINTERLACE"%s\n",besr.deinterlace_on?"on":"off");
+len += sprintf(&buf[len],PARAM_DEINTERLACE_PATTERN"%X\n",besr.deinterlace_pattern);
 return len;
 }
 static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
 {
 long brightness;
 brightness=simple_strtol(&buf[strlen(PARAM_BRIGHTNESS)],NULL,10);
 if(brightness >= -64 && brightness <= 63)
 	OUTREG(OV0_COLOUR_CNTL, (brightness & 0x7f) |
-				     (besr.saturation << 8) |
+				(besr.saturation << 8) |
-				     (besr.saturation << 16));
+				(besr.saturation << 16));
 }
 else
 if(memcmp(buf,PARAM_SATURATION,min(count,strlen(PARAM_SATURATION))) == 0)
 {
 long saturation;
 saturation=simple_strtol(&buf[strlen(PARAM_SATURATION)],NULL,10);
 if(saturation >= 0 && saturation <= 31)
 	OUTREG(OV0_COLOUR_CNTL, (besr.brightness & 0x7f) |
-				     (saturation << 8) |
+				(saturation << 8) |
-				     (saturation << 16));
+				(saturation << 16));
 }
 else
 if(memcmp(buf,PARAM_DOUBLE_BUFF,min(count,strlen(PARAM_DOUBLE_BUFF))) == 0)
 {
-if(memcmp(&buf[strlen(PARAM_DOUBLE_BUFF)],"on",2) == 0) radeon_double_buff = 1;
+if(memcmp(&buf[strlen(PARAM_DOUBLE_BUFF)],"on",2) == 0) besr.double_buff = 1;
-else radeon_double_buff = 0;
+else besr.double_buff = 0;
+}
+else
+if(memcmp(buf,PARAM_COLOUR_KEY,min(count,strlen(PARAM_COLOUR_KEY))) == 0)
+{
+long ckey;
+ckey=simple_strtol(&buf[strlen(PARAM_COLOUR_KEY)],NULL,16);
+	OUTREG(OV0_GRAPHICS_KEY_CLR, ckey);
+}
+else
+if(memcmp(buf,PARAM_DEINTERLACE,min(count,strlen(PARAM_DEINTERLACE))) == 0)
+{
+if(memcmp(&buf[strlen(PARAM_DEINTERLACE)],"on",2) == 0) besr.deinterlace_on = 1;
+else besr.deinterlace_on = 0;
+}
+else
+if(memcmp(buf,PARAM_DEINTERLACE_PATTERN,min(count,strlen(PARAM_DEINTERLACE_PATTERN))) == 0)
+{
+long dpat;
+dpat=simple_strtol(&buf[strlen(PARAM_DEINTERLACE_PATTERN)],NULL,16);
+	OUTREG(OV0_DEINTERLACE_PATTERN, dpat);
 }
 radeon_vid_preset();
 return count;
 }
 		printk(RVID_MSG"can't configure this card\n");
 		unregister_chrdev(RADEON_VID_MAJOR, "radeon_vid");
 		return -EINVAL;
 	}
 	radeon_vid_save_state();
+	radeon_vid_make_default();
 	radeon_vid_preset();
 	return(0);
 }
 int init_module(void)

Mercurial > mplayer.hg

comparison drivers/radeon/radeon_vid.c @ 3250:61b1441c0f8c