Commit dbf85f23 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

viafb: kill lcd_panel_id 



This patch removes all internal uses of another mostly artificial
value. It does duplicate the information of the maximum resolution and
it is not flexible as only a few resolutions exist. Hence it is better
to remove it and clean the mess up.
No runtime change expected.

Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent 23e5abd5

drivers/video/via/chip.h

+0 −2
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ struct lvds_setting_information { 
	int v_active;

	int bpp;

	int refresh_rate;

	int lcd_panel_id;

	int lcd_panel_hres;

	int lcd_panel_vres;

	int display_method;
@@ -188,7 +187,6 @@ struct GFX_DPA_SETTING { 
};



struct VT1636_DPA_SETTING {

	int PanelSizeID;

	u8 CLK_SEL_ST1;

	u8 CLK_SEL_ST2;

};

drivers/video/via/lcd.c

+0 −50
Original line number Diff line number Diff line
@@ -97,8 +97,6 @@ void __devinit viafb_init_lcd_size(void) 
	DEBUG_MSG(KERN_INFO "viafb_init_lcd_size()\n");



	fp_id_to_vindex(viafb_lcd_panel_id);

	viaparinfo->lvds_setting_info2->lcd_panel_id =

		viaparinfo->lvds_setting_info->lcd_panel_id;

	viaparinfo->lvds_setting_info2->lcd_panel_hres =

		viaparinfo->lvds_setting_info->lcd_panel_hres;

	viaparinfo->lvds_setting_info2->lcd_panel_vres =
@@ -205,176 +203,132 @@ static void __devinit fp_id_to_vindex(int panel_id) 
	case 0x0:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 640;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 480;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID0_640X480;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x1:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 800;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 600;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID1_800X600;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x2:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID2_1024X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x3:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID3_1280X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x4:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID4_1280X1024;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x5:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID5_1400X1050;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x6:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID6_1600X1200;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x8:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 800;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 480;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_IDA_800X480;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x9:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID2_1024X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0xA:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID2_1024X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0xB:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID2_1024X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0xC:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID3_1280X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0xD:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID4_1280X1024;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0xE:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1400;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1050;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID5_1400X1050;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0xF:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1600;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 1200;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID6_1600X1200;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0x10:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1366;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID7_1366X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0x11:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1024;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 600;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID8_1024X600;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x12:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID3_1280X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x13:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 800;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID9_1280X800;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;

	case 0x14:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1360;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_IDB_1360X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0x15:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1280;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 768;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID3_1280X768;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 1;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	case 0x16:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 480;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 640;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_IDC_480X640;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

		break;
@@ -382,16 +336,12 @@ static void __devinit fp_id_to_vindex(int panel_id) 
		/* OLPC XO-1.5 panel */

		viaparinfo->lvds_setting_info->lcd_panel_hres = 1200;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 900;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_IDD_1200X900;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 0;

		break;

	default:

		viaparinfo->lvds_setting_info->lcd_panel_hres = 800;

		viaparinfo->lvds_setting_info->lcd_panel_vres = 600;

		viaparinfo->lvds_setting_info->lcd_panel_id =

			LCD_PANEL_ID1_800X600;

		viaparinfo->lvds_setting_info->device_lcd_dualedge = 0;

		viaparinfo->lvds_setting_info->LCDDithering = 1;

	}

drivers/video/via/tblDPASetting.c

+0 −23
Original line number Diff line number Diff line
@@ -20,17 +20,6 @@ 
 */



#include "global.h"

/* For VT3324: */

struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[] = {

	/* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */

	{LCD_PANEL_ID0_640X480, 0x00, 0x00},	/* For 640x480   */

	{LCD_PANEL_ID1_800X600, 0x00, 0x00},	/* For 800x600   */

	{LCD_PANEL_ID2_1024X768, 0x00, 0x00},	/* For 1024x768  */

	{LCD_PANEL_ID3_1280X768, 0x00, 0x00},	/* For 1280x768  */

	{LCD_PANEL_ID4_1280X1024, 0x00, 0x00},	/* For 1280x1024 */

	{LCD_PANEL_ID5_1400X1050, 0x00, 0x00},	/* For 1400x1050 */

	{LCD_PANEL_ID6_1600X1200, 0x0B, 0x03}	/* For 1600x1200 */

};



struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[] = {

/*  ClkRange, DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,
@@ -57,18 +46,6 @@ struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[] = { 
	 0x00},

};



/* For VT3327: */

struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[] = {

	/* Panel ID,       CLK_SEL_ST1[09],    CLK_SEL_ST2[08] */

	{LCD_PANEL_ID0_640X480, 0x00, 0x00},	/* For 640x480   */

	{LCD_PANEL_ID1_800X600, 0x00, 0x00},	/* For 800x600   */

	{LCD_PANEL_ID2_1024X768, 0x00, 0x00},	/* For 1024x768  */

	{LCD_PANEL_ID3_1280X768, 0x00, 0x00},	/* For 1280x768  */

	{LCD_PANEL_ID4_1280X1024, 0x00, 0x00},	/* For 1280x1024 */

	{LCD_PANEL_ID5_1400X1050, 0x00, 0x00},	/* For 1400x1050 */

	{LCD_PANEL_ID6_1600X1200, 0x00, 0x00}	/* For 1600x1200 */

};



struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[] = {

/*  ClkRange,DVP0, DVP0DataDriving,  DVP0ClockDriving, DVP1,

					DVP1Driving, DFPHigh,   DFPLow */

drivers/video/via/tblDPASetting.h

+0 −2
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ enum DPA_RANGE { 
	DPA_CLK_RANGE_150M

};



extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3324[7];

extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3324[6];

extern struct VT1636_DPA_SETTING VT1636_DPA_SETTING_TBL_VT3327[7];

extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3327[];

extern struct GFX_DPA_SETTING GFX_DPA_SETTING_TBL_VT3364[6];

drivers/video/via/vt1636.c

+13 −30
Original line number Diff line number Diff line
@@ -167,22 +167,6 @@ static int get_clk_range_index(u32 Clk) 
		return DPA_CLK_RANGE_150M;

}



static int get_lvds_dpa_setting_index(int panel_size_id,

			     struct VT1636_DPA_SETTING *p_vt1636_dpasetting_tbl,

			       int tbl_size)

{

	int i;



	for (i = 0; i < tbl_size; i++) {

		if (panel_size_id == p_vt1636_dpasetting_tbl->PanelSizeID)

			return i;



		p_vt1636_dpasetting_tbl++;

	}



	return 0;

}



static void set_dpa_vt1636(struct lvds_setting_information

	*plvds_setting_info, struct lvds_chip_information *plvds_chip_info,

		    struct VT1636_DPA_SETTING *p_vt1636_dpa_setting)
@@ -206,7 +190,9 @@ void viafb_vt1636_patch_skew_on_vt3324( 
	struct lvds_setting_information *plvds_setting_info,

	struct lvds_chip_information *plvds_chip_info)

{

	int index, size;

	struct VT1636_DPA_SETTING dpa = {0x00, 0x00}, dpa_16x12 = {0x0B, 0x03},

		*pdpa;

	int index;



	DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3324.\n");
@@ -216,19 +202,21 @@ void viafb_vt1636_patch_skew_on_vt3324( 
		    &GFX_DPA_SETTING_TBL_VT3324[index]);



	/* LVDS Transmitter DPA settings: */

	size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3324);

	index =

	    get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,

				       VT1636_DPA_SETTING_TBL_VT3324, size);

	set_dpa_vt1636(plvds_setting_info, plvds_chip_info,

		       &VT1636_DPA_SETTING_TBL_VT3324[index]);

	if (plvds_setting_info->lcd_panel_hres == 1600 &&

		plvds_setting_info->lcd_panel_vres == 1200)

		pdpa = &dpa_16x12;

	else

		pdpa = &dpa;



	set_dpa_vt1636(plvds_setting_info, plvds_chip_info, pdpa);

}



void viafb_vt1636_patch_skew_on_vt3327(

	struct lvds_setting_information *plvds_setting_info,

	struct lvds_chip_information *plvds_chip_info)

{

	int index, size;

	struct VT1636_DPA_SETTING dpa = {0x00, 0x00};

	int index;



	DEBUG_MSG(KERN_INFO "viafb_vt1636_patch_skew_on_vt3327.\n");
@@ -238,12 +226,7 @@ void viafb_vt1636_patch_skew_on_vt3327( 
		    &GFX_DPA_SETTING_TBL_VT3327[index]);



	/* LVDS Transmitter DPA settings: */

	size = ARRAY_SIZE(VT1636_DPA_SETTING_TBL_VT3327);

	index =

	    get_lvds_dpa_setting_index(plvds_setting_info->lcd_panel_id,

				       VT1636_DPA_SETTING_TBL_VT3327, size);

	set_dpa_vt1636(plvds_setting_info, plvds_chip_info,

		       &VT1636_DPA_SETTING_TBL_VT3327[index]);

	set_dpa_vt1636(plvds_setting_info, plvds_chip_info, &dpa);

}



void viafb_vt1636_patch_skew_on_vt3364(