mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
![Thomas Winischhofer](/assets/img/avatar_default.png)
This lifts sisfb from version 1.7.17 to version 1.8.9. Changes include: - Added support for XGI V3XT, V5, V8, Z7 chipsets, including POSTing of all of these chipsets. - Added support for latest SiS chipsets (761). - Added support for SiS76x memory "hybrid" mode. - Added support for new LCD resolutions (eg 1280x854, 856x480). - Fixed support for 320x240 STN panels (for embedded devices). - Fixed many HDTV modes (525p, 750p, 1080i). - Fixed PCI config register reading/writing to use proper kernel functions for this purpose. - Fixed PCI ROM handling to use the kernel's proper functions. - Removed lots of "typedef"s. - Removed lots of code which was for X.org/XFree86 only. - Fixed coding style in many places. - Removed lots of 2.4 cruft. - Reduced stack size by unifying two previously separate structs into one. - Added new hooks for memory allocation (for DRM). Now the driver can truly handle multiple cards, including memory management. - Fixed numerous minor bugs. Signed-off-by: Thomas Winischhofer <thomas@winischhofer.net> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
125 lines
3.6 KiB
C
125 lines
3.6 KiB
C
/* $XFree86$ */
|
|
/* $XdotOrg$ */
|
|
/*
|
|
* General type definitions for universal mode switching modules
|
|
*
|
|
* Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
|
|
*
|
|
* If distributed as part of the Linux kernel, the following license terms
|
|
* apply:
|
|
*
|
|
* * 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 named License,
|
|
* * or 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
|
|
*
|
|
* Otherwise, the following license terms apply:
|
|
*
|
|
* * Redistribution and use in source and binary forms, with or without
|
|
* * modification, are permitted provided that the following conditions
|
|
* * are met:
|
|
* * 1) Redistributions of source code must retain the above copyright
|
|
* * notice, this list of conditions and the following disclaimer.
|
|
* * 2) Redistributions in binary form must reproduce the above copyright
|
|
* * notice, this list of conditions and the following disclaimer in the
|
|
* * documentation and/or other materials provided with the distribution.
|
|
* * 3) The name of the author may not be used to endorse or promote products
|
|
* * derived from this software without specific prior written permission.
|
|
* *
|
|
* * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Author: Thomas Winischhofer <thomas@winischhofer.net>
|
|
*
|
|
*/
|
|
|
|
#ifndef _VGATYPES_H_
|
|
#define _VGATYPES_H_
|
|
|
|
#ifdef SIS_LINUX_KERNEL
|
|
#include <linux/version.h>
|
|
#endif
|
|
|
|
#ifndef FALSE
|
|
#define FALSE 0
|
|
#endif
|
|
|
|
#ifndef TRUE
|
|
#define TRUE 1
|
|
#endif
|
|
|
|
#ifndef BOOLEAN
|
|
typedef unsigned int BOOLEAN;
|
|
#endif
|
|
|
|
#define SISIOMEMTYPE
|
|
|
|
#ifdef SIS_LINUX_KERNEL
|
|
typedef unsigned long SISIOADDRESS;
|
|
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
|
|
#include <linux/types.h> /* Need __iomem */
|
|
#undef SISIOMEMTYPE
|
|
#define SISIOMEMTYPE __iomem
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef SIS_XORG_XF86
|
|
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,0,0,0)
|
|
typedef unsigned long IOADDRESS;
|
|
typedef unsigned long SISIOADDRESS;
|
|
#else
|
|
typedef IOADDRESS SISIOADDRESS;
|
|
#endif
|
|
#endif
|
|
|
|
typedef enum _SIS_CHIP_TYPE {
|
|
SIS_VGALegacy = 0,
|
|
SIS_530,
|
|
SIS_OLD,
|
|
SIS_300,
|
|
SIS_630,
|
|
SIS_730,
|
|
SIS_540,
|
|
SIS_315H, /* SiS 310 */
|
|
SIS_315,
|
|
SIS_315PRO, /* SiS 325 */
|
|
SIS_550,
|
|
SIS_650,
|
|
SIS_740,
|
|
SIS_330,
|
|
SIS_661,
|
|
SIS_741,
|
|
SIS_670,
|
|
SIS_660 = 35,
|
|
SIS_760,
|
|
SIS_761,
|
|
SIS_762,
|
|
SIS_770,
|
|
SIS_340 = 55,
|
|
SIS_341,
|
|
SIS_342,
|
|
XGI_20 = 75,
|
|
XGI_40,
|
|
MAX_SIS_CHIP
|
|
} SIS_CHIP_TYPE;
|
|
|
|
|
|
#endif
|
|
|