Commit 51f4332b authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat
Browse files

viafb: add initial VX900 support 



This patch adds basic support for the new VX900 IGP. Almost everything
that was implemented for other IGPs is expected to work also on VX900
after this patch. The only known issue is that on the CRT output mode
setting does not always work.
It is clear that the possibility for regressions is zero.

A big thanks to VIA Technologies for making this possible and
supporting this work.

Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Jonathan Corbet <corbet@lwn.net>
parent adac8d65

drivers/video/via/accel.c

+3 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ int viafb_setup_engine(struct fb_info *info) 
		break;

	case UNICHROME_VX800:

	case UNICHROME_VX855:

	case UNICHROME_VX900:

		viapar->shared->hw_bitblt = hw_bitblt_2;

		break;

	default:
@@ -402,6 +403,7 @@ void viafb_reset_engine(struct viafb_par *viapar) 
	case UNICHROME_P4M900:

	case UNICHROME_VX800:

	case UNICHROME_VX855:

	case UNICHROME_VX900:

		writel(0x00100000, engine + VIA_REG_CR_TRANSET);

		writel(0x680A0000, engine + VIA_REG_CR_TRANSPACE);

		writel(0x02000000, engine + VIA_REG_CR_TRANSPACE);
@@ -438,6 +440,7 @@ void viafb_reset_engine(struct viafb_par *viapar) 
	case UNICHROME_P4M900:

	case UNICHROME_VX800:

	case UNICHROME_VX855:

	case UNICHROME_VX900:

		vq_start_low |= 0x20000000;

		vq_end_low |= 0x20000000;

		vq_high |= 0x20000000;

drivers/video/via/chip.h

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ 
#define     UNICHROME_VX855         12

#define     UNICHROME_VX855_DID     0x5122



#define     UNICHROME_VX900         13

#define     UNICHROME_VX900_DID     0x7122



/**************************************************/

/* Definition TMDS Trasmitter Information         */

/**************************************************/

drivers/video/via/hw.c

+23 −0
Original line number Diff line number Diff line
@@ -1429,6 +1429,15 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active) 
			    VX855_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;

		}



		if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX900) {

			iga1_fifo_max_depth = VX900_IGA1_FIFO_MAX_DEPTH;

			iga1_fifo_threshold = VX900_IGA1_FIFO_THRESHOLD;

			iga1_fifo_high_threshold =

			    VX900_IGA1_FIFO_HIGH_THRESHOLD;

			iga1_display_queue_expire_num =

			    VX900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM;

		}



		/* Set Display FIFO Depath Select */

		reg_value = IGA1_FIFO_DEPTH_SELECT_FORMULA(iga1_fifo_max_depth);

		viafb_load_reg_num =
@@ -1569,6 +1578,15 @@ void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active) 
			    VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;

		}



		if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_VX900) {

			iga2_fifo_max_depth = VX900_IGA2_FIFO_MAX_DEPTH;

			iga2_fifo_threshold = VX900_IGA2_FIFO_THRESHOLD;

			iga2_fifo_high_threshold =

			    VX900_IGA2_FIFO_HIGH_THRESHOLD;

			iga2_display_queue_expire_num =

			    VX900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM;

		}



		if (viaparinfo->chip_info->gfx_chip_name == UNICHROME_K800) {

			/* Set Display FIFO Depath Select */

			reg_value =
@@ -1689,6 +1707,7 @@ u32 viafb_get_clk_value(int clk) 
			break;



		case UNICHROME_VX855:

		case UNICHROME_VX900:

			value = vx855_encode_pll(pll_value[i].vx855_pll);

			break;

		}
@@ -1722,6 +1741,7 @@ void viafb_set_vclock(u32 clk, int set_iga) 
		case UNICHROME_P4M900:

		case UNICHROME_VX800:

		case UNICHROME_VX855:

		case UNICHROME_VX900:

			via_write_reg(VIASR, SR44, (clk & 0x0000FF));

			via_write_reg(VIASR, SR45, (clk & 0x00FF00) >> 8);

			via_write_reg(VIASR, SR46, (clk & 0xFF0000) >> 16);
