Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 187170
b: refs/heads/master
c: c5f06f5
h: refs/heads/master
v: v3
  • Loading branch information
Florian Tobias Schandinat authored and Linus Torvalds committed Mar 12, 2010
1 parent 04a83f5 commit bb76f15
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 76 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b24b00c364bb3bfa717ba2ead258a527b20cc5f
refs/heads/master: c5f06f5cddd6681b978ffdb53755e28eefccb1bb
9 changes: 2 additions & 7 deletions trunk/drivers/video/via/chip.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
struct tmds_chip_information {
int tmds_chip_name;
int tmds_chip_slave_addr;
int dvi_panel_id;
int data_mode;
int output_interface;
int i2c_port;
Expand Down Expand Up @@ -142,13 +141,9 @@ struct tmds_setting_information {
int iga_path;
int h_active;
int v_active;
int bpp;
int refresh_rate;
int get_dvi_size_method;
int max_pixel_clock;
int dvi_panel_hres;
int dvi_panel_vres;
int native_size;
int max_hres;
int max_vres;
};

struct lvds_setting_information {
Expand Down
107 changes: 49 additions & 58 deletions trunk/drivers/video/via/dvi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
static void tmds_register_write(int index, u8 data);
static int tmds_register_read(int index);
static int tmds_register_read_bytes(int index, u8 *buff, int buff_len);
static void dvi_get_panel_size_from_DDCv1(void);
static void dvi_get_panel_size_from_DDCv2(void);
static void dvi_get_panel_info(void);
static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information
*tmds_chip, struct tmds_setting_information *tmds_setting);
static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information
*tmds_chip, struct tmds_setting_information *tmds_setting);
static int viafb_dvi_query_EDID(void);

static int check_tmds_chip(int device_id_subaddr, int device_id)
Expand All @@ -36,23 +37,24 @@ static int check_tmds_chip(int device_id_subaddr, int device_id)
return FAIL;
}

void viafb_init_dvi_size(void)
void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
struct tmds_setting_information *tmds_setting)
{
DEBUG_MSG(KERN_INFO "viafb_init_dvi_size()\n");
DEBUG_MSG(KERN_INFO
"viaparinfo->tmds_setting_info->get_dvi_size_method %d\n",
viaparinfo->tmds_setting_info->get_dvi_size_method);

switch (viaparinfo->tmds_setting_info->get_dvi_size_method) {
case GET_DVI_SIZE_BY_SYSTEM_BIOS:
viafb_dvi_sense();
switch (viafb_dvi_query_EDID()) {
case 1:
dvi_get_panel_size_from_DDCv1(tmds_chip, tmds_setting);
break;
case GET_DVI_SZIE_BY_HW_STRAPPING:
case 2:
dvi_get_panel_size_from_DDCv2(tmds_chip, tmds_setting);
break;
case GET_DVI_SIZE_BY_VGA_BIOS:
default:
dvi_get_panel_info();
printk(KERN_WARNING "viafb_init_dvi_size: DVI panel size undetected!\n");
break;
}

return;
}

Expand Down Expand Up @@ -314,20 +316,18 @@ static int viafb_dvi_query_EDID(void)
return false;
}

/* void dvi_get_panel_size_from_DDCv1(void)
*
* - Get Panel Size Using EDID1 Table
*/
static void dvi_get_panel_size_from_DDCv1(void)
/* Get Panel Size Using EDID1 Table */
static void dvi_get_panel_size_from_DDCv1(struct tmds_chip_information
*tmds_chip, struct tmds_setting_information *tmds_setting)
{
int i, max_h = 0, tmp, restore;
unsigned char rData;
unsigned char EDID_DATA[18];

DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv1 \n");

restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA0;
restore = tmds_chip->tmds_chip_slave_addr;
tmds_chip->tmds_chip_slave_addr = 0xA0;

rData = tmds_register_read(0x23);
if (rData & 0x3C)
Expand Down Expand Up @@ -373,8 +373,8 @@ static void dvi_get_panel_size_from_DDCv1(void)
/* The first two byte must be zero. */
if (EDID_DATA[3] == 0xFD) {
/* To get max pixel clock. */
viaparinfo->tmds_setting_info->
max_pixel_clock = EDID_DATA[9] * 10;
tmds_setting->max_pixel_clock =
EDID_DATA[9] * 10;
}
}
break;
Expand All @@ -384,23 +384,31 @@ static void dvi_get_panel_size_from_DDCv1(void)
}
}

tmds_setting->max_hres = max_h;
switch (max_h) {
case 640:
tmds_setting->max_vres = 480;
break;
case 800:
tmds_setting->max_vres = 600;
break;
case 1024:
tmds_setting->max_vres = 768;
break;
case 1280:
tmds_setting->max_vres = 1024;
break;
case 1400:
tmds_setting->max_vres = 1050;
break;
case 1440:
tmds_setting->max_vres = 1050;
break;
case 1600:
tmds_setting->max_vres = 1200;
break;
case 1920:

tmds_setting->max_vres = 1080;
break;
default:
DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d !\
Expand All @@ -409,72 +417,55 @@ static void dvi_get_panel_size_from_DDCv1(void)
}

