diff -uNr linux-2.4.31/drivers/video/Config.in linux-fb/drivers/video/Config.in --- linux-2.4.31/drivers/video/Config.in 2004-02-18 14:36:31.000000000 +0100 +++ linux-fb/drivers/video/Config.in 2005-10-13 17:54:00.000000000 +0200 @@ -159,6 +159,13 @@ bool ' SIS 300 series support' CONFIG_FB_SIS_300 bool ' SIS 315/330 series support' CONFIG_FB_SIS_315 fi + tristate ' National Geode display support (EXPERIMENTAL)' CONFIG_FB_GEODE + if [ "$CONFIG_FB_GEODE" != "n" ]; then + bool ' TV Support' CONFIG_FB_GEODE_TV + bool ' FlatPanel Support' CONFIG_FB_GEODE_FP + bool ' DDC Support' CONFIG_FB_GEODE_DDC + bool ' GAL Support' CONFIG_FB_GEODE_GAL + fi tristate ' NeoMagic display support (EXPERIMENTAL)' CONFIG_FB_NEOMAGIC tristate ' 3Dfx Banshee/Voodoo3 display support (EXPERIMENTAL)' CONFIG_FB_3DFX tristate ' 3Dfx Voodoo Graphics (sst1) support (EXPERIMENTAL)' CONFIG_FB_VOODOO1 @@ -312,7 +319,7 @@ "$CONFIG_FB_TX3912" = "y" -o \ "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_NEOMAGIC" = "y" -o \ "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" -o \ - "$CONFIG_FB_INTEL" = "y" ]; then + "$CONFIG_FB_INTEL" = "y" -o "$CONFIG_FB_GEODE" = "y" ]; then define_tristate CONFIG_FBCON_CFB8 y else if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \ @@ -335,7 +342,7 @@ "$CONFIG_FB_RADEON" = "m" -o "$CONFIG_FB_INTEL" = "m" -o \ "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_SIS" = "m" -o \ "$CONFIG_FB_TX3912" = "m" -o "$CONFIG_FB_NEOMAGIC" = "m" -o \ - "$CONFIG_FB_STI" = "m" -o "$CONFIG_FB_INTEL" = "m" ]; then + "$CONFIG_FB_STI" = "m" -o "$CONFIG_FB_INTEL" = "m" -o "$CONFIG_FB_GEODE" = "m" ]; then define_tristate CONFIG_FBCON_CFB8 m fi fi @@ -354,7 +361,7 @@ "$CONFIG_FB_CYBER2000" = "y" -o "$CONFIG_FB_3DFX" = "y" -o \ "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_SA1100" = "y" -o \ "$CONFIG_FB_PVR2" = "y" -o "$CONFIG_FB_VOODOO1" = "y" -o \ - "$CONFIG_FB_NEOMAGIC" = "y" -o "$CONFIG_FB_INTEL" = "y" ]; then + "$CONFIG_FB_NEOMAGIC" = "y" -o "$CONFIG_FB_INTEL" = "y" -o "$CONFIG_FB_GEODE" = "y" ]; then define_tristate CONFIG_FBCON_CFB16 y else if [ "$CONFIG_FB_ATARI" = "m" -o "$CONFIG_FB_ATY" = "m" -o \ @@ -372,7 +379,7 @@ "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_RADEON" = "m" -o \ "$CONFIG_FB_INTEL" = "m" -o \ "$CONFIG_FB_PVR2" = "m" -o "$CONFIG_FB_VOODOO1" = "m" -o \ - "$CONFIG_FB_NEOMAGIC" = "m" -o "$CONFIG_FB_INTEL" = "m" ]; then + "$CONFIG_FB_NEOMAGIC" = "m" -o "$CONFIG_FB_INTEL" = "m" -o "$CONFIG_FB_GEODE" = "m" ]; then define_tristate CONFIG_FBCON_CFB16 m fi fi diff -uNr linux-2.4.31/drivers/video/Makefile linux-fb/drivers/video/Makefile --- linux-2.4.31/drivers/video/Makefile 2004-02-18 14:36:31.000000000 +0100 +++ linux-fb/drivers/video/Makefile 2005-10-13 17:50:36.000000000 +0200 @@ -119,6 +119,11 @@ obj-y += sis/sisfb.o endif +subdir-$(CONFIG_FB_GEODE) += nsc +ifeq ($(CONFIG_FB_GEODE),y) +obj-y += nsc/nsc.o +endif + subdir-$(CONFIG_FB_ATY) += aty ifeq ($(CONFIG_FB_ATY),y) obj-y += aty/atyfb.o diff -uNr linux-2.4.31/drivers/video/fbmem.c linux-fb/drivers/video/fbmem.c --- linux-2.4.31/drivers/video/fbmem.c 2005-06-01 02:56:56.000000000 +0200 +++ linux-fb/drivers/video/fbmem.c 2005-10-13 17:50:36.000000000 +0200 @@ -122,6 +122,8 @@ extern int tridentfb_setup(char*); extern int sisfb_init(void); extern int sisfb_setup(char*); +extern int nscfb_init(void); +extern int nscfb_setup(char*); extern int stifb_init(void); extern int stifb_setup(char*); extern int pmagaafb_init(void); @@ -240,6 +242,9 @@ { "sst", sstfb_init, sstfb_setup }, #endif +#ifdef CONFIG_FB_GEODE + { "nscfb", nscfb_init, nscfb_setup }, +#endif /* * Generic drivers that are used as fallbacks * @@ -504,11 +509,6 @@ if (! fb) return -ENODEV; switch (cmd) { - case FBIOGET_VSCREENINFO: - if ((i = fb->fb_get_var(&var, PROC_CONSOLE(info), info))) - return i; - return copy_to_user((void *) arg, &var, - sizeof(var)) ? -EFAULT : 0; case FBIOPUT_VSCREENINFO: if (copy_from_user(&var, (void *) arg, sizeof(var))) return -EFAULT; diff -uNr linux-2.4.31/drivers/video/nsc/Makefile linux-fb/drivers/video/nsc/Makefile --- linux-2.4.31/drivers/video/nsc/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/Makefile 2005-10-13 18:13:24.000000000 +0200 @@ -0,0 +1,44 @@ +# +# Copyright (c) 2004 Advanced Micro Devices, Inc. +# +# 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 +# +# The full GNU General Public License is included in this distribution in the +# file called COPYING +# +# +# +# +# +# +# Makefile for the Geode framebuffer driver +# +# Note! Dependencies are done automagically by 'make dep', which also +# removes any old dependencies. DON'T put your own dependencies here +# unless it's something special (ie not a .c file). +# +# Note 2! The CFLAGS definitions are now in the main makefile... + +export-objs := fbgen.o + +O_TARGET := nsc.o +EXTRA_CFLAGS := -I./gfx -I./panel -I./ddc -DOS_LINUX + +obj-y := nsc_fb.o durango.o panel.o ddc.o nsc_ioctl.o nsc_gx1_fb.o fbgen.o nsc_gx2_fb.o + +obj-m := $(O_TARGET) + +include $(TOPDIR)/Rules.make + diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc.c linux-fb/drivers/video/nsc/ddc/ddc.c --- linux-2.4.31/drivers/video/nsc/ddc/ddc.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,67 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the function prototypes and macro + * definitions. + * + * SubModule: Display Data Channel support. + * + */ + +#if defined(linux) /* Linux */ +#ifdef __KERNEL__ +#include +#include +#else +#include +#include + +/* #include */ +#endif /* __KERNEL__ */ +#elif defined(_WIN32) /* windows */ +#include +#endif + +/* TODO: generalize debug messages */ +/* undefine the retail message when not CE */ +#if !defined(_WIN32_WCE) +#define RETAILMSG(_F, _PARA ) +#endif + +#include "ddc.h" +#include "gfx_defs.h" +/*These variables are global and intiallized by init routines*/ +extern unsigned char *gfx_virt_regptr; +extern unsigned char *gfx_virt_fbptr; +extern unsigned char *gfx_virt_vidptr; +extern unsigned char *gfx_virt_vipptr; + +#define PLATFORM_DYNAMIC 1 /* runtime selection */ +#define PLATFORM_5530 1 /* 5530 based platforms */ +#define PLATFORM_x200 1 /* x200 based with ddc on gpio */ + + +/* This include file included to handle the ddc protocols */ +#include "ddc_init.c" + diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc.h linux-fb/drivers/video/nsc/ddc/ddc.h --- linux-2.4.31/drivers/video/nsc/ddc/ddc.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc.h 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,55 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the file inclusions,function prototypes and + * macro definitions. + * + * SubModule: Display Data Channel support. + * + */ + + +#ifndef _ddc_h +#define _ddc_h + +#include "gfx_rtns.h" + +#ifdef __cplusplus +extern "C" { +#endif +/* prototypes */ +void ddc_init(void); +void ddc_cleanup(void); +void nextFromList(unsigned long *xres, unsigned long *yres, unsigned long *hz); +extern int gfx_video_type; +extern unsigned char gfx_inb(unsigned short port); +extern unsigned long gfx_ind(unsigned short port); +extern void gfx_outb(unsigned short port, unsigned char data); +extern void gfx_outd(unsigned short port, unsigned long data); +#ifdef __cplusplus +} +#endif +#endif /* !_ddc_h */ + +/* END OF FILE */ diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_5530.c linux-fb/drivers/video/nsc/ddc/ddc_5530.c --- linux-2.4.31/drivers/video/nsc/ddc/ddc_5530.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_5530.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,430 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the function definitions to access the + * CS5530 I/O compaion. + * + * SubModule: Display Data Channel support. + * + */ + + +#include "ddc_5530.h" +#include "gfx_regs.h" + +/*---------------------------------------------------------------------------- + * init_5530: + * + * Description : This function is called to configure the DDC Serial Data + * line to probe the monitor. + * + * Parameters : None + * + * Returns : None + * + * Comments : This function should be invoked before readbyte or write + * byte routines. +*---------------------------------------------------------------------------- +*/ +void init_5530() +{ + RETAILMSG( 0,(TEXT("setup\n"))); + SetSDA_5530(); /* this function connfigure data line */ + WaitSCLHigh(); /* Waiting for Serial Clock Line go high*/ + ClearSCL_5530(); /* Clearing the clock line */ + WaitSCLHigh(); + ClearSCL_5530(); + WaitSCLHigh(); + requestData_5530(); /* sending the data request */ + ReadByte_5530(0); /* Read the monitor data */ + StopBit_5530(); /* Setting the stop bit */ +} + +/*---------------------------------------------------------------------------- + * ReadByte_5530 + * + * Description : This function reads the data bit by bit and setting ack + * after the one byte read. + * + * Parameters. + * ack : Gets the one byte data. + * Returns : Returning one byte information after read bit. + * + * Comments : This function should be invoked before readbyte or write + * byte routines. +*---------------------------------------------------------------------------- +*/ +unsigned char ReadByte_5530(int ack) +{ + unsigned char val = 0; + int i; + RETAILMSG( 0,(TEXT("getByte\n"))); + for (i = 0; i < 8; i++) { + val <<= 1; + val |= ReadBit(); + } + + Ack_5530(ack); + return val; +} + +/*--------------------------------------------------------------------------- + * StartBit_5530 + * + * Description : This function sending out the start bit of serial data + * + * + * Parameters : None + * + * Returns : None + * + * Comments : This function indicates the begining ddc seiral data. + * +*---------------------------------------------------------------------------- +*/ +void StartBit_5530() +{ + RETAILMSG( 0,(TEXT("startBit\n"))); + wait(DEFAULTDELAY); + SetSDA_5530(); + wait(DEFAULTDELAY); + WaitSCLHigh(); + wait(DEFAULTDELAY); + ClearSDA_5530(); + wait(DEFAULTDELAY); +} + +/*--------------------------------------------------------------------------- + * StopBit_5530. + * + * Description : This function sending out the stop bit of serial data + * + * + * Parameters : None + * + * Returns : None + * + * Comments : This function indicates the end ddc seiral data. + * +*---------------------------------------------------------------------------- +*/ +void StopBit_5530() +{ + RETAILMSG( 0,(TEXT("stopBit\n"))); + wait(DEFAULTDELAY); + WaitSCLHigh(); + wait(DEFAULTDELAY); + SetSDA_5530(); + wait(2); +} + +/*--------------------------------------------------------------------------- + * Ack_5530: + * + * Description : This sends out the ack data + * + * Parameters : + * flag : Value read in ReaByte routine is passed + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +void Ack_5530(int flag) +{ + RETAILMSG( 0,(TEXT("ACK\n"))); + wait(DEFAULTDELAY); + ClearSCL_5530(); + wait(DEFAULTDELAY); + if (flag) { + ClearSDA_5530(); + } else { + SetSDA_5530(); + } + WaitSCLHigh(); + ClearSCL_5530(); + wait(DEFAULTDELAY); + SetSDA_5530(); + RETAILMSG( 0,(TEXT("ACK Exit\n"))); +} + +/*--------------------------------------------------------------------------- + * waitForAck: + * + * Description : This routine waits the ack SDL data. + * + * Parameters : none + * + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +int waitForAck_5530() +{ + unsigned long target=0; + int i = 0; + + RETAILMSG( 0,(TEXT("waitForACK\n"))); + wait(DEFAULTDELAY); + ClearSCL_5530(); + wait(DEFAULTDELAY); + SetSDA_5530(); + +#ifndef _WIN32_WCE + /* Do this for two times (2 uSec) */ + for (i=0; i<2; i++) { + wait(DEFAULTDELAY); + if (GetSDA_5530() == 0) { + wait(DEFAULTDELAY); + WaitSCLHigh(); + return 1; + } + } + /* Time Out */ + wait(DEFAULTDELAY); + WaitSCLHigh(); + return 0; +#else + target = GetTickCount() + 2; + for (;;) { + wait(DEFAULTDELAY); + if (GetSDA_5530() == 0) + { + wait(DEFAULTDELAY); + WaitSCLHigh(); + return 1; + /* } else if(endtime > target) { */ + } else if(GetTickCount() > target) + { + wait(DEFAULTDELAY); + WaitSCLHigh(); + return 0; + } + } +#endif +} + +/*--------------------------------------------------------------------------- + * requestData. + * + * Description : This routine request the data and configure SDA to Rx mode. + * + * Parameters : None + * + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ + +void requestData_5530() +{ + RETAILMSG( 0,(TEXT("requestData\n"))); + StartBit_5530(); + SendByte(0xa0); + SendByte(0); + StopBit_5530(); + + StartBit_5530(); + SendByte(0xa1); +} + +/*************************************************************** +* H/W DEPENDENT LOW LAYER ROUTINES +***************************************************************/ +/*--------------------------------------------------------------------------- + * startXfer_5530. + * + * Description : This routine is called to sets SDA to high state when the + * transfer starts. + * Parameters : None + * Returns : None + * + * Comments : SCL should be high when toggling. +*---------------------------------------------------------------------------- +*/ +void startXfer_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + RETAILMSG( 0,(TEXT("startXfer\n"))); + data &= ~CS5530_DCFG_DDC_SCL; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data &= ~CS5530_DCFG_DDC_SDA; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data |= CS5530_DCFG_DDC_SCL; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data |= CS5530_DCFG_DDC_SDA; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} +/*--------------------------------------------------------------------------- + * endXfer_5530. + * + * Description : This routine is called to sets SDA to low state when the + * transfer ends. + * + * Parameters : None + * Returns : None + * + * Comments : SCL should be high when toggling. +*---------------------------------------------------------------------------- +*/ + +void endXfer_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + RETAILMSG( 0,(TEXT("endXfer\n"))); + data &= ~CS5530_DCFG_DDC_SCL; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data |= CS5530_DCFG_DDC_SDA; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data |= CS5530_DCFG_DDC_SCL; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + data &= ~CS5530_DCFG_DDC_SDA; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} + +/*--------------------------------------------------------------------------- + * SetSCL_5530. + * + * Description : This routine sets the serial clock line to high. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void SetSCL_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + RETAILMSG( 0,(TEXT("SetSCL\n"))); + data |= CS5530_DCFG_DDC_SCL; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} + +/*--------------------------------------------------------------------------- + * ClearSCL_5530. + * + * Description : This routine sets the serial clock line to low. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void ClearSCL_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + data &= ~CS5530_DCFG_DDC_SCL; + RETAILMSG( 0,(TEXT("DDCclockLo %X\n"),data)); + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} + +/*--------------------------------------------------------------------------- + * GetSCL_5530. + * + * Description : This routine gets the of SCL data . + * + * + * Parameters : None + * Returns : returns SCL data. + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +int GetSCL_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + RETAILMSG( 0,(TEXT("GetSCL %X\n"), data)); + return ((data & CS5530_DCFG_DDC_SCL) >> 22); +} + +/*--------------------------------------------------------------------------- + * SetSDA_5530. + * + * Description : This routine sets the serial data line to high. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void SetSDA_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + data |= CS5530_DCFG_DDC_SDA | CS5530_DCFG_DDC_OE; + RETAILMSG( 0,(TEXT("SetSDA %X\n"), data)); + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} + +/*--------------------------------------------------------------------------- + * ClearSDA_5530. + * + * Description : This routine sets the serial data line to low. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void ClearSDA_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + data &= ~CS5530_DCFG_DDC_SDA; + data |= CS5530_DCFG_DDC_OE; + RETAILMSG( 0,(TEXT("ClearSDA %X\n"), data)); + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); +} + +/*--------------------------------------------------------------------------- + * GetSDA_5530. + * + * Description : This routine gets the of SDL data . + * + * + * Parameters : None + * Returns : returns SCL data. + * + * Comments : none +*---------------------------------------------------------------------------- +*/ + +int GetSDA_5530() +{ + unsigned long data = READ_VID32(CS5530_DISPLAY_CONFIG); + data &= ~CS5530_DCFG_DDC_OE; + WRITE_VID32(CS5530_DISPLAY_CONFIG, data); + wait(2); /* 10 */ + data = READ_VID32(CS5530_DISPLAY_CONFIG); + RETAILMSG( 0,(TEXT("GetSDA 0x%8X\n"), data)); + return (data >> 31); +} diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_5530.h linux-fb/drivers/video/nsc/ddc/ddc_5530.h --- linux-2.4.31/drivers/video/nsc/ddc/ddc_5530.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_5530.h 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,54 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the function prototypes and macro + * definition to access the CS5530 I/O compaion. + * + * SubModule: Display Data Channel support. + + * + */ + +#ifndef _ddc_5530_h +#define _ddc_5530_h + + void init_5530(void); + unsigned char ReadByte_5530(int); + void StartBit_5530(void); + void StopBit_5530(void); + void Ack_5530(int); + int waitForAck_5530(void); + void requestData_5530(void); + void startXfer_5530(void); + void endXfer_5530(void); + void SetSCL_5530(void); + void ClearSCL_5530(void); + void ClearSDA_5530(void); + void SetSDA_5530(void); + int GetSDA_5530(void); + int GetSCL_5530(void); + +#endif /* !_ddc_5530_h */ + +/* END OF FILE */ diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_defs.h linux-fb/drivers/video/nsc/ddc/ddc_defs.h --- linux-2.4.31/drivers/video/nsc/ddc/ddc_defs.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_defs.h 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,112 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the macro definitions and data structure + * definitions of DDC. + * + * SubModule: Display Data Channel support. + * + */ + + +#ifndef _ddc_defs_h +#define _ddc_defs_h + +typedef struct _Predefined_DDC{ + unsigned long xres; + unsigned long yres; + unsigned long hz; +}Predefined_DDC; + +#define DEFAULTDELAY 1 /* 1 mSec */ + +/* Data locations in VESA/EDID ver1.3 format containg 128 Bytes */ +#define VESA1_VERSION 12 +#define VESA1_REVSION 13 +#define VESA1_EST_TIM1 35 +#define VESA1_EST_TIM2 36 +#define VESA1_EST_MANU_TIM 37 +#define VESA1_EST_STAND_TIM 38 + +/* defines the predefined modes */ + +Predefined_DDC EstTim1[8] ={ + {800, 600, 60}, + {800, 600, 56}, + {640, 480, 75}, + {640, 480, 72}, + {640, 480, 67}, + {640, 480, 60}, + {720, 400, 88}, + {720, 400, 70} +}; +Predefined_DDC EstTim2[8] ={ + {1280, 1024, 75}, + {1024, 768, 75}, + {1024, 768, 70}, + {1024, 768, 60}, + {1024, 768, 87}, + {832, 624, 75}, + {800, 600, 75}, + {800, 600, 72} +}; +Predefined_DDC MfgTim2[1] ={ + {1152, 870, 75} +}; + +typedef struct _DispAspectRatio{ + int xRatio; + int yRatio; +}DispAspectRatio; + +static DispAspectRatio asp[4] = { + {1, 1}, + {4, 3}, + {5, 4}, + {16, 9} +}; +static unsigned char EDID_Header[8] = { + 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00}; + +typedef struct _Platform_DDC_ops { + void (*init)(void); + unsigned char (*ReadByte)(int); + void (*StartBit)(void); + void (*StopBit)(void); + void (*Ack)(int); + int (*waitForAck)(void); + void (*requestData)(void); + void (*startXfer)(void); + void (*endXfer)(void); + void (*SetSCL)(void); + void (*ClearSCL)(void); + void (*ClearSDA)(void); + void (*SetSDA)(void); + int (*GetSDA)(void); + int (*GetSCL)(void); +} Platform_DDC_ops; + +#endif /* !_ddc_defs_h */ + +/* END OF FILE */ diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_init.c linux-fb/drivers/video/nsc/ddc/ddc_init.c --- linux-2.4.31/drivers/video/nsc/ddc/ddc_init.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_init.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,581 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the DDC initialization function + * definitions. + * + * SubModule: Display Data Channel support. + * + */ + +#include "ddc.h" +#include "ddc_defs.h" + +#define DisplayDataLength 128 +#define MAX_MODES 50 + +/*Forward prototype declarations */ +static unsigned long displaySupports; +static unsigned char displayData[DisplayDataLength]; +static void WaitSCLHigh(void); +static void getBlock(unsigned char *, int); +static void wait(int uSec); +static int ReadBit(void); +static void SendBit(int); +static void SendByte(unsigned char); +static void standardTiming(unsigned char *data); +static void predefinedSettings(unsigned char Tim, Predefined_DDC *array, + int start, int count); +static int checkHeader(void); +static void add2List(unsigned long xres,unsigned long yres,unsigned long hz); +static void sortList(void); +static void dumpList(void); + +static unsigned long Current; +static unsigned long SupportedModes[MAX_MODES]; +static unsigned long TempModes[MAX_MODES]; +static unsigned long temp; +static Platform_DDC_ops *ddc_ops=0x0; + +/* functions to support the ddc protocols are included in this file struct.*/ +#ifdef PLATFORM_5530 +#include "ddc_5530.c" + +Platform_DDC_ops ddc_5530={ + init_5530, + ReadByte_5530, + StartBit_5530, + StopBit_5530, + Ack_5530, + waitForAck_5530, + requestData_5530, + startXfer_5530, + endXfer_5530, + SetSCL_5530, + ClearSCL_5530, + ClearSDA_5530, + SetSDA_5530, + GetSDA_5530, + GetSCL_5530 +}; +#endif + +#ifdef PLATFORM_x200 +#include "ddc_x200.c" +Platform_DDC_ops ddc_x200={ + init_x200, + ReadByte_x200, + StartBit_x200, + StopBit_x200, + Ack_x200, + waitForAck_x200, + requestData_x200, + startXfer_x200, + endXfer_x200, + SetSCL_x200, + ClearSCL_x200, + ClearSDA_x200, + SetSDA_x200, + GetSDA_x200, + GetSCL_x200 +}; +#endif + +/*---------------------------------------------------------------------------- + * SortList. + * + * Description : This function used for sorting out modes in order + * + * Parameters : None + * + * Returns : None + * + * Comments : This is keep the supported modes by the hw in order. +*---------------------------------------------------------------------------- +*/ +void sortList() +{ + int i,j; + int length; + length = MAX_MODES - 1; + + for(i=0;i SupportedModes[j+1]) + { + temp = SupportedModes[j+1]; + SupportedModes[j+1] = SupportedModes[j]; + SupportedModes[j] = temp; + } + } + length--; + } + /*Now put it it descending order */ + for(i=0;i> 8) & 0xfff; + *xres = (SupportedModes[Current] >> 20) & 0xfff; + Current ++; +} + +/*---------------------------------------------------------------------------- + * dumpList. + * + * Description : This function to prepare supported mode list. + + * Parameters : None + * + * Returns : None. + * + * Comments : This may be called to check the list of modes supported. + * + *---------------------------------------------------------------------------- +*/ + +void dumpList() +{ + int unsigned long i; + for(i=0; i< Current; i++) { + RETAILMSG( 0,(_T("%d %d %d\n"), + (SupportedModes[i] >> 20) & 0xfff, + (SupportedModes[i] >> 8) & 0xfff, + SupportedModes[i] & 0xff)); + } +} + + +/*---------------------------------------------------------------------------- + * PredefiedSettings. + * + * Description : This function is to get the VESA estimated manual timing + based on manfacturer's list. + * Parameters : + * Tim : Specifies the timing data from header read from hw. + * array : Specifies the data of std mfgtiming. + * Start : Specfies the index.* not used here?. + * count : Specifies the no of mode count. + * Returns : None + * + * Comments : List is prapared based on VESA timings. + * + *---------------------------------------------------------------------------- +*/ +void predefinedSettings(unsigned char Tim, Predefined_DDC *array, + int start, int count) +{ + int i; + for (i = 0; i < count; i++) { + if(Tim & ((unsigned char)(0x1 << i))) + add2List(array[i].xres, array[i].yres, array[i].hz); + } +} +/*---------------------------------------------------------------------------- + * standardTiming. + * + * Description : This function is to make standard timing list with VESA + standard timings. + * Parameters : + * data : Pointer has mode data. + * Returns : None. + * + * Comments : None. + * + *---------------------------------------------------------------------------- +*/ +void standardTiming(unsigned char *data) +{ + unsigned long width, height; + unsigned long freq, ratio, pos; + int i; + for (i = 0; i < 8; i++) { + /* value = (HorizTiming /8) - 31 */ + pos = VESA1_EST_STAND_TIM + (i <<1); /* Each timing uses 2 Bytes as info. */ + if((data[pos] <= 0x1 ) && (data[pos + 1] <= 0x1)) + continue; + width = (data[pos] + 31) << 3; + freq = 60+(data[pos + 1] & 0x3F); + ratio = (data[pos + 1] & 0xC0) >> 6; + height = (width / asp[ratio].xRatio) * asp[ratio].yRatio; + + add2List(width, height, freq); + + RETAILMSG( 0,(_T("%d(%d %d) = %3dX%3d %dHz\n"),i, data[pos], data[pos+1], width, height, freq)); + } +} + +/*---------------------------------------------------------------------------- + * CheckHeader. + * + * Description : This function checks the read ddc header with std EDID + * header. + * Parameters : None + * + * Returns : returns TRUE if both headers are equal. + * + * Comments : This is to check the read header data. + * + *---------------------------------------------------------------------------- +*/ + +int checkHeader() +{ + int i; + for (i = 0; i < 8; i++) { + if(displayData[i] != EDID_Header[i]) + return 0; + } + return 1; +} + +/*---------------------------------------------------------------------------- + * DumpData. + * + * Description : This function looks like redundant + * + * Parameters : None + * + * Returns : + * + * Comments : None + * + *---------------------------------------------------------------------------- +*/ +static void dumpData(unsigned char *data, int length) +{ + int i; + for (i = 0; i < length; i++) { + RETAILMSG( 0,(_T("%d = %2X %3d\n"),i, data[i],data[i])); + } +} + +/*---------------------------------------------------------------------------- + * ddc_init. + * + * Description : This function detects the type of video HW and gets ddc data + * + * + * Parameters : None + * + * Returns : None + * + * Comments : This readsthe header and sort list of modes. + * + *---------------------------------------------------------------------------- +*/ + +void ddc_init() +{ + unsigned long video_hw = gfx_detect_video(); + +#ifdef PLATFORM_5530 + if (video_hw == GFX_VID_CS5530) + ddc_ops = &ddc_5530; +#endif + +#ifdef PLATFORM_x200 + if ((video_hw == GFX_VID_SC1200) && Get_9211_Details()) + ddc_ops = &ddc_x200; +#endif + + displaySupports = 0; + memset(displayData, 0x0, DisplayDataLength); + memset(SupportedModes, 0x0, sizeof(unsigned long) * MAX_MODES); + Current = 0; + + if(ddc_ops == 0x0) /* none mapped, ERROR */ + return; + + ddc_ops->startXfer(); + ddc_ops->init(); + getBlock(displayData, DisplayDataLength); + ddc_ops->endXfer(); + dumpData(displayData, DisplayDataLength); + if(checkHeader()) + { + standardTiming(displayData); + predefinedSettings(displayData[VESA1_EST_MANU_TIM], MfgTim2, 7, 1); + predefinedSettings(displayData[VESA1_EST_TIM2], EstTim2, 0, 8); + predefinedSettings(displayData[VESA1_EST_TIM1], EstTim1, 0, 8); + dumpList(); + sortList(); + dumpList(); + Current = 0; + } +} + +/*---------------------------------------------------------------------------- + * ddc_Cleanup. + * + * Description : This function will bw called at the end of ddc. + * + * + * Parameters : None + * + * Returns : None + * + * Comments : it may be enhanced. + * + *---------------------------------------------------------------------------- +*/ + +void ddc_cleanup() +{ + RETAILMSG( 0,(TEXT("DDC1_2B::~DDC1_2B\n"))); +} + + +/* Wait for microSeconds */ +void wait(int uSec) +{ + gfx_delay_milliseconds(uSec); +} + +/*---------------------------------------------------------------------------- + * getBlock. + * + * Description : This function reads the ddc data + * + * + * Parameters : + * block : data will be stored in this ponter + * length : Specifies the length of data to be read. + * Returns : None + * + * Comments : Block of data will be read by readbyte,readbit routines. + * + *---------------------------------------------------------------------------- +*/ +void getBlock(unsigned char *block, int length) +{ + + int cksum = 0; + int i, end = length - 1; + + RETAILMSG( 0,(TEXT("getBlock\n"))); + ddc_ops->requestData(); + + for (i = 0; i < length; i++) { + block[i] = ddc_ops->ReadByte((i != end)); + cksum += (int)block[i]; + } + ddc_ops->StopBit(); + + RETAILMSG( 0,(TEXT("getBlock %d\n"),cksum)); + + if ((cksum & 0xff) != 0) { + RETAILMSG( 1,(TEXT("Checksum Error\n"))); + } +} + +/*---------------------------------------------------------------------------- + * ReadBit. + * + * Description : This function read the DDC data by one bit + * + * + * Parameters : None + * Returns : One bit information by a flag. + * + * Comments : Date will be read by a bit. + * +*---------------------------------------------------------------------------- +*/ + +int ReadBit() +{ + RETAILMSG( 0,(TEXT("getBit\n"))); + wait(DEFAULTDELAY); + ddc_ops->ClearSCL(); + wait(DEFAULTDELAY); + WaitSCLHigh(); + wait(DEFAULTDELAY); + return ddc_ops->GetSDA(); +} + +/*---------------------------------------------------------------------------- + * WaitSCLHigh. + * + * Description : This function provides the conditional delay till SCL clock + * goes high. + * + * Parameters : + * data : None. + * Returns : None + * + * Comments : Date will be send by bit by bit. + * +*---------------------------------------------------------------------------- +*/ +void WaitSCLHigh() +{ + unsigned long target=0; + + RETAILMSG( 0,(TEXT("WaitSCLHigh\n"))); + ddc_ops->SetSCL(); + /* slow down trasfer */ +#ifndef _WIN32_WCE + /* introduce delay for SetSCL to work. This is not required in the + * else part, since GetTickCount() function call adds the delay + */ + wait(DEFAULTDELAY); + + for (;;) { + if (ddc_ops->GetSCL() == 1) { + break; + } + /* else if (GetTickCount() > target) { + RETAILMSG( 1,(TEXT("timeout"))); + }*/ + RETAILMSG( 0,(TEXT("WaitSCLHigh - Delay 2 u Sec\n"))); + } +#else + target = GetTickCount() + 2; + + for (;;) { + if (ddc_ops->GetSCL() == 1) { + break; + } else if (GetTickCount() > target) { + RETAILMSG( 1,(TEXT("timeout"))); + return; + } + RETAILMSG( 0,(TEXT("WaitSCLHigh - Delay 2 u Sec\n"))); + } +#endif +} + +/*---------------------------------------------------------------------------- + * SendByte. + * + * Description : This function is send one byte of data + * + * + * Parameters : + * data : Specifies the data to be send. + * Returns : None + * + * Comments : Date will be send by bit by bit. + * +*---------------------------------------------------------------------------- +*/ +void SendByte(unsigned char data) +{ + int i; + RETAILMSG( 0,(TEXT("sendByte Enter\n"))); + for (i = 7; i >= 0; i--) { + SendBit((data >> i) & 1); + } + + if (! ddc_ops->waitForAck()) { + RETAILMSG( 1,(TEXT("NACK received\n"))); + } + ddc_ops->ClearSCL(); + RETAILMSG( 0,(TEXT("sendByte Exit\n"))); +} + + +/*---------------------------------------------------------------------------- + * SendBit. + * + * Description : This function is send one bit + * + * + * Parameters : + * flag : Specifies masked data bit by a flag High or Low. + * Returns : None + * + * Comments : None. + * +*---------------------------------------------------------------------------- +*/ +void SendBit(int flag) +{ + RETAILMSG( 0,(TEXT("sendBit\n"))); + wait(DEFAULTDELAY); + ddc_ops->ClearSCL(); + wait(DEFAULTDELAY); + if (flag) { + ddc_ops->SetSDA(); + } else { + ddc_ops->ClearSDA(); + } + wait(DEFAULTDELAY); + WaitSCLHigh(); +} + diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_x200.c linux-fb/drivers/video/nsc/ddc/ddc_x200.c --- linux-2.4.31/drivers/video/nsc/ddc/ddc_x200.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_x200.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,613 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the function definitions to access the + * hardware x200 I/O compaion. + * + * SubModule: Display Data Channel support. + * + */ + +#include "ddc_x200.h" + +/* Glen Han 01/25/2001, modified code to support DORADO board + *DDC DORADO implementation with GPIO pins + *SCL is gpio 7, SDA is gpio 18, CSDDC is gpio 9 + */ +#define SCx2xx_GPIO_BASE 0x6400 +#define SCx2xx_GPDO0 0x0000 +#define SCx2xx_GPDI0 0x0004 +#define SCx2xx_GPPIN_SEL 0x0020 +#define SCx2xx_GPPIN_CFG 0x0024 +#define GPOUT (SCx2xx_GPIO_BASE + SCx2xx_GPDO0) +#define GPIN (SCx2xx_GPIO_BASE + SCx2xx_GPDI0) +#define GPSEL (SCx2xx_GPIO_BASE + SCx2xx_GPPIN_SEL) +#define GPCFG (SCx2xx_GPIO_BASE + SCx2xx_GPPIN_CFG) +#define OUTPUT_ENABLE 0x00000003 +#define INPUT_ENABLE 0x00000000 +#define CLOCK_PIN_MASK 0x00000080 +#define DATA_PIN_MASK 0x00040000 +#define CSDDC_PIN_MASK 0x00000200 +#define CLOCK_PIN_SEL 0x00000007 +#define DATA_PIN_SEL 0x00000012 +#define CSDDC_PIN_SEL 0x00000009 + +int Get_9211_Details() +{ + unsigned long pmr; + +#define SC_CB_ADDR 0x9000 +#define SC_PMR 0x30 +#define SC_PMR_TFTIDE 0x01000000 +#define SC_PMR_TFTPP 0x00800000 +#define SC_PMR_ETFT 0x00000400 + + pmr = gfx_ind(SC_CB_ADDR + SC_PMR); + RETAILMSG( 1,(TEXT("Get_9211_Details %X\n"),pmr)); + + if (!(pmr & SC_PMR_TFTIDE)) { + // The SC_PMR_TFTIDE bit is off, go check if the TFT is + // multiplexed with the parallel port. + if (pmr & SC_PMR_TFTPP) { + pmr |= SC_PMR_ETFT; // Make sure this is on. + gfx_outd(SC_CB_ADDR + SC_PMR, pmr); + } else { + // Failed. The hardware configuration precludes a TFT. + return(0); + } + } + return(1); +} + +/*---------------------------------------------------------------------------- + * init_x200. + * + * Description : This function is called to configure the Serial Data + * line to probe the monitor. + * + * Parameters : None + * + * Returns : None + * + * Comments : This function should be invoked before readbyte or write + * byte routines. +*---------------------------------------------------------------------------- +*/ +void init_x200() +{ + RETAILMSG( 0,(TEXT("SCx200 setup\n"))); + requestData_x200(); + ReadByte_x200(0); + StopBit_x200(); +} +/*---------------------------------------------------------------------------- + * ReadByte_x200. + * + * Description : This function reads the data bit by bit and setting ack + * after the one byte read. + * + * Parameters + * ack : Gets the one byte data. + * Returns : Returning one byte information after read bit. + * + * Comments : This function should be invoked before readbyte or write + * : byte routines. +*---------------------------------------------------------------------------- +*/ + +unsigned char ReadByte_x200(int ack) +{ + unsigned char val = 0; + int i; + RETAILMSG( 0,(TEXT("getByte\n"))); + ConfigSDAin_x200(); + for (i = 0; i < 8; i++) { + val <<= 1; + val |= ReadBit(); + } + + Ack_x200(ack); + return val; +} +/*--------------------------------------------------------------------------- + * StartBit_x200. + * + * Description : This function sending out the start bit of serial data + * + * + * Parameters : None + * + * Returns : None + * + * Comments : This function indicates the begining ddc seiral data. + * +*---------------------------------------------------------------------------- +*/ +void StartBit_x200() +{ + RETAILMSG( 0,(TEXT("startBit\n"))); + wait(DEFAULTDELAY); + ClearSCL_x200(); + wait(DEFAULTDELAY); + SetSDA_x200(); + ConfigSDAout_x200(); + wait(DEFAULTDELAY); + WaitSCLHigh(); + wait(DEFAULTDELAY); + ClearSDA_x200(); + wait(DEFAULTDELAY); +} + +/*--------------------------------------------------------------------------- + * StopBit_x200. + * + * Description : This function sending out the stop bit of serial data + * + * + * Parameters : None + * + * Returns : None + * + * Comments : This function indicates the end ddc seiral data. + * +*---------------------------------------------------------------------------- +*/ +void StopBit_x200() +{ + RETAILMSG( 0,(TEXT("stopBit\n"))); + /* always follow master ack, already in SDA out mode */ + wait(DEFAULTDELAY); + ClearSCL_x200(); + wait(DEFAULTDELAY); + ClearSDA_x200(); + wait(DEFAULTDELAY); + WaitSCLHigh(); + wait(DEFAULTDELAY); + SetSDA_x200(); + wait(2); +} + +/*--------------------------------------------------------------------------- + * Ack_x200. + * + * Description : This sends out the ack data + * + * Parameters + * flag : Value read in ReaByte routine is passed + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +void Ack_x200(int flag) +{ + RETAILMSG( 0,(TEXT("ACK\n"))); + wait(DEFAULTDELAY); + ClearSCL_x200(); + wait(DEFAULTDELAY); + if (flag) { + ClearSDA_x200(); + } else { + SetSDA_x200(); + } + ConfigSDAout_x200(); + WaitSCLHigh(); + wait(10); /* let transmitter has time to sense it */ + ClearSCL_x200(); + wait(DEFAULTDELAY); + SetSDA_x200(); /* is it real necessary? */ + RETAILMSG( 0,(TEXT("ACK Exit\n"))); +} + +/*--------------------------------------------------------------------------- + * waitForAck: + * + * Description : This routine waits the ack SDL data. + * + * Parameters : none + * + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +int waitForAck_x200() +{ + unsigned long target; + int i = 0; + + RETAILMSG( 0,(TEXT("waitForACK\n"))); + wait(DEFAULTDELAY); + ClearSCL_x200(); + wait(DEFAULTDELAY); + SetSDA_x200(); + ConfigSDAin_x200(); + WaitSCLHigh(); + wait(5); + +#ifndef _WIN32_WCE + /* Try for two times (2 uSec) */ + for (i=0; i<2; i++) { + wait(DEFAULTDELAY); + if (GetSDA_x200() == 0) { + return 1; + } + } + /* time out */ + return 0; + +#else + target = GetTickCount() + 2; + for (;;) { + wait(DEFAULTDELAY); + if (GetSDA_x200() == 0) { + return 1; + } else if(GetTickCount() > target) { + return 0; + } + } +#endif +} + +/*--------------------------------------------------------------------------- + * requestData. + * + * Description : This routine request the data and configure SDA to Rx mode. + * + * Parameters : none + * + * Returns : None + * + * Comments : None +*---------------------------------------------------------------------------- +*/ + +void requestData_x200() +{ + RETAILMSG( 0,(TEXT("requestData\n"))); + StartBit_x200(); + SendByte(0xa0); + ConfigSDAout_x200(); + SendByte(0); + + StartBit_x200(); + SendByte(0xa1); +} + + +/*--------------------------------------------------------------------------- + * startXfer_x200. + * + * Description : This routine is called to sets SDA and SCL outto high state + when the transfer starts. + * To start DDC transfer + * 1. Enable DDC access by making chip control pin active low + * 2. Configuer SCL and SDA as output pins + * 3. Issue an stop condition to clean up any possible slave device mess + * caused by other application. + *. Toggle clock several times to let slave device finish + * internal housekeeping job +* Parameters : None + * Returns : None + * + * Comments : SCL should be high when toggling. +*---------------------------------------------------------------------------- +*/ + +void startXfer_x200() +{ + int i; + RETAILMSG( 0,(TEXT("startXfer\n"))); + ClearCSDDC_x200(); + wait(10); + ConfigSCLout_x200(); + ConfigSDAout_x200(); + StopBit_x200(); + wait(10); + for (i = 0; i < 10; i++) + { + ClearSCL_x200(); + wait(DEFAULTDELAY); + SetSCL_x200(); + wait(DEFAULTDELAY); + } +} + +/*--------------------------------------------------------------------------- + * endXfer_x200. + * + * Description : This routine is called to sets SDA to low state when the + * transfer ends. + * + * Parameters : None + * Returns : None + * + * Comments : SCL should be high when toggling. +*---------------------------------------------------------------------------- +*/ +void endXfer_x200() +{ + int i; + wait(DEFAULTDELAY); + for (i = 0; i < 10; i++) + { + ClearSCL_x200(); + wait(DEFAULTDELAY); + SetSCL_x200(); + wait(DEFAULTDELAY); + } + ConfigSDAin_x200(); /* tristate pin */ + ConfigSCLin_x200(); /* tristate pin */ + RETAILMSG( 0,(TEXT("endXfer\n"))); + wait(10); +} + + +/*************************************************************** +* H/W DEPENDENT LOW LAYER ROUTINES +****************************************************************/ + +/*--------------------------------------------------------------------------- + * SetCSDDC_x200. + * + * Description : This routine disable DDC acesss and enable cs9211 serial + access. + *Set CSDDC chip select control pin high to disable DDC access + * and enable cs9211 serial access + * Parameters : None + * Returns : None + * + * Comments : None. +*---------------------------------------------------------------------------- +*/ +void SetCSDDC_x200() +{ + unsigned long data = gfx_ind(GPIN); + data |= CSDDC_PIN_MASK; + RETAILMSG( 0,(TEXT("Set CSDDC to disable DDC access \n"))); + gfx_outd(GPOUT, data); + wait(10); /*10 */ +} + +/*--------------------------------------------------------------------------- + * ClearCSDDC_x200. + * + * Description : This routine enable DDC acesss and disble cs9211 serial + access. + * Set CSDDC chip select control pin low to enable DDC access + *and disable cs9211 serial access + * Parameters : None + * Returns : None + * + * Comments : None. +*---------------------------------------------------------------------------- +*/ +void ClearCSDDC_x200() +{ + unsigned long data = gfx_ind(GPIN); + data &= ~CSDDC_PIN_MASK; + RETAILMSG( 0,(TEXT("Clear CSDDC to enable DDC access %X\n"),data)); + gfx_outd(GPOUT, data); + wait(10); /* 10 */ +} + +/*--------------------------------------------------------------------------- + * SetSCL_x200. + * + * Description : This routine sets the serial clock line to high. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void SetSCL_x200() +{ + unsigned long data = gfx_ind(GPIN); + data |= CLOCK_PIN_MASK; + RETAILMSG( 0,(TEXT("SetSCL\n"))); + gfx_outd(GPOUT, data); +} + + +/*--------------------------------------------------------------------------- + * ClearSCL_x200. + * + * Description : This routine sets the serial clock line to low. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void ClearSCL_x200() +{ + unsigned long data = gfx_ind(GPIN); + data &= ~CLOCK_PIN_MASK; + RETAILMSG( 0,(TEXT("DDCclockLo %X\n"),data)); + gfx_outd(GPOUT, data); +} +/*--------------------------------------------------------------------------- + * GetSCL_x200. + * + * Description : This routine gets the of SCL data . + * + * + * Parameters : None + * Returns : returns SCL data. + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +int GetSCL_x200() +{ + unsigned long data = gfx_ind(GPIN); + RETAILMSG( 0,(TEXT("GetSCL %X\n"), data)); + data &= CLOCK_PIN_MASK; + return (data >> CLOCK_PIN_SEL); +} + + +/*--------------------------------------------------------------------------- + * SetSDA_x200. + * + * Description : This routine sets the serial data line to high. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void SetSDA_x200() +{ + unsigned long data = gfx_ind(GPIN); + data |= DATA_PIN_MASK; + RETAILMSG( 0,(TEXT("SetSDA %X\n"), data)); + gfx_outd(GPOUT, data); +} + +/*--------------------------------------------------------------------------- + * ClearSDA_x200. + * + * Description : This routine sets the serial data line to low. + * + * + * Parameters : None + * Returns : None + * + * Comments : none +*---------------------------------------------------------------------------- +*/ +void ClearSDA_x200() +{ + unsigned long data = gfx_ind(GPIN); + data &= ~DATA_PIN_MASK; + RETAILMSG( 0,(TEXT("ClearSDA %X\n"), data)); + gfx_outd(GPOUT, data); +} + +/*--------------------------------------------------------------------------- + * GetSDA_x200. + * + * Description : This routine gets the of SDL data . + * + * + * Parameters : None + * Returns : returns SCL data. + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +int GetSDA_x200() +{ + unsigned long data = gfx_ind(GPIN); + RETAILMSG( 0,(TEXT("GetSDA 0x%8X\n"), data)); + data &= DATA_PIN_MASK; + return (data >> DATA_PIN_SEL); +} + +/*--------------------------------------------------------------------------- + * ConfigSDAout_x200. + * + * Description : This routiine selects GPIO base and sets SDA pin for out. + * + * + * Parameters : None + * Returns : None. + * + * Comments : None +*---------------------------------------------------------------------------- +*/ + +void ConfigSDAout_x200() +{ + gfx_outd(GPSEL, DATA_PIN_SEL); + gfx_outd(GPCFG, OUTPUT_ENABLE); + wait(5); //10 +} +/*--------------------------------------------------------------------------- + * ConfigSDAin_x200. + * + * Description : This routiine selects GPIO base and sets SDA pin for in. + * + * + * Parameters : None + * Returns : None. + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +void ConfigSDAin_x200() +{ + gfx_outd(GPSEL, DATA_PIN_SEL); + gfx_outd(GPCFG, INPUT_ENABLE); + wait(5); /* 10 */ +} +/*--------------------------------------------------------------------------- + * ConfigSCLout_x200. + * + * Description : This routiine selects GPIO base and sets SCL pin for in. + * + * + * Parameters : None + * Returns : None. + * + * Comments : None +*---------------------------------------------------------------------------- +*/ + + + +void ConfigSCLout_x200() +{ + ClearSCL_x200(); /* don't disturb any device */ + gfx_outd(GPSEL, CLOCK_PIN_SEL); + gfx_outd(GPCFG, OUTPUT_ENABLE); + wait(5); //10 +} + +/*--------------------------------------------------------------------------- + * ConfigSCLin_x200. + * + * Description : This routiine selects GPIO base and sets SCL pin for in. + * + * + * Parameters : None + * Returns : None. + * + * Comments : None +*---------------------------------------------------------------------------- +*/ +void ConfigSCLin_x200() +{ + gfx_outd(GPSEL, CLOCK_PIN_SEL); + gfx_outd(GPCFG, INPUT_ENABLE); + wait(5); /* 10 */ +} diff -uNr linux-2.4.31/drivers/video/nsc/ddc/ddc_x200.h linux-fb/drivers/video/nsc/ddc/ddc_x200.h --- linux-2.4.31/drivers/video/nsc/ddc/ddc_x200.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/ddc_x200.h 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * File Contents: This file contains the function prototypes to access the + * hardware x200 I/O compaion. + * + * SubModule: Display Data Channel support. + * + */ + +#ifndef _ddc_x200_h +#define _ddc_x200_h + +void init_x200(void); +int waitForAck_x200(void); +void SetCSDDC_x200(void); +void ClearCSDDC_x200(void); +void SetSCL_x200(void); +void ClearSCL_x200(void); +int GetSCL_x200(void); +void SetSDA_x200(void); +void ClearSDA_x200(void); +int GetSDA_x200(void); +void ConfigSDAout_x200(void); +void ConfigSDAin_x200(void); +void ConfigSCLout_x200(void); +void ConfigSCLin_x200(void); +void startXfer_x200(void); +void endXfer_x200(void); +void requestData_x200(void); +unsigned char ReadByte_x200(int); +void StartBit_x200(void); +void StopBit_x200(void); +void Ack_x200(int); + +#endif /* __ddc_x200_h */ diff -uNr linux-2.4.31/drivers/video/nsc/ddc/readme.txt linux-fb/drivers/video/nsc/ddc/readme.txt --- linux-2.4.31/drivers/video/nsc/ddc/readme.txt 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc/readme.txt 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,121 @@ +DDC Library +Release 1.1.1 +OS - Can be used in all OS's. +Feb 28, 2003 +Developer - Sarma Kolluru + +----------------------------------------------------------------------------- +PRODUCT INFORMATION +----------------------------------------------------------------------------- +DDC library is set of functions enabling the driver to give DDC support. +The DDC library is supported on Centaurus and Dorado. +The DDC library can detect the resolutions supported by the monitor +connected to the VGA connector. + + \readme.txt This file + +----------------------------------------------------------------------------- +BUILD INSTRUCTIONS +----------------------------------------------------------------------------- +The DDC subdirectory needs to be copied in the driver directory. +- Run "/root/crlf/crlf -a" in Linux OS. +----------------------------------------------------------------------------- +INSTALLATION INSTRUCTIONS +----------------------------------------------------------------------------- +There is no instalation and to be treaded as a driver source code extension. +----------------------------------------------------------------------------- +UNIT TEST +DDC library when compiled is a part of the driver and cannot be unit tested. +----------------------------------------------------------------------------- + +----------------------------------------------------------------------------- +REVISION HISTORY +----------------------------------------------------------------------------- +Version changes v1.1.1 02/28/03 +----------------------------------------------------------------------------- +Dependencies: + - crlf v1.0.1 + +----------------------------------------------------------------------------- +FUNCTIONAL CHANGES +----------------------------------------------------------------------------- +Added National Copyright header which replaced the GPL and BSD.. +----------------------------------------------------------------------------- +DEFECTS CORRECTED +----------------------------------------------------------------------------- +- None listed +----------------------------------------------------------------------------- +FILE CHANGES + ddc_init.c + ddc_defs.h + ddc_x200.c + ddc_x200.h + ddc_5530.c + ddc_5530.h + ddc.c + ddc.h +----------------------------------------------------------------------------- +Version changes v1.1.0 01/23/03 +----------------------------------------------------------------------------- +Dependencies: + - crlf v1.0.1 + +----------------------------------------------------------------------------- +FUNCTIONAL CHANGES +----------------------------------------------------------------------------- +On SCx200 based platforms the DDC support is provided through 9211. +If we can't find 9211 support then we have to return with error. +This can be seen on Krill platform. +----------------------------------------------------------------------------- +DEFECTS CORRECTED +----------------------------------------------------------------------------- +- None listed +----------------------------------------------------------------------------- +FILE CHANGES + ddc_init.c + ddc_x200.c +----------------------------------------------------------------------------- +Version changes v1.0.3 06/06/01 +----------------------------------------------------------------------------- +Dependencies: + - crlf v1.0.1 + - Durango 2.31.00 + +----------------------------------------------------------------------------- +FUNCTIONAL CHANGES +----------------------------------------------------------------------------- +Function's w/o parameters should have void. +----------------------------------------------------------------------------- +DEFECTS CORRECTED +----------------------------------------------------------------------------- +- None listed +----------------------------------------------------------------------------- +FILE CHANGES + ddc_init.c + ddc_defs.h + ddc_x200.c + ddc_x200.h + ddc_5530.h + ddc.h +----------------------------------------------------------------------------- +Version changes v1.0.2 04/26/01 +----------------------------------------------------------------------------- +Dependencies: + - Durango 2.29.00 + +----------------------------------------------------------------------------- +FUNCTIONAL CHANGES +----------------------------------------------------------------------------- +Got rid of WINNT defines and NT code. The code is made generalised and +ifdef only for WINCE. + +----------------------------------------------------------------------------- +DEFECTS CORRECTED +----------------------------------------------------------------------------- +- None listed +----------------------------------------------------------------------------- +FILE CHANGES + ddc_5530.c + ddc_x200.c + ddc_init.c +----------------------------------------------------------------------------- diff -uNr linux-2.4.31/drivers/video/nsc/ddc.c linux-fb/drivers/video/nsc/ddc.c --- linux-2.4.31/drivers/video/nsc/ddc.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/ddc.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,65 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * Project: Geode Frame buffer device driver + * + */ + +#include +#ifdef CONFIG_FB_GEODE_DDC +#if defined(linux) /* Linux */ +#ifdef __KERNEL__ +#include +#include +#else +#include +#include + +/* #include */ +#endif /* __KERNEL__ */ +#elif defined(_WIN32) /* windows */ +#include +#endif + +/* TODO: generalize debug messages */ +/* undefine the retail message when not CE */ +#if !defined(_WIN32_WCE) +#define RETAILMSG(_F, _PARA ) +#endif + +#include "ddc.h" +#include "gfx_defs.h" +/*These variables are global and intiallized by init routines*/ +extern unsigned char *gfx_virt_regptr; +extern unsigned char *gfx_virt_fbptr; +extern unsigned char *gfx_virt_vidptr; +extern unsigned char *gfx_virt_vipptr; + +#define PLATFORM_DYNAMIC 1 /* runtime selection */ +#define PLATFORM_5530 1 /* 5530 based platforms */ +#define PLATFORM_x200 1 /* x200 based with ddc on gpio */ + +/* This include file included to handle the ddc protocols */ +#include "ddc_init.c" +#endif diff -uNr linux-2.4.31/drivers/video/nsc/durango.c linux-fb/drivers/video/nsc/durango.c --- linux-2.4.31/drivers/video/nsc/durango.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/durango.c 2005-10-13 17:50:36.000000000 +0200 @@ -0,0 +1,517 @@ +/* + * + * Copyright (c) 2004 Advanced Micro Devices, Inc. + * + * 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 + * + * The full GNU General Public License is included in this distribution in the + * file called COPYING + * + * + * + * + * This is the main file used to add Durango graphics support to a software + * project. The main reason to have a single file include the other files + * is that it centralizes the location of the compiler options. This file + * should be tuned for a specific implementation, and then modified as needed + * for new Durango releases. The releases.txt file indicates any updates to + * this main file, such as a new definition for a new hardware platform. + * + * In other words, this file should be copied from the Durango source files + * once when a software project starts, and then maintained as necessary. + * It should not be recopied with new versions of Durango unless the + * developer is willing to tune the file again for the specific project. + * + * COMPILER OPTIONS + * These compiler options specify how the Durango routines are compiled + * for the different hardware platforms. For best performance, a driver + * would build for a specific platform. The "dynamic" switches are set + * by diagnostic applications such as Darwin that will run on a variety + * of platforms and use the appropriate code at runtime. Each component + * may be separately dynamic, so that a driver has the option of being + * tuned for a specific 2D accelerator, but will still run with a variety + * of chipsets. + * + */ + + +#include + +#define GFX_DISPLAY_DYNAMIC 1 /* runtime selection */ +#define GFX_DISPLAY_GU1 1 /* 1st generation display controller */ +#define GFX_DISPLAY_GU2 1 /* 2nd generation display controller */ + +#define GFX_INIT_DYNAMIC 1 /* runtime selection */ +#define GFX_INIT_GU1 1 /* Geode family */ +#define GFX_INIT_GU2 1 /* Redcloud */ + +#define GFX_MSR_DYNAMIC 1 /* runtime selection */ +#define GFX_MSR_REDCLOUD 1 /* Redcloud */ + +#define GFX_2DACCEL_DYNAMIC 1 /* runtime selection */ +#define GFX_2DACCEL_GU1 1 /* 1st generation 2D accelerator */ +#define GFX_2DACCEL_GU2 1 /* 2nd generation 2D accelerator */ + +#define GFX_VIDEO_DYNAMIC 1 /* runtime selection */ +#define GFX_VIDEO_CS5530 1 /* support for CS5530 */ +#define GFX_VIDEO_SC1200 1 /* support for SC1200 */ +#define GFX_VIDEO_REDCLOUD 1 /* support for Redcloud */ + +#define GFX_VIP_DYNAMIC 1 /* runtime selection */ +#define GFX_VIP_SC1200 1 /* support for SC1200 */ + +#define GFX_DECODER_DYNAMIC 1 /* runtime selection */ +#define GFX_DECODER_SAA7114 1 /* Philips SAA7114 decoder */ + +#define GFX_TV_DYNAMIC 1 /* runtime selection */ +#define GFX_TV_FS451 0 /* Focus Enhancements FS450 */ +#define GFX_TV_SC1200 1 /* SC1200 integrated TV encoder */ + +#define GFX_I2C_DYNAMIC 1 /* runtime selection */ +#define GFX_I2C_ACCESS 1 /* support for ACCESS.BUS */ +#define GFX_I2C_GPIO 1 /* support for CS5530 GPIOs */ + +#define GFX_VGA_DYNAMIC 1 /* runtime selection */ +#define GFX_VGA_GU1 1 /* 1st generation graphics unit */ + +#define FB4MB 1 /* Set to use 4Mb video ram for Pyramid */ + +#define GFX_NO_IO_IN_WAIT_MACROS 1 /* Set to remove I/O accesses in GP bit testing */ + +/* ROUTINES TO READ VALUES + * These are routines used by Darwin or other diagnostics to read the + * current state of the hardware. Display drivers or embedded applications can + * reduce the size of the Durango code by not including these routines. + */ +#define GFX_READ_ROUTINES 1 /* add routines to read values */ + +/* HEADER FILE FOR DURANGO ROUTINE DEFINITIONS + * Needed since some of the Durango routines call other Durango routines. + * Also defines the size of chipset array (GFX_CSPTR_SIZE). + */ +#include "gfx_rtns.h" /* routine definitions */ +#include "gfx_priv.h" + +#ifndef CONFIG_FB_GEODE_TV +#undef GFX_TV_DYNAMIC +#undef GFX_TV_FS451 +#undef GFX_TV_SC1200 +#ifndef CONFIG_FB_GEODE_GAL +#undef GFX_VIP_DYNAMIC +#undef GFX_VIP_SC1200 +#undef GFX_DECODER_DYNAMIC +#undef GFX_DECODER_SAA7114 +#undef GFX_I2C_DYNAMIC +#undef GFX_I2C_ACCESS +#undef GFX_I2C_GPIO +#endif +#endif + +/* VARIABLES USED FOR RUNTIME SELECTION + * If part of the graphics subsystem is declared as dynamic, then the + * following variables are used to specify which platform has been detected. + * The variables are set in the "gfx_detect_cpu" routine. The values should + * be bit flags to allow masks to be used to check for multiple platforms. + */ + +#if GFX_DISPLAY_DYNAMIC +int gfx_display_type = 0; +#endif + +#if GFX_INIT_DYNAMIC +int gfx_init_type = 0; +#endif + +#if GFX_MSR_DYNAMIC +int gfx_msr_type = 0; +#endif + +#if GFX_2DACCEL_DYNAMIC +int gfx_2daccel_type = 0; +#endif + +#if GFX_VIDEO_DYNAMIC +int gfx_video_type = 0; +#endif + +#if GFX_VIP_DYNAMIC +int gfx_vip_type = 0; +#endif + +#if GFX_DECODER_DYNAMIC +int gfx_decoder_type = 0; +#endif + +#if GFX_TV_DYNAMIC +int gfx_tv_type = 0; +#endif + +#if GFX_I2C_DYNAMIC +int gfx_i2c_type = 0; +#endif + +#if GFX_VGA_DYNAMIC +int gfx_vga_type = 0; +#endif + +#ifndef _XOPEN_SOURCE +#define xf86DrvMsg(a,b,format, args...) printk(format, ##args) +#endif + +/* DEFINE POINTERS TO MEMORY MAPPED REGIONS + * These pointers are used by the Durango routines to access the hardware. + * The variables must be set by the project's initialization code after + * mapping the regions in the appropriate manner. + */ + +/* DEFINE VIRTUAL ADDRESSES */ +/* Note: These addresses define the starting base expected by all */ +/* Durango offsets. Under an OS that requires these pointers */ +/* to be mapped to linear addresses (i.e Windows), it may not */ +/* be possible to keep these base offsets. In these cases, */ +/* the addresses are modified to point to the beginning of the */ +/* relevant memory region and the access macros are adjusted */ +/* to subtract the offset from the default base. For example, */ +/* the register pointer could be moved to be 0x40008000, while */ +/* the WRITE_REG* macros are modified to subtract 0x8000 from */ +/* the offset. */ + +unsigned char *gfx_virt_regptr = (unsigned char *)0x40000000; +unsigned char *gfx_virt_fbptr = (unsigned char *)0x40800000; +unsigned char *gfx_virt_vidptr = (unsigned char *)0x40010000; +unsigned char *gfx_virt_vipptr = (unsigned char *)0x40015000; +unsigned char *gfx_virt_spptr = (unsigned char *)0x40000000; +unsigned char *gfx_virt_gpptr = (unsigned char *)0x40000000; + +/* DEFINE PHYSICAL ADDRESSES */ +unsigned char *gfx_phys_regptr = (unsigned char *)0x40000000; +unsigned char *gfx_phys_fbptr = (unsigned char *)0x40800000; +unsigned char *gfx_phys_vidptr = (unsigned char *)0x40010000; +unsigned char *gfx_phys_vipptr = (unsigned char *)0x40015000; + +/* HEADER FILE FOR GRAPHICS REGISTER DEFINITIONS + * This contains only constant definitions, so it should be able to be + * included in any software project as is. + */ +#include "gfx_regs.h" /* graphics register definitions */ + +/* HEADER FILE FOR REGISTER ACCESS MACROS + * This file contains the definitions of the WRITE_REG32 and similar macros + * used by the Durango routines to access the hardware. The file assumes + * that the environment can handle 32-bit pointer access. If this is not + * the case, or if there are special requirements, then this header file + * should not be included and the project must define the macros itself. + * (A project may define WRITE_REG32 to call a routine, for example). + */ +#include "gfx_defs.h" /* register access macros */ + +/* IO MACROS AND ROUTINES + * These macros must be defined before the initialization or I2C + * routines will work properly. + */ + +#if defined(OS_WIN32) /* For Windows */ + +/* VSA II CALL */ + +void +gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr, + unsigned long *ptrHigh, unsigned long *ptrLow) +{ + unsigned long temp1, temp2; + + _asm { + mov dx, 0x0AC1C + mov eax, 0x0FC530007 + out dx, eax add dl, 2 mov ecx, msrAddr mov cx, msrReg in ax, dx; + EDX:EAX will contain MSR contents.mov temp1, edx mov temp2, eax} + + *ptrHigh = temp1; + *ptrLow = temp2; +} + +void +gfx_msr_asm_write(unsigned short msrReg, unsigned long msrAddr, + unsigned long *ptrHigh, unsigned long *ptrLow) +{ + unsigned long temp1 = *ptrHigh; + unsigned long temp2 = *ptrLow; + + _asm { + + mov dx, 0x0AC1C + mov eax, 0x0FC530007 out dx, eax add dl, 2 mov ecx, msrAddr; + ECX contains msrAddr | msrReg mov cx, msrReg; + mov ebx, temp1; + + mov eax, temp2; + mov esi, 0; + mov edi, 0; + out dx, ax; + MSR is written at this point} +} + +unsigned char +gfx_inb(unsigned short port) +{ + unsigned char data; + + _asm { + pushf mov dx, port in al, dx mov data, al popf} + return (data); +} + +unsigned short +gfx_inw(unsigned short port) +{ + unsigned short data; + + _asm { + pushf mov dx, port in ax, dx mov data, ax popf} + return (data); +} + +unsigned long +gfx_ind(unsigned short port) +{ + unsigned long data; + + _asm { + pushf mov dx, port in eax, dx mov data, eax popf} + return (data); +} + +void +gfx_outb(unsigned short port, unsigned char data) +{ + _asm { + pushf mov al, data mov dx, port out dx, al popf} +} + +void +gfx_outw(unsigned short port, unsigned short data) +{ + _asm { + pushf mov ax, data mov dx, port out dx, ax popf} +} + +void +gfx_outd(unsigned short port, unsigned long data) +{ + _asm { + pushf mov eax, data mov dx, port out dx, eax popf} +} + +#elif defined(OS_VXWORKS) || defined (OS_LINUX) /* VxWorks and Linux */ +#if defined(OS_LINUX) +#include "asm/msr.h" +#endif + +void +gfx_msr_asm_read(unsigned short msrReg, unsigned long msrAddr, + unsigned long *ptrHigh, unsigned long *ptrLow) +{ +#if 1 + unsigned long addr, val1, val2; + + addr = msrAddr | (unsigned long)msrReg; +#if 0 + __asm__ __volatile__("rdmsr":"=a"(val1), "=d"(val2):"c"(addr)); +#else + rdmsr(addr, val1, val2); +#endif + + *ptrHigh = val2; + *ptrLow = val1; +#endif +} + +void +gfx_msr_asm_write(unsigned short msrReg, unsigned long msrAddr, + unsigned long *ptrHigh, unsigned long *ptrLow) +{ +#if 1 + unsigned long addr, val1, val2; + + val2 = *ptrHigh; + val1 = *ptrLow; + +#if 1 + addr = msrAddr | (unsigned long)msrReg; +#else + addr = (msrAddr & 0xFFFF0000) | (unsigned long)msrReg; +#endif +#if 0 + __asm__ __volatile__("wrmsr"::"c"(addr), "a"(val1), "d"(val2)); +#else + wrmsr(addr, val1, val2); +#endif +#endif +} + +unsigned char +gfx_inb(unsigned short port) +{ + unsigned char value; + __asm__ volatile ("inb %1,%0":"=a" (value):"d"(port)); + + return value; +} + +unsigned short +gfx_inw(unsigned short port) +{ + unsigned short value; + __asm__ volatile ("in %1,%0":"=a" (value):"d"(port)); + + return value; +} + +unsigned long +gfx_ind(unsigned short port) +{ + unsigned long value; + __asm__ volatile ("inl %1,%0":"=a" (value):"d"(port)); + + return value; +} + +void +gfx_outb(unsigned short port, unsigned char data) +{ + __asm__ volatile ("outb %0,%1"::"a" (data), "d"(port)); +} + +void +gfx_outw(unsigned short port, unsigned short data) +{ + __asm__ volatile ("out %0,%1"::"a" (data), "d"(port)); +} + +void +gfx_outd(unsigned short port, unsigned long data) +{ + __asm__ volatile ("outl %0,%1"::"a" (data), "d"(port)); +} + +#else /* else nothing */ + +unsigned char +gfx_inb(unsigned short port) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ + return (0); +} + +unsigned short +gfx_inw(unsigned short port) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ + return (0); +} + +unsigned long +gfx_ind(unsigned short port) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ + return (0); +} + +void +gfx_outb(unsigned short port, unsigned char data) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ +} + +void +gfx_outw(unsigned short port, unsigned short data) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ +} + +void +gfx_outd(unsigned short port, unsigned long data) +{ + /* ADD OS SPECIFIC IMPLEMENTATION */ +} +#endif + +#define INB(port) gfx_inb(port) +#define INW(port) gfx_inw(port) +#define IND(port) gfx_ind(port) +#define OUTB(port, data) gfx_outb(port, data) +#define OUTW(port, data) gfx_outw(port, data) +#define OUTD(port, data) gfx_outd(port, data) + +/* INITIALIZATION ROUTINES + * These routines are used during the initialization of the driver to + * perform such tasks as detecting the type of CPU and video hardware. + * The routines require the use of IO, so the above IO routines need + * to be implemented before the initialization routines will work + * properly. + */ + +#include "gfx_init.c" + +/* INCLUDE MSR ACCESS ROUTINES */ + +#include "gfx_msr.c" + +/* INCLUDE GRAPHICS ENGINE ROUTINES + * These routines are used to program the 2D graphics accelerator. If + * the project does not use graphics acceleration (direct frame buffer + * access only), then this file does not need to be included. + */ +#include "gfx_rndr.c" /* graphics engine routines */ + +/* INCLUDE DISPLAY CONTROLLER ROUTINES + * These routines are used if the display mode is set directly. If the + * project uses VGA registers to set a display mode, then these files + * do not need to be included. + */ +#include "gfx_mode.h" /* display mode tables */ +#include "gfx_disp.c" /* display controller routines */ + +/* INCLUDE VIDEO OVERLAY ROUTINES + * These routines control the video overlay hardware. + */ +#include "gfx_vid.c" /* video overlay routines */ + +/* VIDEO PORT AND VIDEO DECODER ROUTINES + * These routines rely on the I2C routines. + */ +#include "gfx_vip.c" /* video port routines */ +#include "gfx_dcdr.c" /* video decoder routines */ + +/* I2C BUS ACCESS ROUTINES + * These routines are used by the video decoder and possibly an + * external TV encoer. + */ +#include "gfx_i2c.c" /* I2C bus access routines */ + +/* TV ENCODER ROUTINES + * This file does not need to be included if the system does not + * support TV output. + */ +#include "gfx_tv.c" /* TV encoder routines */ + +/* VGA ROUTINES + * This file is used if setting display modes using VGA registers. + */ +#include "gfx_vga.c" /* VGA routines */ + +#include "nsc_regacc.c" + +/* END OF FILE */ diff -uNr linux-2.4.31/drivers/video/nsc/fbgen.c linux-fb/drivers/video/nsc/fbgen.c --- linux-2.4.31/drivers/video/nsc/fbgen.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-fb/drivers/video/nsc/fbgen.c 2002-08-03 02:39:45.000000000 +0200 @@ -0,0 +1,468 @@ +/* + * linux/drivers/video/fbgen.c -- Generic routines for frame buffer devices + * + * Created 3 Jan 1998 by Geert Uytterhoeven + * + * 2001 - Documented with DocBook + * - Brad Douglas + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include