@@ -1748,6 +1768,7 @@ void viafb_set_vclock(u32 clk, int set_iga) 
		case UNICHROME_P4M900:

		case UNICHROME_VX800:

		case UNICHROME_VX855:

		case UNICHROME_VX900:

			via_write_reg(VIASR, SR4A, (clk & 0x0000FF));

			via_write_reg(VIASR, SR4B, (clk & 0x00FF00) >> 8);

			via_write_reg(VIASR, SR4C, (clk & 0xFF0000) >> 16);
@@ -2179,6 +2200,7 @@ static void __devinit init_gfx_chip_info(int chip_type) 
	switch (viaparinfo->chip_info->gfx_chip_name) {

	case UNICHROME_VX800:

	case UNICHROME_VX855:

	case UNICHROME_VX900:

		viaparinfo->chip_info->twod_engine = VIA_2D_ENG_M1;

		break;

	case UNICHROME_K8M890:
@@ -2403,6 +2425,7 @@ int viafb_setmode(struct VideoModeTable *vmode_tbl, int video_bpp, 
		break;



	case UNICHROME_VX855:

	case UNICHROME_VX900:

		viafb_write_regx(VX855_ModeXregs, NUM_TOTAL_VX855_ModeXregs);

		break;

	}

drivers/video/via/hw.h

+13 −0
Original line number Diff line number Diff line
@@ -362,6 +362,17 @@ is reserved, so it may have problem to set 1600x1200 on IGA2. */ 
#define VX855_IGA2_FIFO_HIGH_THRESHOLD          160

#define VX855_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     320



/* For VT3410 */

#define VX900_IGA1_FIFO_MAX_DEPTH               400

#define VX900_IGA1_FIFO_THRESHOLD               320

#define VX900_IGA1_FIFO_HIGH_THRESHOLD          320

#define VX900_IGA1_DISPLAY_QUEUE_EXPIRE_NUM     160



#define VX900_IGA2_FIFO_MAX_DEPTH               192

#define VX900_IGA2_FIFO_THRESHOLD               160

#define VX900_IGA2_FIFO_HIGH_THRESHOLD          160

#define VX900_IGA2_DISPLAY_QUEUE_EXPIRE_NUM     320



#define IGA1_FIFO_DEPTH_SELECT_REG_NUM          1

#define IGA1_FIFO_THRESHOLD_REG_NUM             2

#define IGA1_FIFO_HIGH_THRESHOLD_REG_NUM        2
@@ -879,6 +890,8 @@ struct iga2_crtc_timing { 
#define VX800_FUNCTION3     0x3353

/* VT3409 chipset*/

#define VX855_FUNCTION3     0x3409

/* VT3410 chipset*/

#define VX900_FUNCTION3     0x3410



#define NUM_TOTAL_PLL_TABLE ARRAY_SIZE(pll_value)

drivers/video/via/lcd.c

+2 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, 
		case UNICHROME_CN750:

		case UNICHROME_VX800:

		case UNICHROME_VX855:

		case UNICHROME_VX900:

			reg_value =

			    K800_LCD_HOR_SCF_FORMULA(set_hres, panel_hres);

			/* Horizontal scaling enabled */
@@ -485,6 +486,7 @@ static void load_lcd_scaling(int set_hres, int set_vres, int panel_hres, 
		case UNICHROME_CN750:

		case UNICHROME_VX800:

		case UNICHROME_VX855:

		case UNICHROME_VX900:

			reg_value =

			    K800_LCD_VER_SCF_FORMULA(set_vres, panel_vres);

			/* Vertical scaling enabled */

CRA Git | Maintained and supported by SUSTech CRA and CCSE