DEBUG_MSG(KERN_INFO "DVI max pixelclock = %d\n",
viaparinfo->tmds_setting_info->max_pixel_clock);
viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
tmds_setting->max_pixel_clock);
tmds_chip->tmds_chip_slave_addr = restore;
}

/* void dvi_get_panel_size_from_DDCv2(void)
*
* - Get Panel Size Using EDID2 Table
*/
static void dvi_get_panel_size_from_DDCv2(void)
/* Get Panel Size Using EDID2 Table */
static void dvi_get_panel_size_from_DDCv2(struct tmds_chip_information
*tmds_chip, struct tmds_setting_information *tmds_setting)
{
int HSize = 0, restore;
int restore;
unsigned char R_Buffer[2];

DEBUG_MSG(KERN_INFO "\n dvi_get_panel_size_from_DDCv2 \n");

restore = viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr;
viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = 0xA2;
restore = tmds_chip->tmds_chip_slave_addr;
tmds_chip->tmds_chip_slave_addr = 0xA2;

/* Horizontal: 0x76, 0x77 */
tmds_register_read_bytes(0x76, R_Buffer, 2);
HSize = R_Buffer[0];
HSize += R_Buffer[1] << 8;
tmds_setting->max_hres = R_Buffer[0] + (R_Buffer[1] << 8);

switch (HSize) {
switch (tmds_setting->max_hres) {
case 640:
tmds_setting->max_vres = 480;
break;
case 800:
tmds_setting->max_vres = 600;
break;
case 1024:
tmds_setting->max_vres = 768;
break;
case 1280:
tmds_setting->max_vres = 1024;
break;
case 1400:
tmds_setting->max_vres = 1050;
break;
case 1440:
tmds_setting->max_vres = 1050;
break;
case 1600:
tmds_setting->max_vres = 1200;
break;
default:
DEBUG_MSG(KERN_INFO "Unknown panel size max resolution = %d!\
set default panel size.\n", HSize);
set default panel size.\n", tmds_setting->max_hres);
break;
}

viaparinfo->chip_info->tmds_chip_info.tmds_chip_slave_addr = restore;
}

/* unsigned char dvi_get_panel_info(void)
*
* - Get Panel Size
*/
static void dvi_get_panel_info(void)
{
DEBUG_MSG(KERN_INFO "dvi_get_panel_info! \n");

viafb_dvi_sense();
switch (viafb_dvi_query_EDID()) {
case 1:
dvi_get_panel_size_from_DDCv1();
break;
case 2:
dvi_get_panel_size_from_DDCv2();
break;
default:
break;
}
tmds_chip->tmds_chip_slave_addr = restore;
}

/* If Disable DVI, turn off pad */
Expand Down
3 changes: 2 additions & 1 deletion trunk/drivers/video/via/dvi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ int viafb_dvi_sense(void);
void viafb_dvi_disable(void);
void viafb_dvi_enable(void);
int viafb_tmds_trasmitter_identify(void);
void viafb_init_dvi_size(void);
void viafb_init_dvi_size(struct tmds_chip_information *tmds_chip,
struct tmds_setting_information *tmds_setting);
void viafb_dvi_set_mode(struct VideoModeTable *videoMode, int mode_bpp,
int set_iga);

Expand Down
11 changes: 2 additions & 9 deletions trunk/drivers/video/via/hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1911,9 +1911,6 @@ void viafb_update_device_setting(int hres, int vres,

viaparinfo->tmds_setting_info->h_active = hres;
viaparinfo->tmds_setting_info->v_active = vres;
viaparinfo->tmds_setting_info->bpp = bpp;
viaparinfo->tmds_setting_info->refresh_rate =
vmode_refresh;

viaparinfo->lvds_setting_info->h_active = hres;
viaparinfo->lvds_setting_info->v_active = vres;
Expand All @@ -1930,9 +1927,6 @@ void viafb_update_device_setting(int hres, int vres,
if (viaparinfo->tmds_setting_info->iga_path == IGA2) {
viaparinfo->tmds_setting_info->h_active = hres;
viaparinfo->tmds_setting_info->v_active = vres;
viaparinfo->tmds_setting_info->bpp = bpp;
viaparinfo->tmds_setting_info->refresh_rate =
vmode_refresh;
}

if (viaparinfo->lvds_setting_info->iga_path == IGA2) {
Expand Down Expand Up @@ -2031,9 +2025,8 @@ static void init_tmds_chip_info(void)

DEBUG_MSG(KERN_INFO "TMDS Chip = %d\n",
viaparinfo->chip_info->tmds_chip_info.tmds_chip_name);
viaparinfo->tmds_setting_info->get_dvi_size_method =
GET_DVI_SIZE_BY_VGA_BIOS;
viafb_init_dvi_size();
viafb_init_dvi_size(&viaparinfo->shared->chip_info.tmds_chip_info,
&viaparinfo->shared->tmds_setting_info);
}

static void init_lvds_chip_info(void)
Expand Down

0 comments on commit bb76f15

Please sign in to comment.