diff options
| -rw-r--r-- | CHANGELOG | 15 | ||||
| -rw-r--r-- | README | 29 | ||||
| -rw-r--r-- | drivers/Makefile | 3 | ||||
| -rw-r--r-- | drivers/ct69000.c | 227 | ||||
| -rw-r--r-- | drivers/smiLynxEM.c | 1460 | ||||
| -rw-r--r-- | drivers/videomodes.c | 210 | ||||
| -rw-r--r-- | drivers/videomodes.h | 89 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/configs/csb272.h | 1 | ||||
| -rw-r--r-- | lib_ppc/board.c | 18 | 
10 files changed, 986 insertions, 1068 deletions
| @@ -2,6 +2,21 @@  Changes for U-Boot 1.0.2:  ====================================================================== +* Patch by Pierre Aubert, 18 Mar 2004: +  - Unify video mode handling for Chips & Technologies 69000 Video +    chip and Silicon Motion SMI 712/710/810 Video chip +  - Add selection of the video output (CRT or LCD) via 'videoout' +    environment variable for the Silicon Motion +  - README update + +* Patch by Pierre Aubert, 18 Mar 2004: +  include/common.h typo fix + +* Patches by Tolunay Orkun, 17 Mar 2004: +  - Add support for bd->bi_iic_fast[] initialization via environment +    variable "i2cfast" (CONFIG_I2CFAST) +  - Add "i2cfast" u-boot environment variable support for csb272 +  * Patch by Carl Riechers, 17 Mar 2004:    Ignore '\0' characters in console input for use with telnet and    telco pads. @@ -778,17 +778,30 @@ The following options need to be configured:  		Enable Chips & Technologies 69000 Video chip  		CONFIG_VIDEO_SMI_LYNXEM -		Enable Silicon Motion SMI 712/710/810 Video chip -		Videomode are selected via environment 'videomode' with -		standard LiLo mode numbers. -		Following modes are supported  (* is default): +		Enable Silicon Motion SMI 712/710/810 Video chip. The  +		video output is selected via environment 'videoout' +		(1 = LCD and 2 = CRT). If videoout is undefined, CRT is +		assumed. -			    800x600  1024x768  1280x1024 -	      256  (8bit)     303*	305	  307 -	    65536 (16bit)     314	317	  31a -	16,7 Mill (24bit)     315	318	  31b +		For the CT69000 and SMI_LYNXEM drivers, videomode is  +		selected via environment 'videomode'. Two diferent ways  +		are possible: +		- "videomode=num"   'num' is a standard LiLo mode numbers. +		Following standard modes are supported  (* is default): + +		      Colors	640x480 800x600 1024x768 1152x864 1280x1024 +		-------------+--------------------------------------------- +		      8 bits |	0x301*	0x303	 0x305	  0x161	    0x307 +		     15 bits |	0x310	0x313	 0x316	  0x162	    0x319 +		     16 bits |	0x311	0x314	 0x317	  0x163	    0x31A +		     24 bits |	0x312	0x315	 0x318	    ?	    0x31B +		-------------+---------------------------------------------  		(i.e. setenv videomode 317; saveenv; reset;) +		- "videomode=bootargs" all the video parameters are parsed  +		from the bootargs. (See drivers/videomodes.c) + +  		CONFIG_VIDEO_SED13806  		Enable Epson SED13806 driver. This driver supports 8bpp  		and 16bpp modes defined by CONFIG_VIDEO_SED13806_8BPP diff --git a/drivers/Makefile b/drivers/Makefile index 33b9ab4b7..0036d6522 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -42,7 +42,8 @@ OBJS	= 3c589.o 5701rls.o ali512x.o \  	  serial.o serial_max3100.o serial_pl011.o serial_pl010.o \  	  smc91111.o smiLynxEM.o status_led.o sym53c8xx.o \  	  ti_pci1410a.o tigon3.o w83c553f.o omap1510_i2c.o \ -	  usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o +	  usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \ +	  videomodes.o  all:	$(LIB) diff --git a/drivers/ct69000.c b/drivers/ct69000.c index ba6966387..f510f371d 100644 --- a/drivers/ct69000.c +++ b/drivers/ct69000.c @@ -26,52 +26,6 @@   *   */ -/************************************************************************ -  Get Parameters for the video mode: -  Parameters can be set via the variable "videomode" in the environment. -  2 diferent ways are possible: -  "videomode=301"   - 301 is a hexadecimal number describing the VESA -		      mode. Following modes are implemented: - -		      Colors    640x480 800x600 1024x768 1152x864 -		     --------+----------------------------------- -		      8 bits |  0x301   0x303    0x305    0x161 -		     15 bits |  0x310   0x313    0x316    0x162 -		     16 bits |  0x311   0x314    0x317    0x163 -		     24 bits |  0x312   0x315    0x318      ? -		     --------+----------------------------------- -  "videomode=bootargs" -		   - the parameters are parsed from the bootargs. -		      The format is "NAME:VALUE,NAME:VALUE" etc. -		      Ex.: -		      "bootargs=video=ctfb:x:800,y:600,depth:16,pclk:25000" -		      Parameters not included in the list will be taken from -		      the default mode, which is one of the following: -		      mode:0  640x480x24 -		      mode:1  800x600x16 -		      mode:2  1024x768x8 -		      mode:3  960x720x24 -		      mode:4  1152x864x16 -		      if "mode" is not provided within the parameter list, -		      mode:0 is assumed. -		      Following parameters are supported: -		      x       xres = visible resolution horizontal -		      y       yres = visible resolution vertical -		      pclk    pixelclocks in pico sec -		      le      left_marging time from sync to picture in pixelclocks -		      ri      right_marging time from picture to sync in pixelclocks -		      up      upper_margin time from sync to picture -		      lo      lower_margin -		      hs      hsync_len length of horizontal sync -		      vs      vsync_len length of vertical sync -		      sync    see FB_SYNC_* -		      vmode   see FB_VMODE_* -		      depth   Color depth in bits per pixel -		      All other parameters in the variable bootargs are ignored. -		      It is also possible to set the parameters direct in the -		      variable "videomode", or in another variable i.e. -		      "myvideo" and setting the variable "videomode=myvideo".. -****************************************************************************/  #include <common.h> @@ -79,6 +33,7 @@  #include <pci.h>  #include <video_fb.h> +#include "videomodes.h"  #ifdef CONFIG_VIDEO_CT69000 @@ -304,32 +259,6 @@ static CT_CFG_TABLE xreg[] = {   *   */ -/****************************************************************** - * Resolution Struct - ******************************************************************/ -struct ctfb_res_modes { -	int xres;		/* visible resolution           */ -	int yres; -	/* Timing: All values in pixclocks, except pixclock (of course) */ -	int pixclock;		/* pixel clock in ps (pico seconds) */ -	int left_margin;	/* time from sync to picture    */ -	int right_margin;	/* time from picture to sync    */ -	int upper_margin;	/* time from sync to picture    */ -	int lower_margin; -	int hsync_len;		/* length of horizontal sync    */ -	int vsync_len;		/* length of vertical sync      */ -	int sync;		/* see FB_SYNC_*                */ -	int vmode;		/* see FB_VMODE_*               */ -}; - -/****************************************************************** - * Vesa Mode Struct - ******************************************************************/ -struct ctfb_vesa_modes { -	int vesanr;		/* Vesa number as in LILO (VESA Nr + 0x200} */ -	int resindex;		/* index to resolution struct */ -	int bits_per_pixel;	/* bpp */ -};  /*******************************************************************   * Chips struct   *******************************************************************/ @@ -351,58 +280,6 @@ static const struct ctfb_chips_properties chips[] = {  	{0, 0, 0, 0, 0, 0, 0, 0, 0}	/* Terminator */  }; -/************************************************* - Video Modes: -Colours   640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200 ---------+-------------------------------------------------------------- - 4 bits |    ?       ?     0x302      ?        ?        ?         ? - 8 bits |  0x300   0x301   0x303    0x305    0x161    0x307     0x31C -15 bits |    ?     0x310   0x313    0x316    0x162    0x319     0x31D -16 bits |    ?     0x311   0x314    0x317    0x163    0x31A     0x31E -24 bits |    ?     0x312   0x315    0x318      ?      0x31B     0x31F -32 bits |    ?       ?       ?        ?      0x164      ? -*/ - -#define RES_MODE_640x480 	0 -#define RES_MODE_800x600 	1 -#define RES_MODE_1024x768 	2 -#define RES_MODE_960_720	3 -#define RES_MODE_1152x864 	4 -#define RES_MODES_COUNT		5 - -#define VESA_MODES_COUNT 15 - -static const struct ctfb_vesa_modes vesa_modes[VESA_MODES_COUNT] = { -	{0x301, RES_MODE_640x480, 8}, -	{0x310, RES_MODE_640x480, 15}, -	{0x311, RES_MODE_640x480, 16}, -	{0x312, RES_MODE_640x480, 24}, -	{0x303, RES_MODE_800x600, 8}, -	{0x313, RES_MODE_800x600, 15}, -	{0x314, RES_MODE_800x600, 16}, -	{0x315, RES_MODE_800x600, 24}, -	{0x305, RES_MODE_1024x768, 8}, -	{0x316, RES_MODE_1024x768, 15}, -	{0x317, RES_MODE_1024x768, 16}, -	{0x318, RES_MODE_1024x768, 24}, -	{0x161, RES_MODE_1152x864, 8}, -	{0x162, RES_MODE_1152x864, 15}, -	{0x163, RES_MODE_1152x864, 16} -}; - -static const struct ctfb_res_modes res_mode_init[RES_MODES_COUNT] = { -	/* x     y pixclk   le  ri  up  lo   hs vs  s  vmode */ -	{640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, -	 FB_VMODE_NONINTERLACED}, -	{800, 600, 27778, 64, 24, 22, 1, 72, 2, 0, FB_VMODE_NONINTERLACED}, -	{1024, 768, 15384, 168, 8, 29, 3, 144, 4, 0, -	 FB_VMODE_NONINTERLACED}, -	{960, 720, 13100, 160, 40, 32, 8, 80, 4, 0, -	 FB_VMODE_NONINTERLACED}, -	{1152, 864, 12004, 200, 64, 32, 16, 80, 4, 0, -	 FB_VMODE_NONINTERLACED} -}; -  /*   * The Graphic Device   */ @@ -1079,108 +956,6 @@ SetDrawingEngine (int bits_per_pixel)  	video_wait_bitblt (pGD->pciBase + BR04_o);  } -/************************************************************************ - * Get Parameters for the video mode: - */ -/********************************************************************* - * returns the length to the next seperator - */ -static int -video_get_param_len (char *start, char sep) -{ -	int i = 0; -	while ((*start != 0) && (*start != sep)) { -		start++; -		i++; -	} -	return i; -} - -static int -video_search_param (char *start, char *param) -{ -	int len, totallen, i; -	char *p = start; -	len = strlen (param); -	totallen = len + strlen (start); -	for (i = 0; i < totallen; i++) { -		if (strncmp (p++, param, len) == 0) -			return (i); -	} -	return -1; -} - -/*************************************************************** -* Get parameter via the environment as it is done for the -* linux kernel i.e: -* video=ctfb:x:800,xv:1280,y:600,yv:1024,depth:16,mode:0,pclk:25000, -*       le:56,ri:48,up:26,lo:5,hs:152,vs:2,sync:0,vmode:0,accel:0 -* -* penv is a pointer to the environment, containing the string, or the name of -* another environment variable. It could even be the term "bootargs" -*/ - -#define GET_OPTION(name,var) 				\ -		if(strncmp(p,name,strlen(name))==0) { 	\ -			val_s=p+strlen(name); 		\ -			var=simple_strtoul(val_s, NULL, 10); \ -		} - -static int -video_get_params (struct ctfb_res_modes *pPar, char *penv) -{ -	char *p, *s, *val_s; -	int i = 0, t; -	int bpp; -	int mode; -	/* first search for the environment containing the real param string */ -	s = penv; -	if ((p = getenv (s)) != NULL) { -		s = p; -	} -	/* in case of the bootargs line, we have to start -	 * after "video=ctfb:" -	 */ -	i = video_search_param (s, "video=ctfb:"); -	if (i >= 0) { -		s += i; -		s += strlen ("video=ctfb:"); -	} -	/* search for mode as a default value */ -	p = s; -	t = 0; -	mode = 0;		/* default */ -	while ((i = video_get_param_len (p, ',')) != 0) { -		GET_OPTION ("mode:", mode) -		    p += i; -		if (*p != 0) -			p++;	/* skip ',' */ -	} -	if (mode >= RES_MODES_COUNT) -		mode = 0; -	*pPar = res_mode_init[mode];	/* copy default values */ -	bpp = 24 - ((mode % 3) * 8); -	p = s;			/* restart */ -	while ((i = video_get_param_len (p, ',')) != 0) { -		GET_OPTION ("x:", pPar->xres) -		    GET_OPTION ("y:", pPar->yres) -		    GET_OPTION ("le:", pPar->left_margin) -		    GET_OPTION ("ri:", pPar->right_margin) -		    GET_OPTION ("up:", pPar->upper_margin) -		    GET_OPTION ("lo:", pPar->lower_margin) -		    GET_OPTION ("hs:", pPar->hsync_len) -		    GET_OPTION ("vs:", pPar->vsync_len) -		    GET_OPTION ("sync:", pPar->sync) -		    GET_OPTION ("vmode:", pPar->vmode) -		    GET_OPTION ("pclk:", pPar->pixclock) -		    GET_OPTION ("depth:", bpp) -		    p += i; -		if (*p != 0) -			p++;	/* skip ',' */ -	} -	return bpp; -} -  /****************************************************************************  * supported Video Chips  */ diff --git a/drivers/smiLynxEM.c b/drivers/smiLynxEM.c index c2b98cfa7..08754c519 100644 --- a/drivers/smiLynxEM.c +++ b/drivers/smiLynxEM.c @@ -12,7 +12,7 @@   *   * This program is distributed in the hope that it will be useful,   * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the   * GNU General Public License for more details.   *   * You should have received a copy of the GNU General Public License @@ -30,6 +30,12 @@   * --------------------   * 04-18-2002 Rewritten for U-Boot <fgottschling@eltec.de>.   * + * 18-03-2004 - Unify videomodes handling with the ct69000 + *            - The video output can be set via the variable "videoout" + *              in the environment. + *              videoout=1 output on LCD + *              videoout=2 output on CRT (default value) + *	                <p.aubert@staubli.com>   */  #include <common.h> @@ -38,7 +44,7 @@  #include <pci.h>  #include <video_fb.h> - +#include "videomodes.h"  /*   * Export Graphic Device   */ @@ -47,571 +53,243 @@ GraphicDevice smi;  /*   * SMI 710/712 have 4MB internal RAM; SMI 810 2MB internal + 2MB external   */ -#define VIDEO_MEM_SIZE  0x400000 - -/* - * Supported video modes for SMI Lynx E/EM/EM+ - */ -#define VIDEO_MODES             7 -#define DUAL_800_600            0   /* SMI710:VGA1:75Hz     (pitch=1600) */ -				    /*        VGA2:60/120Hz (pitch=1600) */ -				    /* SMI810:VGA1:75Hz     (pitch=1600) */ -				    /*        VGA2:75Hz     (pitch=1600) */ -#define DUAL_1024_768           1   /* VGA1:75Hz VGA2:73Hz (pitch=2048)  */ -#define SINGLE_800_600          2   /* VGA1:75Hz (pitch=800)             */ -#define SINGLE_1024_768         3   /* VGA1:75Hz (pitch=1024)            */ -#define SINGLE_1280_1024        4   /* VGA1:75Hz (pitch=1280)            */ -#define TV_MODE_CCIR            5   /* VGA1:50Hz (h=720;v=576;pitch=720) */ -#define TV_MODE_EIA             6   /* VGA1:60Hz (h=720;v=484;pitch=720) */ +#define VIDEO_MEM_SIZE	0x400000  /*   * ISA mapped regs   */ -#define SMI_INDX_C4             (pGD->isaBase + 0x03c4)    /* index reg */ -#define SMI_DATA_C5             (pGD->isaBase + 0x03c5)    /* data reg */ -#define SMI_INDX_D4             (pGD->isaBase + 0x03d4)    /* index reg */ -#define SMI_DATA_D5             (pGD->isaBase + 0x03d5)    /* data reg */ -#define SMI_INDX_CE             (pGD->isaBase + 0x03ce)    /* index reg */ -#define SMI_DATA_CF             (pGD->isaBase + 0x03cf)    /* data reg */ -#define SMI_LOCK_REG            (pGD->isaBase + 0x03c3)    /* unlock/lock ext crt reg */ -#define SMI_MISC_REG            (pGD->isaBase + 0x03c2)    /* misc reg */ -#define SMI_LUT_MASK            (pGD->isaBase + 0x03c6)    /* lut mask reg */ -#define SMI_LUT_START           (pGD->isaBase + 0x03c8)    /* lut start index */ -#define SMI_LUT_RGB             (pGD->isaBase + 0x03c9)    /* lut colors auto incr.*/ - +#define SMI_INDX_C4		(pGD->isaBase + 0x03c4)	   /* index reg */ +#define SMI_DATA_C5		(pGD->isaBase + 0x03c5)	   /* data reg */ +#define SMI_INDX_D4		(pGD->isaBase + 0x03d4)	   /* index reg */ +#define SMI_DATA_D5		(pGD->isaBase + 0x03d5)	   /* data reg */ +#define SMI_ISR1		(pGD->isaBase + 0x03ca) +#define SMI_INDX_CE		(pGD->isaBase + 0x03ce)	   /* index reg */ +#define SMI_DATA_CF		(pGD->isaBase + 0x03cf)	   /* data reg */ +#define SMI_LOCK_REG		(pGD->isaBase + 0x03c3)	   /* unlock/lock ext crt reg */ +#define SMI_MISC_REG		(pGD->isaBase + 0x03c2)	   /* misc reg */ +#define SMI_LUT_MASK		(pGD->isaBase + 0x03c6)	   /* lut mask reg */ +#define SMI_LUT_START		(pGD->isaBase + 0x03c8)	   /* lut start index */ +#define SMI_LUT_RGB		(pGD->isaBase + 0x03c9)	   /* lut colors auto incr.*/ +#define SMI_INDX_ATTR		(pGD->isaBase + 0x03c0)	   /* attributes index reg */  /*   * Video processor control -*/ + */  typedef struct { -    unsigned int   control; -    unsigned int   colorKey; -    unsigned int   colorKeyMask; -    unsigned int   start; -    unsigned short offset; -    unsigned short width; -    unsigned int   fifoPrio; -    unsigned int   fifoERL; -    unsigned int   YUVtoRGB; +	unsigned int   control; +	unsigned int   colorKey; +	unsigned int   colorKeyMask; +	unsigned int   start; +	unsigned short offset; +	unsigned short width; +	unsigned int   fifoPrio; +	unsigned int   fifoERL; +	unsigned int   YUVtoRGB;  } SmiVideoProc;  /*   * Video window control   */  typedef struct { -    unsigned short top; -    unsigned short left; -    unsigned short bottom; -    unsigned short right; -    unsigned int   srcStart; -    unsigned short width; -    unsigned short offset; -    unsigned char  hStretch; -    unsigned char  vStretch; +	unsigned short top; +	unsigned short left; +	unsigned short bottom; +	unsigned short right; +	unsigned int   srcStart; +	unsigned short width; +	unsigned short offset; +	unsigned char  hStretch; +	unsigned char  vStretch;  } SmiVideoWin;  /*   * Capture port control   */  typedef struct { -    unsigned int   control; -    unsigned short topClip; -    unsigned short leftClip; -    unsigned short srcHeight; -    unsigned short srcWidth; -    unsigned int   srcBufStart1; -    unsigned int   srcBufStart2; -    unsigned short srcOffset; -    unsigned short fifoControl; +	unsigned int   control; +	unsigned short topClip; +	unsigned short leftClip; +	unsigned short srcHeight; +	unsigned short srcWidth; +	unsigned int   srcBufStart1; +	unsigned int   srcBufStart2; +	unsigned short srcOffset; +	unsigned short fifoControl;  } SmiCapturePort;  /*   * Register values for common video modes   */ -static char SMI_SCR[22] = { -    /* all modes */ -    0x10, 0xff, 0x11, 0xff, 0x12, 0xff, 0x13, 0xff, 0x14, 0x00, 0x15, 0x90, -    0x16, 0x10, 0x17, 0x2c, 0x18, 0xb1, 0x19, 0x20, 0x1a, 0x01 +static char SMI_SCR[] = { +	/* all modes */ +	0x10, 0xff, 0x11, 0xff, 0x12, 0xff, 0x13, 0xff, 0x15, 0x90, +	0x17, 0x20, 0x18, 0xb1, 0x19, 0x00,  }; - -static char SMI_EXT_CRT[VIDEO_MODES][24] = { -    { /* DUAL_800_600_8 */ -    0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, -    0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 -    }, -    { /* DUAL_1024_768_8 */ -    0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, -    0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 -    }, -    { /* SINGLE_800_600_8 */ -    0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, -    0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 -    }, -    { /* SINGLE_1024_768_8 */ -    0x30, 0x00, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, -    0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x30, 0x09, 0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, -    0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00 -    }, -    { /* TV_MODE_CCIR */ -    0x30, 0x80, 0x31, 0x2b, 0x32, 0x06, 0x33, 0x01, 0x34, 0x26, 0x35, 0x88, -    0x36, 0x02, 0x38, 0x11, 0x39, 0x11, 0x3a, 0x20, 0x3e, 0xa3, 0x3f, 0x00 -    }, -    { /* TV_MODE_EIA */ -    0x30, 0x80, 0x31, 0x2b, 0x32, 0x06, 0x33, 0x00, 0x34, 0xf8, 0x35, 0x88, -    0x36, 0x02, 0x38, 0x11, 0x39, 0x11, 0x3a, 0x20, 0x3e, 0xa3, 0x3f, 0x00 -    }, +static char SMI_EXT_CRT[] = { +	0x31, 0x00, 0x32, 0x00, 0x33, 0x00, 0x34, 0x00, 0x35, 0x00, +	0x36, 0x00, 0x3b, 0x00, 0x3c, 0x00, 0x3d, 0x00, 0x3e, 0x00, 0x3f, 0x00  }; - -static char SMI_CRTCR[VIDEO_MODES][50] = { -    { /* DUAL_800_600_8 */ -    0x00, 0x7f, 0x01, 0x63, 0x02, 0x63, 0x03, 0x00, 0x04, 0x68, 0x05, 0x12, -    0x06, 0x6f, 0x07, 0xf0, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x59, 0x11, 0x2c, -    0x12, 0x57, 0x13, 0x64, 0x14, 0x40, 0x15, 0x57, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* DUAL_1024_768_8 */ -    0x00, 0x9f, 0x01, 0x7f, 0x02, 0x7f, 0x03, 0x00, 0x04, 0x82, 0x05, 0x0e, -    0x06, 0x1e, 0x07, 0xf5, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x01, 0x11, 0x24, -    0x12, 0xff, 0x13, 0x80, 0x14, 0x40, 0x15, 0xff, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* SINGLE_800_600_8 */ -    0x00, 0x7f, 0x01, 0x63, 0x02, 0x63, 0x03, 0x00, 0x04, 0x68, 0x05, 0x12, -    0x06, 0x6f, 0x07, 0xf0, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x59, 0x11, 0x2c, -    0x12, 0x57, 0x13, 0x32, 0x14, 0x40, 0x15, 0x57, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* SINGLE_1024_768_8 */ -    0x00, 0x9f, 0x01, 0x7f, 0x02, 0x7f, 0x03, 0x00, 0x04, 0x82, 0x05, 0x0e, -    0x06, 0x1e, 0x07, 0xf5, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x01, 0x11, 0x24, -    0x12, 0xff, 0x13, 0x40, 0x14, 0x40, 0x15, 0xff, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* SINGLE_1280_1024_8 */ -    0x00, 0xce, 0x01, 0x9f, 0x02, 0x9f, 0x03, 0x00, 0x04, 0xa2, 0x05, 0x12, -    0x06, 0x2a, 0x07, 0x5a, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x01, 0x11, 0x23, -    0x12, 0xff, 0x13, 0x50, 0x14, 0x40, 0x15, 0xff, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* TV_MODE_CCIR */ -    0x00, 0x00, 0x01, 0x59, 0x02, 0x63, 0x03, 0x00, 0x04, 0x69, 0x05, 0x10, -    0x06, 0x72, 0x07, 0xf0, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x58, 0x11, 0x2c, -    0x12, 0x57, 0x13, 0x2d, 0x14, 0x40, 0x15, 0x57, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -    { /* TV_MODE_EIA */ -    0x00, 0x00, 0x01, 0x59, 0x02, 0x63, 0x03, 0x00, 0x04, 0x69, 0x05, 0x10, -    0x06, 0x72, 0x07, 0xf0, 0x08, 0x00, 0x09, 0x60, 0x0a, 0x00, 0x0b, 0x00, -    0x0c, 0x00, 0x0d, 0x00, 0x0e, 0x00, 0x0f, 0x00, 0x10, 0x58, 0x11, 0x2c, -    0x12, 0x57, 0x13, 0x2d, 0x14, 0x40, 0x15, 0x57, 0x16, 0x00, 0x17, 0xe3, -    0x18, 0xff -    }, -}; - -static char SMI_SEQR[10] = { -    0x00, 0x03, 0x01, 0x01, 0x02, 0x0f, 0x03, 0x03, 0x04, 0x0e +static char SMI_ATTR [] = { +	0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, +	0x06, 0x06, 0x07, 0x07, 0x08, 0x08, 0x09, 0x09, 0x0a, 0x0a, 0x0b, 0x0b, +	0x0c, 0x0c, 0x0d, 0x0d, 0x0e, 0x0e, 0x0f, 0x0f, 0x10, 0x41, 0x11, 0x00, +	0x12, 0x0f, 0x13, 0x00, 0x14, 0x00,  }; - -static char SMI_PCR[VIDEO_MODES][8] = { -    { /* DUAL_800_600_8 */ -    0x20, 0x04, 0x21, 0x20, 0x22, 0x00, 0x23, 0x00 -    }, -    { /* DUAL_1024_768_8 */ -    0x20, 0x04, 0x21, 0x20, 0x22, 0x00, 0x23, 0x00 -    }, -    { /* SINGLE_800_600_8 */ -    0x20, 0x04, 0x21, 0x30, 0x22, 0x02, 0x23, 0x00 -    }, -    { /* SINGLE_1024_768_8 */ -    0x20, 0x04, 0x21, 0x30, 0x22, 0x02, 0x23, 0x00 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x20, 0x04, 0x21, 0x30, 0x22, 0x02, 0x23, 0x00 -    }, -    { /* TV_MODE_CCIR */ -    0x20, 0x04, 0x21, 0x30, 0x22, 0x02, 0x23, 0x00 -    }, -    { /* TV_MODE_EIA */ -    0x20, 0x04, 0x21, 0x30, 0x22, 0x02, 0x23, 0x00 -    }, +static char SMI_GCR[18] = { +	0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x40, +	0x06, 0x05, 0x07, 0x0f, 0x08, 0xff  }; - -static char SMI_MCR[VIDEO_MODES][6] = { -    { /* DUAL_800_600_8 */ -    0x60, 0x01, 0x61, 0x00, 0x62, 0x7a -    }, -    { /* DUAL_1024_768_8 */ -    0x60, 0x01, 0x61, 0x00, 0x62, 0x7a -    }, -    { /* SINGLE_800_600_8 */ -    0x60, 0x00, 0x61, 0x00, 0x62, 0x34 -    }, -    { /* SINGLE_1024_768_8 */ -    0x60, 0x00, 0x61, 0x00, 0x62, 0xfe -    }, -    { /* SINGLE_1280_1024_8 */ -    0x60, 0x00, 0x61, 0x00, 0x62, 0xfe -    }, -    { /* TV_MODE_CCIR */ -    0x60, 0x00, 0x61, 0x00, 0x62, 0x34 -    }, -    { /* TV_MODE_EIA */ -    0x60, 0x00, 0x61, 0x00, 0x62, 0x34 -    }, +static char SMI_SEQR[] = { +	0x00, 0x00, 0x01, 0x01, 0x02, 0x0f, 0x03, 0x03, 0x04, 0x0e, 0x00, 0x03  }; - -static char SMI_CCR[VIDEO_MODES][18] = { -    { /* DUAL_800_600_8 */ -    0x65, 0x34, 0x68, 0x50, 0x69, 0x05, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x15, -    0x6d, 0x06, 0x6e, 0x3d, 0x6f, 0x12 -    }, -    { /* DUAL_1024_768_8 */ -    0x65, 0x00, 0x68, 0x50, 0x69, 0x06, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x0b, -    0x6d, 0x02, 0x6e, 0x0b, 0x6f, 0x02 -    }, -    { /* SINGLE_800_600_8 */ -    0x65, 0x34, 0x68, 0x40, 0x69, 0x03, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x15, -    0x6d, 0x06, 0x6e, 0x3d, 0x6f, 0x12 -    }, -    { /* SINGLE_1024_768_8 */ -    0x65, 0x00, 0x68, 0x50, 0x69, 0x03, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x0b, -    0x6d, 0x02, 0x6e, 0x0b, 0x6f, 0x02 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x65, 0x00, 0x68, 0x50, 0x69, 0x03, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0xd9, -    0x6d, 0x17, 0x6e, 0xd9, 0x6f, 0x17 -    }, -    { /* TV_MODE_CCIR */ -    0x65, 0x07, 0x68, 0xc0, 0x69, 0x81, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x15, -    0x6d, 0x06, 0x6e, 0x3d, 0x6f, 0x12 -    }, -    { /* TV_MODE_EIA */ -    0x65, 0x07, 0x68, 0xc0, 0x69, 0x81, 0x6a, 0x53, 0x6b, 0x15, 0x6c, 0x15, -    0x6d, 0x06, 0x6e, 0x3d, 0x6f, 0x12 -    }, +static char SMI_PCR [] = { +	0x20, 0x04, 0x21, 0x30, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00  }; - -static char SMI_SHVGA[VIDEO_MODES][24] = { -    { /* DUAL_800_600_8 */ -    0x40, 0x7f, 0x41, 0x63, 0x42, 0x00, 0x43, 0x68, 0x44, 0x12, 0x45, 0x6f, -    0x46, 0x57, 0x47, 0x00, 0x48, 0x59, 0x49, 0x0c, 0x4a, 0xa0, 0x4b, 0x20, -    }, -    { /* DUAL_1024_768_8 */ -    0x40, 0x9f, 0x41, 0x7f, 0x42, 0x00, 0x43, 0x82, 0x44, 0x0e, 0x45, 0x1e, -    0x46, 0xff, 0x47, 0x00, 0x48, 0x00, 0x49, 0x03, 0x4a, 0xe5, 0x4b, 0x20, -    }, -    { /* SINGLE_800_600_8 */ -    0x40, 0x7f, 0x41, 0x63, 0x42, 0x00, 0x43, 0x68, 0x44, 0x12, 0x45, 0x6f, -    0x46, 0x57, 0x47, 0x00, 0x48, 0x59, 0x49, 0x0c, 0x4a, 0xa0, 0x4b, 0x20, -    }, -    { /* SINGLE_1024_768_8 */ -    0x40, 0x9f, 0x41, 0x7f, 0x42, 0x00, 0x43, 0x82, 0x44, 0x0e, 0x45, 0x1e, -    0x46, 0xff, 0x47, 0x00, 0x48, 0x01, 0x49, 0x04, 0x4a, 0xa5, 0x4b, 0x20, -    }, -    { /* SINGLE_1280_1024_8 */ -    0x40, 0xce, 0x41, 0x9f, 0x42, 0x00, 0x43, 0xa2, 0x44, 0x12, 0x45, 0x2a, -    0x46, 0xff, 0x47, 0x00, 0x48, 0x01, 0x49, 0x03, 0x4a, 0x4a, 0x4b, 0x20, -    }, -    { /* TV_MODE_CCIR */ -    0x40, 0x6d, 0x41, 0x59, 0x42, 0x00, 0x43, 0x60, 0x44, 0x09, 0x45, 0x38, -    0x46, 0x25, 0x47, 0x05, 0x48, 0x2a, 0x49, 0x00, 0x4a, 0x4d, 0x4b, 0x00, -    }, -    { /* TV_MODE_EIA */ -    0x40, 0x6d, 0x41, 0x59, 0x42, 0x00, 0x43, 0x60, 0x44, 0x09, 0x45, 0x06, -    0x46, 0xf7, 0x47, 0x05, 0x48, 0xfa, 0x49, 0x00, 0x4a, 0x41, 0x4b, 0x00, -    }, +static char SMI_MCR[] = { +	0x60, 0x01, 0x61, 0x00,   }; - -static char SMI_GPR[VIDEO_MODES][12] = { -    { /* DUAL_800_600_8 */ -    0x70, 0x00, 0x71, 0xa2, 0x72, 0x0f, 0x73, 0x30, 0x74, 0x40, 0x75, 0x00 -    }, -    { /* DUAL_1024_768_8 */ -    0x70, 0x00, 0x71, 0xa2, 0x72, 0x0f, 0x73, 0x30, 0x74, 0x40, 0x75, 0x00 -    }, -    { /* SINGLE_800_600_8 */ -    0x70, 0x00, 0x71, 0xa2, 0x72, 0x0f, 0x73, 0x30, 0x74, 0x40, 0x75, 0x00 -    }, -    { /* SINGLE_1024_768_8 */ -    0x70, 0x00, 0x71, 0xa2, 0x72, 0x0f, 0x73, 0x30, 0x74, 0x40, 0x75, 0x00 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x70, 0x00, 0x71, 0xa2, 0x72, 0x0f, 0x73, 0x30, 0x74, 0x40, 0x75, 0x00 -    }, -    { /* TV_MODE_CCIR */ -    0x70, 0x82, 0x71, 0x8d, 0x72, 0x0c, 0x73, 0x32, 0x74, 0x09, 0x75, 0x28 -    }, -    { /* TV_MODE_EIA */ -    0x70, 0x82, 0x71, 0x8d, 0x72, 0x0c, 0x73, 0x32, 0x74, 0x09, 0x75, 0x28 -    }, -}; - -static char SMI_HCR[VIDEO_MODES][22] = { -    { /* DUAL_800_600_8 */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* DUAL_1024_768_8 */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* SINGLE_800_600_8 */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* SINGLE_1024_768_8 */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* TV_MODE_CCIR */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, -    { /* TV_MODE_EIA */ -    0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, -    0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00 -    }, +static char SMI_HCR[] = { +	0x80, 0xff, 0x81, 0x07, 0x82, 0x00, 0x83, 0xff, 0x84, 0xff, 0x88, 0x00, +	0x89, 0x02, 0x8a, 0x80, 0x8b, 0x01, 0x8c, 0xff, 0x8d, 0x00  }; -static char SMI_FPR[VIDEO_MODES][88] = { -    { /* DUAL_800_600_8 */ -    0x30, 0x36, 0x31, 0x83, 0x32, 0x38, 0x33, 0x00, 0x34, 0x40, 0x3e, 0x03, -    0x3f, 0xff, 0x40, 0x64, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0xc8, -    0x45, 0x02, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x41, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x04, 0x51, 0x48, 0x52, 0x83, 0x53, 0x63, 0x54, 0x67, 0x55, 0x71, -    0x56, 0x57, 0x57, 0x59, 0x58, 0x03, 0x59, 0x00, 0x5a, 0x4a, -    0xa1, 0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xa9, 0x00, -    0xaa, 0xdf, 0xab, 0x7f, 0xac, 0x00, 0xad, 0x41, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x44 -    }, -    { /* DUAL_1024_768_8 */ -    0x30, 0x3a, 0x31, 0x83, 0x32, 0x38, 0x33, 0x00, 0x34, 0x40, 0x3e, 0x00, -    0x3f, 0x00, 0x40, 0x80, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, -    0x45, 0x42, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x41, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x06, 0x51, 0x68, 0x52, 0xa7, 0x53, 0x7f, 0x54, 0x83, 0x55, 0x25, -    0x56, 0xff, 0x57, 0x03, 0x58, 0x04, 0x59, 0x00, 0x5a, 0xc2, -    0xa1, 0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xa9, 0x00, -    0xaa, 0xdf, 0xab, 0x7f, 0xac, 0x00, 0xad, 0x41, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x44 -    }, -    { /* SINGLE_800_600_8 */ -    0x30, 0x36, 0x31, 0x82, 0x32, 0x38, 0x33, 0x00, 0x34, 0x40, 0x3e, 0x03, -    0x3f, 0xff, 0x40, 0x64, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0xc8, -    0x45, 0x02, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x00, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x04, 0x51, 0x48, 0x52, 0x83, 0x53, 0x63, 0x54, 0x67, 0x55, 0x71, -    0x56, 0x57, 0x57, 0x59, 0x58, 0x03, 0x59, 0x00, 0x5a, 0x4a, -    0xa1, 0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xa9, 0x00, -    0xaa, 0xdf, 0xab, 0x7f, 0xac, 0x00, 0xad, 0x41, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x44 -    }, -    { /* SINGLE_1024_768_8 */ -    0x30, 0x3a, 0x31, 0x82, 0x32, 0x38, 0x33, 0x00, 0x34, 0x40, 0x3e, 0x00, -    0x3f, 0x00, 0x40, 0x80, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, -    0x45, 0x42, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x11, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x06, 0x51, 0x68, 0x52, 0xa7, 0x53, 0x7f, 0x54, 0x83, 0x55, 0x24, -    0x56, 0xff, 0x57, 0x03, 0x58, 0x04, 0x59, 0x00, 0x5a, 0xc2, -    0xa1, 0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xa9, 0x00, -    0xaa, 0xdf, 0xab, 0x7f, 0xac, 0x00, 0xad, 0x41, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x44 -    }, -    { /* SINGLE_1280_1024_8 */ -    0x30, 0x3e, 0x31, 0x82, 0x32, 0x38, 0x33, 0x00, 0x34, 0x40, 0x3e, 0x00, -    0x3f, 0x00, 0x40, 0xa0, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0x00, -    0x45, 0x42, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x11, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x08, 0x51, 0x88, 0x52, 0xd3, 0x53, 0x9f, 0x54, 0xa3, 0x55, 0x2a, -    0x56, 0xff, 0x57, 0x04, 0x58, 0x00, 0x59, 0x00, 0x5a, 0x63, -    0xa1, 0x00, 0xa2, 0x00, 0xa3, 0x00, 0xa4, 0x00, 0xa8, 0x00, 0xa9, 0x00, -    0xaa, 0xdf, 0xab, 0x7f, 0xac, 0x00, 0xad, 0x41, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x44 -    }, -    { /* TV_MODE_CCIR */ -    0x30, 0x24, 0x31, 0x84, 0x32, 0x20, 0x33, 0x09, 0x34, 0xf0, 0x3e, 0x03, -    0x3f, 0xff, 0x40, 0x64, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0xc8, -    0x45, 0x02, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x00, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x04, 0x51, 0x48, 0x52, 0x83, 0x53, 0x63, 0x54, 0x68, 0x55, 0x73, -    0x56, 0x57, 0x57, 0x58, 0x58, 0x04, 0x59, 0x57, 0x5a, 0x7b, -    0xa1, 0x10, 0xa2, 0xab, 0xa3, 0x98, 0xa4, 0xc1, 0xa8, 0x8c, 0xa9, 0x05, -    0xaa, 0x17, 0xab, 0x35, 0xac, 0x41, 0xad, 0x68, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x00 -    }, -    { /* TV_MODE_EIA */ -    0x30, 0x24, 0x31, 0x84, 0x32, 0x20, 0x33, 0x09, 0x34, 0xf0, 0x3e, 0x03, -    0x3f, 0xff, 0x40, 0x64, 0x41, 0x00, 0x42, 0x00, 0x43, 0x00, 0x44, 0xc8, -    0x45, 0x02, 0x46, 0x00, 0x47, 0xfc, 0x48, 0x20, 0x49, 0x1c, 0x4a, 0x00, -    0x4b, 0xa0, 0x4c, 0x00, -    0x50, 0x04, 0x51, 0x48, 0x52, 0x83, 0x53, 0x63, 0x54, 0x68, 0x55, 0x73, -    0x56, 0x57, 0x57, 0x58, 0x58, 0x04, 0x59, 0x57, 0x5a, 0x7b, -    0xa1, 0x10, 0xa2, 0xab, 0xa3, 0x98, 0xa4, 0xc1, 0xa8, 0x8c, 0xa9, 0x05, -    0xaa, 0x17, 0xab, 0x35, 0xac, 0x41, 0xad, 0x68, 0xae, 0x00, 0xaf, 0x00, -    0xa0, 0x00 -    }, -}; - -static char SMI_GCR[18] = { -    0x00, 0x00, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x40, -    0x06, 0x05, 0x07, 0x0f, 0x08, 0xff -};  /******************************************************************************* -* -* Read SMI ISA register -*/ -static char smiRead (unsigned short index, char reg) -{ -    register GraphicDevice *pGD = (GraphicDevice *)&smi; - -    out8 ((pGD->isaBase + index), reg); -    return (in8 (pGD->isaBase + index + 1)); -} - -/******************************************************************************* -* -* Write SMI ISA register -*/ + * + * Write SMI ISA register + */  static void smiWrite (unsigned short index, char reg, char val)  { -    register GraphicDevice *pGD = (GraphicDevice *)&smi; +	register GraphicDevice *pGD = (GraphicDevice *)&smi; -    out8 ((pGD->isaBase + index), reg); -    out8 ((pGD->isaBase + index + 1), val); +	out8 ((pGD->isaBase + index), reg); +	out8 ((pGD->isaBase + index + 1), val);  }  /******************************************************************************* -* -* Write a table of SMI ISA register -*/ + * + * Write a table of SMI ISA register + */  static void smiLoadRegs ( -    unsigned int iReg, -    unsigned int dReg, -    char         *regTab, -    unsigned int tabSize -    ) +	unsigned int iReg, +	unsigned int dReg, +	char	     *regTab, +	unsigned int tabSize +	)  { -    register int i; +	register GraphicDevice *pGD  = (GraphicDevice *)&smi; +	register int i; -    for (i=0; i<tabSize; i+=2) -    { -	out8 (iReg, regTab[i]); -	out8 (dReg, regTab[i+1]); -    } +	for (i=0; i<tabSize; i+=2) { +		if (iReg == SMI_INDX_ATTR) { +			/* Reset the Flip Flop */ +			in8 (SMI_ISR1); +			out8 (iReg, regTab[i]); +			out8 (iReg, regTab[i+1]); +		} else { +			out8 (iReg, regTab[i]); +			out8 (dReg, regTab[i+1]); +		} +	}  }  /******************************************************************************* -* -* Init capture port registers -*/ + * + * Init capture port registers + */  static void smiInitCapturePort (void)  { -    SmiCapturePort smiCP = { 0x01400600, 0x30, 0x40, 480, 640, 0, 0, 2560, 6 }; -    register GraphicDevice *pGD  = (GraphicDevice *)&smi; -    register SmiCapturePort *pCP = (SmiCapturePort *)&smiCP; +	SmiCapturePort smiCP = { 0x01400600, 0x30, 0x40, 480, 640, 0, 0, 2560, 6 }; +	register GraphicDevice *pGD  = (GraphicDevice *)&smi; +	register SmiCapturePort *pCP = (SmiCapturePort *)&smiCP; -    out32r ((pGD->cprBase + 0x0004), ((pCP->topClip<<16)   | pCP->leftClip)); -    out32r ((pGD->cprBase + 0x0008), ((pCP->srcHeight<<16) | pCP->srcWidth)); -    out32r ((pGD->cprBase + 0x000c), pCP->srcBufStart1/8); -    out32r ((pGD->cprBase + 0x0010), pCP->srcBufStart2/8); -    out32r ((pGD->cprBase + 0x0014), pCP->srcOffset/8); -    out32r ((pGD->cprBase + 0x0018), pCP->fifoControl); -    out32r ((pGD->cprBase + 0x0000), pCP->control); +	out32r ((pGD->cprBase + 0x0004), ((pCP->topClip<<16)   | pCP->leftClip)); +	out32r ((pGD->cprBase + 0x0008), ((pCP->srcHeight<<16) | pCP->srcWidth)); +	out32r ((pGD->cprBase + 0x000c), pCP->srcBufStart1/8); +	out32r ((pGD->cprBase + 0x0010), pCP->srcBufStart2/8); +	out32r ((pGD->cprBase + 0x0014), pCP->srcOffset/8); +	out32r ((pGD->cprBase + 0x0018), pCP->fifoControl); +	out32r ((pGD->cprBase + 0x0000), pCP->control);  }  /******************************************************************************* -* -* Init video processor registers -*/ + * + * Init video processor registers + */  static void smiInitVideoProcessor (void)  { -    SmiVideoProc smiVP = { 0x100000, 0, 0, 0, 0, 1600, 0x1200543, 4, 0xededed }; -    SmiVideoWin  smiVW = { 0, 0, 599, 799, 0, 1600, 0, 0, 0 }; -    register GraphicDevice *pGD = (GraphicDevice *)&smi; -    register SmiVideoProc  *pVP = (SmiVideoProc *)&smiVP; -    register SmiVideoWin *pVWin = (SmiVideoWin *)&smiVW; +	SmiVideoProc smiVP = { 0x100000, 0, 0, 0, 0, 1600, 0x1200543, 4, 0xededed }; +	SmiVideoWin  smiVW = { 0, 0, 599, 799, 0, 1600, 0, 0, 0 }; +	register GraphicDevice *pGD = (GraphicDevice *)&smi; +	register SmiVideoProc  *pVP = (SmiVideoProc *)&smiVP; +	register SmiVideoWin *pVWin = (SmiVideoWin *)&smiVW; -    pVP->width    = pGD->plnSizeX * pGD->gdfBytesPP; -    pVP->control |= pGD->gdfIndex << 16; -    pVWin->bottom = pGD->winSizeY - 1; -    pVWin->right  = pGD->winSizeX - 1; -    pVWin->width  = pVP->width; +	pVP->width    = pGD->plnSizeX * pGD->gdfBytesPP; +	pVP->control |= pGD->gdfIndex << 16; +	pVWin->bottom = pGD->winSizeY - 1; +	pVWin->right  = pGD->winSizeX - 1; +	pVWin->width  = pVP->width; -    /* color key */ -    out32r ((pGD->vprBase + 0x0004), pVP->colorKey); +	/* color key */ +	out32r ((pGD->vprBase + 0x0004), pVP->colorKey); -     /* color key mask */ -    out32r ((pGD->vprBase + 0x0008), pVP->colorKeyMask); +	/* color key mask */ +	out32r ((pGD->vprBase + 0x0008), pVP->colorKeyMask); -    /* data src start adrs */ -    out32r ((pGD->vprBase + 0x000c), pVP->start / 8); +	/* data src start adrs */ +	out32r ((pGD->vprBase + 0x000c), pVP->start / 8); -    /* data width and offset */ -    out32r ((pGD->vprBase + 0x0010), -	((pVP->offset   / 8 * pGD->gdfBytesPP) << 16) | -	 (pGD->plnSizeX / 8 * pGD->gdfBytesPP)); +	/* data width and offset */ +	out32r ((pGD->vprBase + 0x0010), +		((pVP->offset	/ 8 * pGD->gdfBytesPP) << 16) | +		(pGD->plnSizeX / 8 * pGD->gdfBytesPP)); -    /* video window 1 */ -    out32r ((pGD->vprBase + 0x0014), -	((pVWin->top << 16) | pVWin->left)); +	/* video window 1 */ +	out32r ((pGD->vprBase + 0x0014), +		((pVWin->top << 16) | pVWin->left)); -    out32r ((pGD->vprBase + 0x0018), -	((pVWin->bottom << 16) | pVWin->right)); +	out32r ((pGD->vprBase + 0x0018), +		((pVWin->bottom << 16) | pVWin->right)); -    out32r ((pGD->vprBase + 0x001c), pVWin->srcStart / 8); +	out32r ((pGD->vprBase + 0x001c), pVWin->srcStart / 8); -    out32r ((pGD->vprBase + 0x0020), -	(((pVWin->offset / 8) << 16) | (pVWin->width / 8))); +	out32r ((pGD->vprBase + 0x0020), +		(((pVWin->offset / 8) << 16) | (pVWin->width / 8))); -    out32r ((pGD->vprBase + 0x0024), -	(((pVWin->hStretch) << 8) | pVWin->vStretch)); +	out32r ((pGD->vprBase + 0x0024), +		(((pVWin->hStretch) << 8) | pVWin->vStretch)); -    /* video window 2 */ -    out32r ((pGD->vprBase + 0x0028), -	((pVWin->top << 16) | pVWin->left)); +	/* video window 2 */ +	out32r ((pGD->vprBase + 0x0028), +		((pVWin->top << 16) | pVWin->left)); -    out32r ((pGD->vprBase + 0x002c), -	((pVWin->bottom << 16) | pVWin->right)); +	out32r ((pGD->vprBase + 0x002c), +		((pVWin->bottom << 16) | pVWin->right)); -    out32r ((pGD->vprBase + 0x0030), -	pVWin->srcStart / 8); +	out32r ((pGD->vprBase + 0x0030), +		pVWin->srcStart / 8); -    out32r ((pGD->vprBase + 0x0034), -	(((pVWin->offset / 8) << 16) | (pVWin->width / 8))); +	out32r ((pGD->vprBase + 0x0034), +		(((pVWin->offset / 8) << 16) | (pVWin->width / 8))); -    out32r ((pGD->vprBase + 0x0038), -	(((pVWin->hStretch) << 8) | pVWin->vStretch)); +	out32r ((pGD->vprBase + 0x0038), +		(((pVWin->hStretch) << 8) | pVWin->vStretch)); -    /* fifo prio control */ -    out32r ((pGD->vprBase + 0x0054), pVP->fifoPrio); +	/* fifo prio control */ +	out32r ((pGD->vprBase + 0x0054), pVP->fifoPrio); -    /* fifo empty request levell */ -    out32r ((pGD->vprBase + 0x0058), pVP->fifoERL); +	/* fifo empty request levell */ +	out32r ((pGD->vprBase + 0x0058), pVP->fifoERL); -    /* conversion constant */ -    out32r ((pGD->vprBase + 0x005c), pVP->YUVtoRGB); +	/* conversion constant */ +	out32r ((pGD->vprBase + 0x005c), pVP->YUVtoRGB); -    /* vpr control word */ -    out32r ((pGD->vprBase + 0x0000), pVP->control); +	/* vpr control word */ +	out32r ((pGD->vprBase + 0x0000), pVP->control);  }  /****************************************************************************** @@ -620,439 +298,557 @@ static void smiInitVideoProcessor (void)   */  static void smiInitDrawingEngine (void)  { -    GraphicDevice *pGD = (GraphicDevice *)&smi; -    unsigned int val; +	GraphicDevice *pGD = (GraphicDevice *)&smi; +	unsigned int val; -    /* don't start now */ -    out32r ((pGD->dprBase + 0x000c), 0x000f0000); +	/* don't start now */ +	out32r ((pGD->dprBase + 0x000c), 0x000f0000); -    /* set rop2 to copypen */ -    val = 0xffff3ff0 & in32r ((pGD->dprBase + 0x000c)); -    out32r ((pGD->dprBase + 0x000c), (val | 0x8000 | 0x0c)); +	/* set rop2 to copypen */ +	val = 0xffff3ff0 & in32r ((pGD->dprBase + 0x000c)); +	out32r ((pGD->dprBase + 0x000c), (val | 0x8000 | 0x0c)); -    /* set clip rect */ -    out32r ((pGD->dprBase + 0x002c), 0); -    out32r ((pGD->dprBase + 0x0030), -	((pGD->winSizeY<<16) | pGD->winSizeX * pGD->gdfBytesPP )); +	/* set clip rect */ +	out32r ((pGD->dprBase + 0x002c), 0); +	out32r ((pGD->dprBase + 0x0030), +		((pGD->winSizeY<<16) | pGD->winSizeX * pGD->gdfBytesPP )); -    /* src row pitch */ -    val = 0xffff0000 & (in32r ((pGD->dprBase + 0x0010))); -    out32r ((pGD->dprBase + 0x0010), -	(val | pGD->plnSizeX * pGD->gdfBytesPP)); +	/* src row pitch */ +	val = 0xffff0000 & (in32r ((pGD->dprBase + 0x0010))); +	out32r ((pGD->dprBase + 0x0010), +		(val | pGD->plnSizeX * pGD->gdfBytesPP)); -    /* dst row pitch */ -    val = 0x0000ffff & (in32r ((pGD->dprBase + 0x0010))); -    out32r ((pGD->dprBase + 0x0010), -	(((pGD->plnSizeX * pGD->gdfBytesPP)<<16) | val)); +	/* dst row pitch */ +	val = 0x0000ffff & (in32r ((pGD->dprBase + 0x0010))); +	out32r ((pGD->dprBase + 0x0010), +		(((pGD->plnSizeX * pGD->gdfBytesPP)<<16) | val)); -    /* window width src/dst */ -    out32r ((pGD->dprBase + 0x003c), -	(((pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff)<<16) | -	  (pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff))); -    out16r ((pGD->dprBase + 0x001e), 0x0000); +	/* window width src/dst */ +	out32r ((pGD->dprBase + 0x003c), +		(((pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff)<<16) | +		 (pGD->plnSizeX * pGD->gdfBytesPP & 0x0fff))); +	out16r ((pGD->dprBase + 0x001e), 0x0000); -    /* src base adrs */ -    out32r ((pGD->dprBase + 0x0040), -	(((pGD->frameAdrs/8) & 0x000fffff))); +	/* src base adrs */ +	out32r ((pGD->dprBase + 0x0040), +		(((pGD->frameAdrs/8) & 0x000fffff))); -    /* dst base adrs */ -    out32r ((pGD->dprBase + 0x0044), -	(((pGD->frameAdrs/8) & 0x000fffff))); +	/* dst base adrs */ +	out32r ((pGD->dprBase + 0x0044), +		(((pGD->frameAdrs/8) & 0x000fffff))); -    /* foreground color */ -    out32r ((pGD->dprBase + 0x0014), pGD->fg); +	/* foreground color */ +	out32r ((pGD->dprBase + 0x0014), pGD->fg); -    /* background color */ -    out32r ((pGD->dprBase + 0x0018), pGD->bg); +	/* background color */ +	out32r ((pGD->dprBase + 0x0018), pGD->bg); -    /* xcolor */ -    out32r ((pGD->dprBase + 0x0020), 0x00ffffff); +	/* xcolor */ +	out32r ((pGD->dprBase + 0x0020), 0x00ffffff); -    /* xcolor mask */ -    out32r ((pGD->dprBase + 0x0024), 0x00ffffff); +	/* xcolor mask */ +	out32r ((pGD->dprBase + 0x0024), 0x00ffffff); -    /* bit mask */ -    out32r ((pGD->dprBase + 0x0028), 0x00ffffff); +	/* bit mask */ +	out32r ((pGD->dprBase + 0x0028), 0x00ffffff); -    /* load mono pattern */ -    out32r ((pGD->dprBase + 0x0034), 0); -    out32r ((pGD->dprBase + 0x0038), 0); +	/* load mono pattern */ +	out32r ((pGD->dprBase + 0x0034), 0); +	out32r ((pGD->dprBase + 0x0038), 0);  }  static struct pci_device_id supported[] = { -    { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_710 }, -    { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_712 }, -    { PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_810 }, -    { } +	{ PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_710 }, +	{ PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_712 }, +	{ PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_810 }, +	{ }  }; +/*****************************************************************************/ +static void smiLoadMsr (struct ctfb_res_modes *mode) +{ +	unsigned char h_synch_high, v_synch_high; +	register GraphicDevice *pGD  = (GraphicDevice *)&smi; -/******************************************************************************* -* -* Init video chip with common Linux graphic modes (lilo) -*/ -void *video_hw_init (void) +	h_synch_high = (mode->sync & FB_SYNC_HOR_HIGH_ACT) ? 0 : 0x40;	/* horizontal Synch High active */ +	v_synch_high = (mode->sync & FB_SYNC_VERT_HIGH_ACT) ? 0 : 0x80;	/* vertical Synch High active */ +	out8 (SMI_MISC_REG, (h_synch_high | v_synch_high | 0x29)); +	/* upper64K==0x20, CLC2select==0x08, RAMenable==0x02!(todo), CGA==0x01 +	 * Selects the upper 64KB page.Bit5=1 +	 * CLK2 (left reserved in standard VGA) Bit3|2=1|0 +	 * Disables CPU access to frame buffer. Bit1=0 +	 * Sets the I/O address decode for ST01, FCR, and all CR registers +	 * to the 3Dx I/O address range (CGA emulation). Bit0=1 +	 */ +} +/*****************************************************************************/ +static void smiLoadCrt (struct ctfb_res_modes *var, int bits_per_pixel)  { -    GraphicDevice *pGD = (GraphicDevice *)&smi; -    unsigned short device_id; -    pci_dev_t devbusfn; -    int videomode; -    unsigned int pci_mem_base, *vm, i; -    unsigned int gdfTab[] = { 1, 2, 2, 4, 3, 1 }; -    char *penv; -    char *gdfModes[] = -	    { -	    "8 Bit Index Color", -	    "15 Bit 5-5-5 RGB", -	    "16 Bit 5-6-5 RGB", -	    "32 Bit X-8-8-8 RGB", -	    "24 Bit 8-8-8 RGB", -	    "8 Bit 3-3-2 RGB" -	    }; -    int vgaModes[16][2] = -	    { -	    {769, -1}, {771, 0x00002}, {773, 0x00003}, {775, 0x00004}, -	    {784, -1}, {787, 0x10002}, {790, 0x10003}, {793, 0x10004}, -	    {785, -1}, {788, 0x20002}, {791, 0x20003}, {794, 0x20004}, -	    {786, -1}, {789, 0x40002}, {792, 0x40003}, {795, 0x40004} -	    }; +	unsigned char cr[0x7a]; +	int i; +	unsigned int hd, hs, he, ht, hbs, hbe;	/* Horizontal.	*/ +	unsigned int vd, vs, ve, vt, vbs, vbe;	/* vertical */ +	unsigned int bpp, wd, dblscan, interlaced; -    /* Search for video chip */ -    printf("Video: "); +	const int LineCompare = 0x3ff; +	unsigned int TextScanLines = 1;	/* this is in fact a vertical zoom factor   */ +	register GraphicDevice *pGD  = (GraphicDevice *)&smi; -    if ((devbusfn = pci_find_devices(supported, 0)) < 0) -    { -	printf ("Controller not found !\n"); -	return (NULL); -    } +	/* Horizontal */ +	hd = (var->xres) / 8;	/* HDisp.  */ +	hs = (var->xres + var->right_margin) / 8;	/* HsStrt  */ +	he = (var->xres + var->right_margin + var->hsync_len) / 8;	/* HsEnd   */ +	ht = (var->left_margin + var->xres + var->right_margin + var->hsync_len) / 8;	/* HTotal  */ +	/* Blank */ +	hbs = hd;  +	hbe = 0; /* Blank end at 0 */ -    /* PCI setup */ -    pci_write_config_dword (devbusfn, PCI_COMMAND, (PCI_COMMAND_MEMORY | PCI_COMMAND_IO)); -    pci_read_config_word (devbusfn, PCI_DEVICE_ID, &device_id); -    pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pci_mem_base); -    pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base); +	/* Vertical */ +	vd = var->yres;		/* VDisplay   */ +	vs = var->yres + var->lower_margin;	/* VSyncStart */ +	ve = var->yres + var->lower_margin + var->vsync_len;	/* VSyncEnd */ +	vt = var->upper_margin + var->yres + var->lower_margin + var->vsync_len;	/* VTotal  */ +	vbs = vd; +	vbe = 0; +     +	bpp = bits_per_pixel; +	dblscan = (var->vmode & FB_VMODE_DOUBLE) ? 1 : 0; +	interlaced = var->vmode & FB_VMODE_INTERLACED; -    /* Initialize the video controller */ -    if ((penv = getenv ("videomode")) != NULL) -	videomode = (int)simple_strtoul (penv, NULL, 16); -    else -	videomode = 0x303;                    /* Default 800x600 8 bit index color */ -    /* Compare with common vga mode numbers */ -    for (i=0; i<16; i++) -    { -	if (vgaModes[i][0] == videomode) -	{ -	    if (vgaModes[i][1] == -1) -	    { -		printf("Videomode not supported !\n"); -		return (NULL);                /* mode not supported */ -	    } -	    pGD->mode = vgaModes[i][1];        /* use driver int. mode number */ -	    break; +	if (bpp == 15) +		bpp = 16; +	wd = var->xres * bpp / 64;	/* double words per line */ +	if (interlaced) {	/* we divide all vertical timings, exept vd */ +		vs >>= 1; +		vbs >>= 1; +		ve >>= 1; +		vt >>= 1;  	} -    } -    /* Extract graphic data format */ -    pGD->gdfIndex = (pGD->mode & 0x00070000) >> 16; -    if (pGD->gdfIndex > 5) -	pGD->gdfIndex = 0; -    pGD->gdfBytesPP = gdfTab[pGD->gdfIndex]; +	memset (cr, 0, sizeof (cr)); +	cr[0x00] = ht - 5; +	cr[0x01] = hd - 1; +	cr[0x02] = hbs - 1; +	cr[0x03] = (hbe & 0x1F); +	cr[0x04] = hs; +	cr[0x05] = ((hbe & 0x20) << 2) | (he & 0x1f); +     +	cr[0x06] = (vt - 2) & 0xFF; +	cr[0x07] = (((vt - 2) & 0x100) >> 8) +		| (((vd - 1) & 0x100) >> 7) +		| ((vs & 0x100) >> 6) +		| (((vbs - 1) & 0x100) >> 5) +		| ((LineCompare & 0x100) >> 4) +		| (((vt - 2) & 0x200) >> 4) +		| (((vd - 1) & 0x200) >> 3) +		| ((vs & 0x200) >> 2); -    /* Extract graphic resolution */ -    pGD->mode &= 0xf; +	cr[0x30] = ((vt - 2) & 0x400) >> 7 +		| (((vd - 1) & 0x400) >> 8) +		| (((vbs - 1) & 0x400) >> 9) +		| ((vs & 0x400) >> 10) +		| (interlaced) ? 0x80 : 0; +     -    /* Exit for not supported resolutions */ -    if (((pGD->mode==DUAL_800_600) || (pGD->mode==DUAL_1024_768)) && (pGD->gdfBytesPP > 1)) -    { -	printf ("Dual screen for 1BPP only !\n"); -	return (NULL); -    } +	cr[0x08] = 0x00; +	cr[0x09] = (dblscan << 7) +		| ((LineCompare & 0x200) >> 3) +		| (((vbs - 1) & 0x200) >> 4) +		| (TextScanLines - 1); -    if ((pGD->mode==SINGLE_1280_1024) && (pGD->gdfBytesPP==4)) -    { -	printf ("Out of memory !\n"); -	return (NULL); -    } +	cr[0x10] = vs & 0xff;	/* VSyncPulseStart */ +	cr[0x11] = (ve & 0x0f);	 +	cr[0x12] = (vd - 1) & 0xff;	/* LineCount  */ +	cr[0x13] = wd & 0xff; +	cr[0x14] = 0x40; +	cr[0x15] = (vbs - 1) & 0xff; +	cr[0x16] = vbe & 0xff; +	cr[0x17] = 0xe3;	/* but it does not work */ +	cr[0x18] = 0xff & LineCompare; +	cr[0x22] = 0x00;	/* todo? */ -    /* Set graphic parameters */ -    switch (pGD->mode) -    { -    case DUAL_800_600: -	    pGD->winSizeX = 800; -	    pGD->winSizeY = 600; -	    pGD->plnSizeX = 1600; -	    pGD->plnSizeY = 600; -	    sprintf (pGD->modeIdent, "Dual Screen 800x600 with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case DUAL_1024_768: -	    pGD->winSizeX = 1024; -	    pGD->winSizeY = 768; -	    pGD->plnSizeX = 2048; -	    pGD->plnSizeY = 768; -	    sprintf (pGD->modeIdent, "Dual Screen 1024x768 with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case SINGLE_800_600: -	    pGD->winSizeX = 800; -	    pGD->winSizeY = 600; -	    pGD->plnSizeX = 800; -	    pGD->plnSizeY = 600; -	    sprintf (pGD->modeIdent, "Single Screen 800x600 with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case SINGLE_1024_768: -	    pGD->winSizeX = 1024; -	    pGD->winSizeY = 768; -	    pGD->plnSizeX = 1024; -	    pGD->plnSizeY = 768; -	    sprintf (pGD->modeIdent,"Single Screen 1024x768 with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case TV_MODE_CCIR: -	    pGD->winSizeX = 720; -	    pGD->winSizeY = 576; -	    pGD->plnSizeX = 720; -	    pGD->plnSizeY = 576; -	    sprintf (pGD->modeIdent, "TV Mode CCIR with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case TV_MODE_EIA: -	    pGD->winSizeX = 720; -	    pGD->winSizeY = 484; -	    pGD->plnSizeX = 720; -	    pGD->plnSizeY = 484; -	    sprintf (pGD->modeIdent, "TV Mode EIA with %s", gdfModes[pGD->gdfIndex]); -	    break; -    case SINGLE_1280_1024: -	    pGD->winSizeX = 1280; -	    pGD->winSizeY = 1024; -	    pGD->plnSizeX = 1280; -	    pGD->plnSizeY = 1024; -	    sprintf (pGD->modeIdent, "Single Screen 1280x1024 with %s", gdfModes[pGD->gdfIndex]); -	    break; -    default: -	    printf("Videomode not supported !\n"); -	    return (NULL); -    } +	/* now set the registers */ +	for (i = 0; i <= 0x18; i++) {	/*CR00 .. CR18 */ +		smiWrite (SMI_INDX_D4, i, cr[i]); +	} +	i = 0x22;		/*CR22 */ +	smiWrite (SMI_INDX_D4, i, cr[i]); +	i = 0x30;		/*CR30 */ +	smiWrite (SMI_INDX_D4, i, cr[i]); +} -    pGD->isaBase = CFG_ISA_IO; -    pGD->pciBase = pci_mem_base; -    pGD->dprBase = (pci_mem_base + 0x400000 + 0x8000); -    pGD->vprBase = (pci_mem_base + 0x400000 + 0xc000); -    pGD->cprBase = (pci_mem_base + 0x400000 + 0xe000); -    pGD->frameAdrs = pci_mem_base; -    pGD->memSize = VIDEO_MEM_SIZE; +/*****************************************************************************/ +#define REF_FREQ	14318180 +#define PMIN		1 +#define PMAX		255 +#define QMIN		1 +#define QMAX		63 -    /* Turn off display */ -    smiWrite (0x3c4, 0x01, 0x20); +static unsigned int FindPQ (unsigned int freq, unsigned int *pp, unsigned int *pq) +{ +	unsigned int n = QMIN, m = 0; +	long long int L = 0, P = freq, Q = REF_FREQ, H = P >> 1; +	long long int D = 0x7ffffffffffffffLL; -    /* Unlock ext. crt regs */ -    out8 (SMI_LOCK_REG, 0x40); +	for (n = QMIN; n <= QMAX; n++) { +		m = PMIN;	/* p/q ~ freq/ref -> p*ref-freq*q ~ 0 */ +		L = P * n - m * Q;	 +		while (L > 0 && m < PMAX) { +			L -= REF_FREQ;	/* difference is greater as 0 subtract fref */ +			m++;	/* and increment m */ +		} +		/* difference is less or equal than 0 or m > maximum */ +		if (m > PMAX) +			break;	/* no solution: if we increase n we get the same situation */ +		/* L is <= 0 now */ +		if (-L > H && m > PMIN) {	/* if difference > the half fref */ +			L += REF_FREQ;	/* we take the situation before */ +			m--;	/* because its closer to 0 */ +		} +		L = (L < 0) ? -L : +L;	/* absolute value */ +		if (D < L)	/* if last difference was better take next n */ +			continue; +		D = L; +		*pp = m; +		*pq = n;	/*  keep improved data */ +		if (D == 0) +			break;	/* best result we can get */ +	} +	return (unsigned int) (0xffffffff & D); +} -    /* Set Register base to isa 3dx for 3?x regs (color mode) */ -    out8 (SMI_MISC_REG, 0x2b); +/*****************************************************************************/ +static void smiLoadCcr (struct ctfb_res_modes *var, unsigned short device_id) +{ +	unsigned int p, q; +	long long freq; +	register GraphicDevice *pGD  = (GraphicDevice *)&smi; -    /* Unlock crt regs 0-7 */ -    smiWrite (0x3d4, 0x11, 0x0e); +	smiWrite (SMI_INDX_C4, 0x65, 0); +	smiWrite (SMI_INDX_C4, 0x66, 0); +	smiWrite (SMI_INDX_C4, 0x68, 0x50); +	if (device_id == PCI_DEVICE_ID_SMI_810) { +		smiWrite (SMI_INDX_C4, 0x69, 0x3); +	} else { +		smiWrite (SMI_INDX_C4, 0x69, 0x0); +	} -    /* Sytem Control Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_SCR, sizeof(SMI_SCR)); +	/* Memory clock */ +	switch (device_id) { +	case PCI_DEVICE_ID_SMI_710 : +		smiWrite (SMI_INDX_C4, 0x6a, 0x75); +		break; +	case PCI_DEVICE_ID_SMI_712 : +		smiWrite (SMI_INDX_C4, 0x6a, 0x80); +		break; +	default : +		smiWrite (SMI_INDX_C4, 0x6a, 0x53); +		break; +	} +	smiWrite (SMI_INDX_C4, 0x6b, 0x15); +     +	/* VCLK */ +	freq = 1000000000000L / var -> pixclock; +     +	FindPQ ((unsigned int)freq, &p, &q); +     +	smiWrite (SMI_INDX_C4, 0x6c, p); +	smiWrite (SMI_INDX_C4, 0x6d, q); -    /* extented CRT Register */ -    smiLoadRegs (SMI_INDX_D4, SMI_DATA_D5, -	 SMI_EXT_CRT[pGD->mode], sizeof(SMI_EXT_CRT)/VIDEO_MODES); +} -    /* Sequencer Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_SEQR, sizeof(SMI_SEQR)); +/******************************************************************************* + * + * Init video chip with common Linux graphic modes (lilo) + */ +void *video_hw_init (void) +{ +	GraphicDevice *pGD = (GraphicDevice *)&smi; +	unsigned short device_id; +	pci_dev_t devbusfn; +	int videomode; +	unsigned long t1, hsynch, vsynch; +	unsigned int pci_mem_base, *vm; +	char *penv; +	int tmp, i, bits_per_pixel; +	struct ctfb_res_modes *res_mode; +	struct ctfb_res_modes var_mode; +	unsigned char videoout; +     +	/* Search for video chip */ +	printf("Video: "); -    /* Power Control Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_PCR[pGD->mode], sizeof(SMI_PCR)/VIDEO_MODES); +	if ((devbusfn = pci_find_devices(supported, 0)) < 0) +	{ +		printf ("Controller not found !\n"); +		return (NULL); +	} -    /* Memory Control Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_MCR[pGD->mode], sizeof(SMI_MCR)/VIDEO_MODES); +	/* PCI setup */ +	pci_write_config_dword (devbusfn, PCI_COMMAND, (PCI_COMMAND_MEMORY | PCI_COMMAND_IO)); +	pci_read_config_word (devbusfn, PCI_DEVICE_ID, &device_id); +	pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pci_mem_base); +	pci_mem_base = pci_mem_to_phys (devbusfn, pci_mem_base); -    /* Clock Control Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_CCR[pGD->mode], sizeof(SMI_CCR)/VIDEO_MODES); +	tmp = 0; +     +	videomode = CFG_DEFAULT_VIDEO_MODE; +	/* get video mode via environment */ +	if ((penv = getenv ("videomode")) != NULL) { +		/* deceide if it is a string */ +		if (penv[0] <= '9') { +			videomode = (int) simple_strtoul (penv, NULL, 16); +			tmp = 1; +		} +	} else { +		tmp = 1; +	} +	if (tmp) { +		/* parameter are vesa modes */ +		/* search params */ +		for (i = 0; i < VESA_MODES_COUNT; i++) { +			if (vesa_modes[i].vesanr == videomode) +				break; +		} +		if (i == VESA_MODES_COUNT) { +			printf ("no VESA Mode found, switching to mode 0x%x ", CFG_DEFAULT_VIDEO_MODE); +			i = 0; +		} +		res_mode = +			(struct ctfb_res_modes *) &res_mode_init[vesa_modes[i]. +								 resindex]; +		bits_per_pixel = vesa_modes[i].bits_per_pixel; +	} else { +	 +		res_mode = (struct ctfb_res_modes *) &var_mode; +		bits_per_pixel = video_get_params (res_mode, penv); +	} -    /* Shadow VGA Register */ -    smiLoadRegs (SMI_INDX_D4, SMI_DATA_D5, -	 SMI_SHVGA[pGD->mode], sizeof(SMI_SHVGA)/VIDEO_MODES); +	/* calculate hsynch and vsynch freq (info only) */ +	t1 = (res_mode->left_margin + res_mode->xres + +	      res_mode->right_margin + res_mode->hsync_len) / 8; +	t1 *= 8; +	t1 *= res_mode->pixclock; +	t1 /= 1000; +	hsynch = 1000000000L / t1; +	t1 *= +		(res_mode->upper_margin + res_mode->yres + +		 res_mode->lower_margin + res_mode->vsync_len); +	t1 /= 1000; +	vsynch = 1000000000L / t1; +     +	/* fill in Graphic device struct */ +	sprintf (pGD->modeIdent, "%dx%dx%d %ldkHz %ldHz", res_mode->xres, +		 res_mode->yres, bits_per_pixel, (hsynch / 1000), +		 (vsynch / 1000)); +	printf ("%s\n", pGD->modeIdent); +	pGD->winSizeX = res_mode->xres; +	pGD->winSizeY = res_mode->yres; +	pGD->plnSizeX = res_mode->xres; +	pGD->plnSizeY = res_mode->yres; +	switch (bits_per_pixel) { +	case 8: +		pGD->gdfBytesPP = 1; +		pGD->gdfIndex = GDF__8BIT_INDEX; +		break; +	case 15: +		pGD->gdfBytesPP = 2; +		pGD->gdfIndex = GDF_15BIT_555RGB; +		break; +	case 16: +		pGD->gdfBytesPP = 2; +		pGD->gdfIndex = GDF_16BIT_565RGB; +		break; +	case 24: +		pGD->gdfBytesPP = 3; +		pGD->gdfIndex = GDF_24BIT_888RGB; +		break; +	} -    /* General Purpose Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_GPR[pGD->mode], sizeof(SMI_GPR)/VIDEO_MODES); +	pGD->isaBase = CFG_ISA_IO; +	pGD->pciBase = pci_mem_base; +	pGD->dprBase = (pci_mem_base + 0x400000 + 0x8000); +	pGD->vprBase = (pci_mem_base + 0x400000 + 0xc000); +	pGD->cprBase = (pci_mem_base + 0x400000 + 0xe000); +	pGD->frameAdrs = pci_mem_base; +	pGD->memSize = VIDEO_MEM_SIZE; -    /* Hardware Cusor Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_HCR[pGD->mode], sizeof(SMI_HCR)/VIDEO_MODES); +	/* Set up hardware : select color mode, +	   set Register base to isa 3dx for 3?x regs*/ +	out8 (SMI_MISC_REG, 0x01); -    /* Flat Panel Register */ -    smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, -	 SMI_FPR[pGD->mode], sizeof(SMI_FPR)/VIDEO_MODES); +	/* Turn off display */ +	smiWrite (SMI_INDX_C4, 0x01, 0x20); -    /* CRTC Register */ -    smiLoadRegs (SMI_INDX_D4, SMI_DATA_D5, -	 SMI_CRTCR[pGD->mode], sizeof(SMI_CRTCR)/VIDEO_MODES); +	/* Unlock ext. crt regs */ +	out8 (SMI_LOCK_REG, 0x40); -    /* Graphics Controller Register */ -    smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, -	 SMI_GCR, sizeof(SMI_GCR)); +	/* Unlock crt regs 0-7 */ +	smiWrite (SMI_INDX_D4, 0x11, 0x0e); -    /* Patch memory and refresh settings for SMI710 */ -    if (device_id == PCI_DEVICE_ID_SMI_710) -    { -    unsigned char reg = smiRead (0x3c4, 0x62); +	/* Sytem Control Register */ +	smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_SCR, sizeof(SMI_SCR)); -    /* external memory disabled */ -    smiWrite (0x3c4, 0x62, (reg & 0xfb)); -    /* memory clock */ -    smiWrite (0x3c4, 0x6a, 0x75); -    } +	/* extented CRT Register */ +	smiLoadRegs (SMI_INDX_D4, SMI_DATA_D5, SMI_EXT_CRT, sizeof(SMI_EXT_CRT)); -    /* Patch memory and refresh settings for SMI712 */ -    if (device_id == PCI_DEVICE_ID_SMI_712) -    { -    unsigned char reg = smiRead (0x3c4, 0x62); +	/* Attributes controller registers */ +	smiLoadRegs (SMI_INDX_ATTR, SMI_INDX_ATTR, SMI_ATTR, sizeof(SMI_ATTR)); +     +	/* Graphics Controller Register */ +	smiLoadRegs (SMI_INDX_CE, SMI_DATA_CF, SMI_GCR, sizeof(SMI_GCR)); -    /* IL runs at MCLK; 64bit bus; external memory disabled */ -    smiWrite (0x3c4, 0x62, (reg | 0xc4)); -    /* memory clock */ -    smiWrite (0x3c4, 0x6a, 0x80); -    } +	/* Sequencer Register */ +	smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_SEQR, sizeof(SMI_SEQR)); -    /* Patch clock settings for SMI810 */ -    if (device_id == PCI_DEVICE_ID_SMI_810) -    { -    /* clock control */ -    smiWrite (0x3c4, 0x69, 0x03); -    } +	/* Power Control Register */ +	smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_PCR, sizeof(SMI_PCR)); -    /* Video processor default setup */ -    smiInitVideoProcessor (); +	/* Memory Control Register */ +	/* Register MSR62 is a power on configurable register. We don't */ +	/* modify it */ +	smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_MCR, sizeof(SMI_MCR)); -    /* Capture port default setup */ -    smiInitCapturePort (); +	/* Set misc output register */ +	smiLoadMsr (res_mode); +     +	/* Set CRT and Clock control registers */ +	smiLoadCrt (res_mode, bits_per_pixel); +     +	smiLoadCcr (res_mode, device_id); -    /* Drawing engine default setup */ -    smiInitDrawingEngine (); +	/* Hardware Cusor Register */ +	smiLoadRegs (SMI_INDX_C4, SMI_DATA_C5, SMI_HCR, sizeof(SMI_HCR)); -    /* Turn on display */ -    smiWrite (0x3c4, 0x01, 0x01); +	/* Enable  Display  */ +	videoout = 2;	    /* Default output is CRT */ +	if ((penv = getenv ("videoout")) != NULL) { +		/* deceide if it is a string */ +		videoout = (int) simple_strtoul (penv, NULL, 16); +	} +	smiWrite (SMI_INDX_C4, 0x31, videoout); -    /* Clear video memory */ -    i = pGD->memSize/4; -    vm = (unsigned int *)pGD->pciBase; -    while(i--) -    *vm++ = 0; +	/* Video processor default setup */ +	smiInitVideoProcessor (); -    printf("mode=%x - %s\n", videomode, pGD->modeIdent); -    return ((void*)&smi); +	/* Capture port default setup */ +	smiInitCapturePort (); + +	/* Drawing engine default setup */ +	smiInitDrawingEngine (); + +	/* Turn on display */ +	smiWrite (0x3c4, 0x01, 0x01); + +	/* Clear video memory */ +	i = pGD->memSize/4; +	vm = (unsigned int *)pGD->pciBase; +	while(i--) +		*vm++ = 0; +	return ((void*)&smi);  }  /******************************************************************************* -* -* Drawing engine fill on screen region -*/ + * + * Drawing engine fill on screen region + */  void video_hw_rectfill ( -    unsigned int bpp,             /* bytes per pixel */ -    unsigned int dst_x,           /* dest pos x */ -    unsigned int dst_y,           /* dest pos y */ -    unsigned int dim_x,           /* frame width */ -    unsigned int dim_y,           /* frame height */ -    unsigned int color            /* fill color */ -     ) +	unsigned int bpp,	      /* bytes per pixel */ +	unsigned int dst_x,	      /* dest pos x */ +	unsigned int dst_y,	      /* dest pos y */ +	unsigned int dim_x,	      /* frame width */ +	unsigned int dim_y,	      /* frame height */ +	unsigned int color	      /* fill color */ +	)  { -    register GraphicDevice *pGD = (GraphicDevice *)&smi; -    register unsigned int control; +	register GraphicDevice *pGD = (GraphicDevice *)&smi; +	register unsigned int control; -    dim_x *= bpp; +	dim_x *= bpp; -    out32r ((pGD->dprBase + 0x0014), color); -    out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y)); -    out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y)); +	out32r ((pGD->dprBase + 0x0014), color); +	out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y)); +	out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y)); -    control = 0x0000ffff &  in32r ((pGD->dprBase + 0x000c)); +	control = 0x0000ffff &	in32r ((pGD->dprBase + 0x000c)); -    control |= 0x80010000; +	control |= 0x80010000; -    out32r ((pGD->dprBase + 0x000c),  control); +	out32r ((pGD->dprBase + 0x000c),  control); -    /* Wait for drawing processor */ -    do -    { -    out8 ((pGD->isaBase + 0x3c4), 0x16); -    } while (in8 (pGD->isaBase + 0x3c5) & 0x08); +	/* Wait for drawing processor */ +	do +	{ +		out8 ((pGD->isaBase + 0x3c4), 0x16); +	} while (in8 (pGD->isaBase + 0x3c5) & 0x08);  }  /******************************************************************************* -* -* Drawing engine bitblt with screen region -*/ + * + * Drawing engine bitblt with screen region + */  void video_hw_bitblt ( -    unsigned int bpp,             /* bytes per pixel */ -    unsigned int src_x,           /* source pos x */ -    unsigned int src_y,           /* source pos y */ -    unsigned int dst_x,           /* dest pos x */ -    unsigned int dst_y,           /* dest pos y */ -    unsigned int dim_x,           /* frame width */ -    unsigned int dim_y            /* frame height */ -    ) +	unsigned int bpp,	      /* bytes per pixel */ +	unsigned int src_x,	      /* source pos x */ +	unsigned int src_y,	      /* source pos y */ +	unsigned int dst_x,	      /* dest pos x */ +	unsigned int dst_y,	      /* dest pos y */ +	unsigned int dim_x,	      /* frame width */ +	unsigned int dim_y	      /* frame height */ +	)  { -    register GraphicDevice *pGD = (GraphicDevice *)&smi; -    register unsigned int control; +	register GraphicDevice *pGD = (GraphicDevice *)&smi; +	register unsigned int control; -    dim_x *= bpp; +	dim_x *= bpp; -    if ((src_y<dst_y) || ((src_y==dst_y) && (src_x<dst_x))) -    { -    out32r ((pGD->dprBase + 0x0000), (((src_x+dim_x-1)<<16) | (src_y+dim_y-1))); -    out32r ((pGD->dprBase + 0x0004), (((dst_x+dim_x-1)<<16) | (dst_y+dim_y-1))); -    control = 0x88000000; -    } -    else -    { -    out32r ((pGD->dprBase + 0x0000), ((src_x<<16) | src_y)); -    out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y)); -    control = 0x80000000; -    } +	if ((src_y<dst_y) || ((src_y==dst_y) && (src_x<dst_x))) +	{ +		out32r ((pGD->dprBase + 0x0000), (((src_x+dim_x-1)<<16) | (src_y+dim_y-1))); +		out32r ((pGD->dprBase + 0x0004), (((dst_x+dim_x-1)<<16) | (dst_y+dim_y-1))); +		control = 0x88000000; +	} else { +		out32r ((pGD->dprBase + 0x0000), ((src_x<<16) | src_y)); +		out32r ((pGD->dprBase + 0x0004), ((dst_x<<16) | dst_y)); +		control = 0x80000000; +	} -    out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y)); -    control |= (0x0000ffff &  in32r ((pGD->dprBase + 0x000c))); -    out32r ((pGD->dprBase + 0x000c), control); +	out32r ((pGD->dprBase + 0x0008), ((dim_x<<16) | dim_y)); +	control |= (0x0000ffff &  in32r ((pGD->dprBase + 0x000c))); +	out32r ((pGD->dprBase + 0x000c), control); -    /* Wait for drawing processor */ -    do -    { -    out8 ((pGD->isaBase + 0x3c4), 0x16); -    } while (in8 (pGD->isaBase + 0x3c5) & 0x08); +	/* Wait for drawing processor */ +	do +	{ +		out8 ((pGD->isaBase + 0x3c4), 0x16); +	} while (in8 (pGD->isaBase + 0x3c5) & 0x08);  }  /******************************************************************************* -* -* Set a RGB color in the LUT (8 bit index) -*/ + * + * Set a RGB color in the LUT (8 bit index) + */  void video_set_lut ( -    unsigned int index,           /* color number */ -    unsigned char r,              /* red */ -    unsigned char g,              /* green */ -    unsigned char b               /* blue */ -    ) +	unsigned int index,	      /* color number */ +	unsigned char r,	      /* red */ +	unsigned char g,	      /* green */ +	unsigned char b		      /* blue */ +	)  { -    register GraphicDevice *pGD = (GraphicDevice *)&smi; +	register GraphicDevice *pGD = (GraphicDevice *)&smi; -    out8 (SMI_LUT_MASK,  0xff); +	out8 (SMI_LUT_MASK,  0xff); -    out8 (SMI_LUT_START, (char)index); +	out8 (SMI_LUT_START, (char)index); -    out8 (SMI_LUT_RGB, r>>2);    /* red */ -    udelay (10); -    out8 (SMI_LUT_RGB, g>>2);    /* green */ -    udelay (10); -    out8 (SMI_LUT_RGB, b>>2);    /* blue */ -    udelay (10); +	out8 (SMI_LUT_RGB, r>>2);    /* red */ +	udelay (10); +	out8 (SMI_LUT_RGB, g>>2);    /* green */ +	udelay (10); +	out8 (SMI_LUT_RGB, b>>2);    /* blue */ +	udelay (10);  }  #endif /* CONFIG_VIDEO_SMI_LYNXEM */ diff --git a/drivers/videomodes.c b/drivers/videomodes.c new file mode 100644 index 000000000..418f74c57 --- /dev/null +++ b/drivers/videomodes.c @@ -0,0 +1,210 @@ +/* + * (C) Copyright 2004 + * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +/************************************************************************ +  Get Parameters for the video mode: +  The default video mode can be defined in CFG_DEFAULT_VIDEO_MODE. +  If undefined, default video mode is set to 0x301 +  Parameters can be set via the variable "videomode" in the environment. +  2 diferent ways are possible: +  "videomode=301"   - 301 is a hexadecimal number describing the VESA +		      mode. Following modes are implemented: + +		      Colors	640x480 800x600 1024x768 1152x864 1280x1024 +		     --------+--------------------------------------------- +		      8 bits |	0x301	0x303	 0x305	  0x161	    0x307 +		     15 bits |	0x310	0x313	 0x316	  0x162	    0x319 +		     16 bits |	0x311	0x314	 0x317	  0x163	    0x31A +		     24 bits |	0x312	0x315	 0x318	    ?	    0x31B +		     --------+--------------------------------------------- +  "videomode=bootargs" +		   - the parameters are parsed from the bootargs. +		      The format is "NAME:VALUE,NAME:VALUE" etc. +		      Ex.: +		      "bootargs=video=ctfb:x:800,y:600,depth:16,pclk:25000" +		      Parameters not included in the list will be taken from +		      the default mode, which is one of the following: +		      mode:0  640x480x24 +		      mode:1  800x600x16 +		      mode:2  1024x768x8 +		      mode:3  960x720x24 +		      mode:4  1152x864x16 +		      mode:5  1280x1024x8 + +		      if "mode" is not provided within the parameter list, +		      mode:0 is assumed. +		      Following parameters are supported: +		      x	      xres = visible resolution horizontal +		      y	      yres = visible resolution vertical +		      pclk    pixelclocks in pico sec +		      le      left_marging time from sync to picture in pixelclocks +		      ri      right_marging time from picture to sync in pixelclocks +		      up      upper_margin time from sync to picture +		      lo      lower_margin +		      hs      hsync_len length of horizontal sync +		      vs      vsync_len length of vertical sync +		      sync    see FB_SYNC_* +		      vmode   see FB_VMODE_* +		      depth   Color depth in bits per pixel +		      All other parameters in the variable bootargs are ignored. +		      It is also possible to set the parameters direct in the +		      variable "videomode", or in another variable i.e. +		      "myvideo" and setting the variable "videomode=myvideo".. +****************************************************************************/ + +#include <common.h> +#include "videomodes.h" + +const struct ctfb_vesa_modes vesa_modes[VESA_MODES_COUNT] = { +	{0x301, RES_MODE_640x480, 8}, +	{0x310, RES_MODE_640x480, 15}, +	{0x311, RES_MODE_640x480, 16}, +	{0x312, RES_MODE_640x480, 24}, +	{0x303, RES_MODE_800x600, 8}, +	{0x313, RES_MODE_800x600, 15}, +	{0x314, RES_MODE_800x600, 16}, +	{0x315, RES_MODE_800x600, 24}, +	{0x305, RES_MODE_1024x768, 8}, +	{0x316, RES_MODE_1024x768, 15}, +	{0x317, RES_MODE_1024x768, 16}, +	{0x318, RES_MODE_1024x768, 24}, +	{0x161, RES_MODE_1152x864, 8}, +	{0x162, RES_MODE_1152x864, 15}, +	{0x163, RES_MODE_1152x864, 16}, +	{0x307, RES_MODE_1280x1024, 8}, +	{0x319, RES_MODE_1280x1024, 15}, +	{0x31A, RES_MODE_1280x1024, 16}, +	{0x31B, RES_MODE_1280x1024, 24}, +}; +const struct ctfb_res_modes res_mode_init[RES_MODES_COUNT] = { +	/* x	 y pixclk   le	ri  up	lo   hs vs  s  vmode */ +	{640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, FB_VMODE_NONINTERLACED}, +	{800, 600, 27778, 64, 24, 22, 1, 72, 2, 0, FB_VMODE_NONINTERLACED}, +	{1024, 768, 15384, 168, 8, 29, 3, 144, 4, 0, FB_VMODE_NONINTERLACED}, +	{960, 720, 13100, 160, 40, 32, 8, 80, 4, 0, FB_VMODE_NONINTERLACED}, +	{1152, 864, 12004, 200, 64, 32, 16, 80, 4, 0, FB_VMODE_NONINTERLACED}, +	{1280, 1024, 9090, 200, 48, 26, 1, 184, 3, 0, FB_VMODE_NONINTERLACED}, +}; + +/************************************************************************ + * Get Parameters for the video mode: + */ +/********************************************************************* + * returns the length to the next seperator + */ +static int +video_get_param_len (char *start, char sep) +{ +	int i = 0; +	while ((*start != 0) && (*start != sep)) { +		start++; +		i++; +	} +	return i; +} + +static int +video_search_param (char *start, char *param) +{ +	int len, totallen, i; +	char *p = start; +	len = strlen (param); +	totallen = len + strlen (start); +	for (i = 0; i < totallen; i++) { +		if (strncmp (p++, param, len) == 0) +			return (i); +	} +	return -1; +} + +/*************************************************************** + * Get parameter via the environment as it is done for the + * linux kernel i.e: + * video=ctfb:x:800,xv:1280,y:600,yv:1024,depth:16,mode:0,pclk:25000, + *	 le:56,ri:48,up:26,lo:5,hs:152,vs:2,sync:0,vmode:0,accel:0 + * + * penv is a pointer to the environment, containing the string, or the name of + * another environment variable. It could even be the term "bootargs" + */ + +#define GET_OPTION(name,var)				\ +	if(strncmp(p,name,strlen(name))==0) {		\ +		val_s=p+strlen(name);			\ +		var=simple_strtoul(val_s, NULL, 10);	\ +	} + +int video_get_params (struct ctfb_res_modes *pPar, char *penv) +{ +	char *p, *s, *val_s; +	int i = 0, t; +	int bpp; +	int mode; +	/* first search for the environment containing the real param string */ +	s = penv; +	if ((p = getenv (s)) != NULL) { +		s = p; +	} +	/* in case of the bootargs line, we have to start +	 * after "video=ctfb:" +	 */ +	i = video_search_param (s, "video=ctfb:"); +	if (i >= 0) { +		s += i; +		s += strlen ("video=ctfb:"); +	} +	/* search for mode as a default value */ +	p = s; +	t = 0; +	mode = 0;		/* default */ +	while ((i = video_get_param_len (p, ',')) != 0) { +		GET_OPTION ("mode:", mode) +			p += i; +		if (*p != 0) +			p++;	/* skip ',' */ +	} +	if (mode >= RES_MODES_COUNT) +		mode = 0; +	*pPar = res_mode_init[mode];	/* copy default values */ +	bpp = 24 - ((mode % 3) * 8); +	p = s;			/* restart */ +	while ((i = video_get_param_len (p, ',')) != 0) { +		GET_OPTION ("x:", pPar->xres) +			GET_OPTION ("y:", pPar->yres) +			GET_OPTION ("le:", pPar->left_margin) +			GET_OPTION ("ri:", pPar->right_margin) +			GET_OPTION ("up:", pPar->upper_margin) +			GET_OPTION ("lo:", pPar->lower_margin) +			GET_OPTION ("hs:", pPar->hsync_len) +			GET_OPTION ("vs:", pPar->vsync_len) +			GET_OPTION ("sync:", pPar->sync) +			GET_OPTION ("vmode:", pPar->vmode) +			GET_OPTION ("pclk:", pPar->pixclock) +			GET_OPTION ("depth:", bpp) +			p += i; +		if (*p != 0) +			p++;	/* skip ',' */ +	} +	return bpp; +} + + diff --git a/drivers/videomodes.h b/drivers/videomodes.h new file mode 100644 index 000000000..b8f5a39de --- /dev/null +++ b/drivers/videomodes.h @@ -0,0 +1,89 @@ +/* + * (C) Copyright 2004 + * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + + +#ifndef CFG_DEFAULT_VIDEO_MODE +#define CFG_DEFAULT_VIDEO_MODE	0x301 +#endif + +/* Some mode definitions */ +#define FB_SYNC_HOR_HIGH_ACT	1	/* horizontal sync high active	*/ +#define FB_SYNC_VERT_HIGH_ACT	2	/* vertical sync high active	*/ +#define FB_SYNC_EXT		4	/* external sync		*/ +#define FB_SYNC_COMP_HIGH_ACT	8	/* composite sync high active	*/ +#define FB_SYNC_BROADCAST	16	/* broadcast video timings	*/ +					/* vtotal = 144d/288n/576i => PAL  */ +					/* vtotal = 121d/242n/484i => NTSC */ +#define FB_SYNC_ON_GREEN	32	/* sync on green */ +#define FB_VMODE_NONINTERLACED	0	/* non interlaced */ +#define FB_VMODE_INTERLACED	1	/* interlaced	*/ +#define FB_VMODE_DOUBLE		2	/* double scan */ +#define FB_VMODE_MASK		255 + +#define FB_VMODE_YWRAP		256	/* ywrap instead of panning	*/ +#define FB_VMODE_SMOOTH_XPAN	512	/* smooth xpan possible (internally used) */ +#define FB_VMODE_CONUPDATE	512	/* don't update x/yoffset	*/ + + +/****************************************************************** + * Resolution Struct + ******************************************************************/ +struct ctfb_res_modes { +	int xres;		/* visible resolution		*/ +	int yres; +	/* Timing: All values in pixclocks, except pixclock (of course) */ +	int pixclock;		/* pixel clock in ps (pico seconds) */ +	int left_margin;	/* time from sync to picture	*/ +	int right_margin;	/* time from picture to sync	*/ +	int upper_margin;	/* time from sync to picture	*/ +	int lower_margin; +	int hsync_len;		/* length of horizontal sync	*/ +	int vsync_len;		/* length of vertical sync	*/ +	int sync;		/* see FB_SYNC_*		*/ +	int vmode;		/* see FB_VMODE_*		*/ +}; + +/****************************************************************** + * Vesa Mode Struct + ******************************************************************/ +struct ctfb_vesa_modes { +	int vesanr;		/* Vesa number as in LILO (VESA Nr + 0x200} */ +	int resindex;		/* index to resolution struct */ +	int bits_per_pixel;	/* bpp */ +}; + +#define RES_MODE_640x480	0 +#define RES_MODE_800x600	1 +#define RES_MODE_1024x768	2 +#define RES_MODE_960_720	3 +#define RES_MODE_1152x864	4 +#define RES_MODE_1280x1024	5 +#define RES_MODES_COUNT		6 + +#define VESA_MODES_COUNT 19 + +extern const struct ctfb_vesa_modes vesa_modes[]; +extern const struct ctfb_res_modes res_mode_init[]; + +int video_get_params (struct ctfb_res_modes *pPar, char *penv); + diff --git a/include/common.h b/include/common.h index 25ab5aa54..acdcf6973 100644 --- a/include/common.h +++ b/include/common.h @@ -319,7 +319,7 @@ void	relocate_code (ulong, gd_t *, ulong);  ulong	get_endaddr   (void);  void	trap_init     (ulong);  #if defined (CONFIG_4xx)	|| \ -    defined (CONFIG_5xxx)	|| \ +    defined (CONFIG_MPC5xxx)	|| \      defined (CONFIG_74xx_7xx)	|| \      defined (CONFIG_74x)	|| \      defined (CONFIG_75x)	|| \ diff --git a/include/configs/csb272.h b/include/configs/csb272.h index edec868d5..ac1cead8d 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -300,6 +300,7 @@   *   */  #define CFG_I2C_PLL_ADDR	0x58	/* I2C address of AMIS FS6377-01 PLL */ +#define CONFIG_I2CFAST		1	/* enable "i2cfast" env. setting     */  /*   * Internal Definitions diff --git a/lib_ppc/board.c b/lib_ppc/board.c index a3f7f173b..cae7775ac 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -509,8 +509,26 @@ void board_init_f (ulong bootflag)  	bd->bi_pci_busfreq = get_PCI_freq ();  	bd->bi_opbfreq = get_OPB_freq (); +#if defined(CONFIG_I2CFAST) +	/* +	 * set bi_iic_fast for linux taking environment variable +	 * "i2cfast" into account +	 */ +	{ +		char *s = getenv ("i2cfast"); +		if (s && ((*s == 'y') || (*s == 'Y'))) { +			bd->bi_iic_fast[0] = 1; +			bd->bi_iic_fast[1] = 1; +		} else { +			bd->bi_iic_fast[0] = 0; +			bd->bi_iic_fast[1] = 0; +		} +	} +#else  	bd->bi_iic_fast[0] = 0;  	bd->bi_iic_fast[1] = 0; +#endif +  #elif defined(CONFIG_XILINX_ML300)  	bd->bi_pci_busfreq = get_PCI_freq ();  #endif |