mplayer.hg: drivers/radeon/radeon

comparison drivers/radeon/radeon_vid.c @ 3247:7cec2396bde3

Tune up driver through reading and writing /dev/radeon_vid ;)

author	nick
date	Sat, 01 Dec 2001 17:08:37 +0000
parents	5eae81895171
children	61b1441c0f8c

comparison

equal deleted inserted replaced

-:f03adf755028
+:7cec2396bde3
 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 colour_cntl;
+int brightness;
+int saturation;
 uint32_t graphics_key_msk;
 uint32_t graphics_key_clr;
 uint32_t key_cntl;
 uint32_t test;
 } bes_registers_t;
 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_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_DOUBLE_BUFFER |
 SCALER_ADAPTIVE_DEINT |
 SCALER_SMART_SWITCH |
 SCALER_HORZ_PICK_NEAREST;
+if(radeon_double_buff) bes_flags |= SCALER_DOUBLE_BUFFER;
 #ifdef RAGE128
 bes_flags |= SCALER_BURST_PER_PLANE;
 #endif
 switch(besr.fourcc)
 {
 }
 static void radeon_vid_frame_sel(int frame)
 {
 uint32_t off0,off1,off2;
+if(!radeon_double_buff) return;
 if(frame%2)
 {
 off0 = besr.vid_buf3_base_adrs;
 off1 = besr.vid_buf4_base_adrs;
 off2 = besr.vid_buf5_base_adrs;
 while(!(INREG(OV0_REG_LOAD_CNTL)&REG_LD_CTL_LOCK_READBACK));
 OUTREG(OV0_VID_BUF0_BASE_ADRS,	off0);
 OUTREG(OV0_VID_BUF1_BASE_ADRS,	off1);
 OUTREG(OV0_VID_BUF2_BASE_ADRS,	off2);
 OUTREG(OV0_REG_LOAD_CNTL,		0);
+}
+static void radeon_vid_preset(void)
+{
+unsigned tmp;
+tmp = INREG(OV0_COLOUR_CNTL);
+besr.saturation = (tmp>>8)&0x1f;
+besr.brightness = tmp & 0x7f;
 }
 static int video_on = 0;
 static int radeon_vid_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 { PCI_DEVICE_ID_R200_QL,   "Radeon2 8500 QL " },
 { PCI_DEVICE_ID_RV200_QW,  "Radeon2 7500 QW " }
 #endif
 };
+static int detected_chip;
 static int radeon_vid_config_card(void)
 {
 	struct pci_dev *dev = NULL;
 	size_t i;
 	radeon_ram_size = INREG(CONFIG_MEMSIZE);
 	/* mem size is bits [28:0], mask off the rest. Range: from 1Mb up to 512 Mb */
 	radeon_ram_size &=  CONFIG_MEMSIZE_MASK;
 	radeon_ram_size /= 0x100000;
+	detected_chip = i;
 	printk(RVID_MSG"Found %s (%uMb memory)\n",ati_card_ids[i].name,radeon_ram_size);
 	return TRUE;
 }
+#define PARAM_BRIGHTNESS "brightness="
+#define PARAM_SATURATION "saturation="
+#define PARAM_DOUBLE_BUFF "double_buff="
 static ssize_t radeon_vid_read(struct file *file, char *buf, size_t count, loff_t *ppos)
 {
-	return -EINVAL;
+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],"Configurable stuff:\n");
+len += sprintf(&buf[len],PARAM_DOUBLE_BUFF"%s\n",radeon_double_buff?"on":"off");
+len += sprintf(&buf[len],PARAM_BRIGHTNESS"%i\n",brightness);
+len += sprintf(&buf[len],PARAM_SATURATION"%u\n",saturation);
+return len;
 }
 static ssize_t radeon_vid_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
 {
-	return -EINVAL;
+if(memcmp(buf,PARAM_BRIGHTNESS,min(count,strlen(PARAM_BRIGHTNESS))) == 0)
+{
+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 << 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 << 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;
+else radeon_double_buff = 0;
+}
+radeon_vid_preset();
+return count;
 }
 static int radeon_vid_mmap(struct file *file, struct vm_area_struct *vma)
 {
 		printk(RVID_MSG"can't configure this card\n");
 		unregister_chrdev(RADEON_VID_MAJOR, "radeon_vid");
 		return -EINVAL;
 	}
 	radeon_vid_save_state();
+	radeon_vid_preset();
 	return(0);
 }
 int init_module(void)
 {

Mercurial > mplayer.hg

comparison drivers/radeon/radeon_vid.c @ 3247:7cec2396bde3