xserver-xorg-video-sis: Changes to 'upstream-unstable'
.gitignore | 70 ++++++++++++++--
COPYING | 143 +++++++++++++++++++++++++++++++--
ChangeLog | 87 --------------------
Makefile.am | 15 ++-
README | 110 ++++++++++++-------------
README.sgml | 235 -------------------------------------------------------
configure.ac | 17 ++-
man/.gitignore | 2
man/Makefile.am | 41 ++++-----
man/sis.man | 8 -
src/.gitignore | 6 -
src/sis_driver.c | 14 +--
src/sis_opt.c | 2
src/sis_vga.c | 8 +
14 files changed, 311 insertions(+), 447 deletions(-)
New commits:
commit 75a8a7c51547805358ced39e1a04820e17133264
Author: Dave Airlie <airlied@redhat.com>
Date: Mon Jul 5 14:23:33 2010 +1000
sis 0.10.3
diff --git a/configure.ac b/configure.ac
index b6e5682..33c0d65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.10.2,
+ 0.10.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
commit ac05588db7da21d1ff2cb13bba11b66bb5d5c38b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Jun 29 21:37:50 2010 +0100
Replace some broken URLs with winishhofer.eu
The old one seems to be a casino web site nowadays.
Debian bug#517075
Reported-by: Nigel Tamplin <fuse@f2s.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/README b/README
index 12169c5..426bdcc 100644
--- a/README
+++ b/README
@@ -60,7 +60,7 @@
This document provides a brief overview over the driver's features and
configuration options. Please see
- http://www.winischhofer.at/linuxsisvga.shtml for detailed
+ http://www.winischhofer.eu/linuxsisvga.shtml for detailed
documentation and updates.
@@ -170,7 +170,7 @@
Option
This option enables/disables the driver's interface for the
SiSCtrl utility. Please see
- http://www.winischhofer.at/linuxsisvga.shtml for more
+ http://www.winischhofer.eu/linuxsisvga.shtml for more
information.
Option
diff --git a/man/sis.man b/man/sis.man
index c321808..9ae4a1b 100644
--- a/man/sis.man
+++ b/man/sis.man
@@ -65,7 +65,7 @@ details. This section only covers configuration details specific to this
driver.
.PP
Detailed information on all supported options can be obtained at
-http://www.winischhofer.at/linuxsisvga.shtml
+http://www.winischhofer.eu/linuxsisvga.shtml
.PP
This manpage only covers a subset of the supported options.
.PP
@@ -251,7 +251,7 @@ About Merged Framebuffer support
Merged framebuffer mode is similar to dual head/Xinerama mode (for using two
output devices of one card at the same time), but has a few advantages which
make me recommend it strongly over Xinerama. Please see
-http://www.winischhofer.at/linuxsisvga.shtml for detailed information.
+http://www.winischhofer.eu/linuxsisvga.shtml for detailed information.
.PP
About dual-head support
.PP
@@ -368,7 +368,7 @@ the TV standard is PAL. Super overscan will produce an
image on the TV which is larger than the viewable area.
.PP
The driver supports many more options. Please see
-http://www.winischhofer.at/linuxsisvga.shtml for
+http://www.winischhofer.eu/linuxsisvga.shtml for
more information.
.PP
.I "3. 300 series specific information"
@@ -434,7 +434,7 @@ __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(_
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
#endif
.PP
-.B "http://www.winischhofer.at/linuxsisvga.shtml";
+.B "http://www.winischhofer.eu/linuxsisvga.shtml";
for more information and updates
.SH AUTHORS
Author: Thomas Winischhofer. Formerly based on code by Alan Hourihane,
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 22646d2..d95b5f1 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -3185,7 +3185,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Copyright (C) 2001-2005 Thomas Winischhofer <thomas@winischhofer.net> and others\n");
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "*** See http://www.winischhofer.at/linuxsisvga.shtml\n";);
+ "*** See http://www.winischhofer.eu/linuxsisvga.shtml\n";);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"*** for documentation and updates.\n");
diff --git a/src/sis_opt.c b/src/sis_opt.c
index 69a4c6e..3517549 100644
--- a/src/sis_opt.c
+++ b/src/sis_opt.c
@@ -1392,7 +1392,7 @@ SiSOptions(ScrnInfoPtr pScrn)
if((from == X_DEFAULT) && (!pSiS->enablesisctrl)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "For information on SiSCtrl, see\n\t\thttp://www.winischhofer.at/linuxsispart1.shtml#sisctrl\n";);
+ "For information on SiSCtrl, see\n\t\thttp://www.winischhofer.eu/linuxsispart1.shtml#sisctrl\n";);
}
commit 116d40678dfbb851fd401103f9b7447f4d47eb7c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 08:14:30 2010 -0400
README: keep the text version of README, discard the sgml version
The linuxdoc doc tool is deprecated.
README files are exclusively text files.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 9ab8bf9..4c278ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,12 +21,6 @@
SUBDIRS = src man
MAINTAINERCLEANFILES = ChangeLog INSTALL
-if BUILD_LINUXDOC
-README: README.sgml
- $(MAKE_TEXT) README.sgml && mv README.txt README
-endif
-
-EXTRA_DIST = README.sgml
.PHONY: ChangeLog INSTALL
INSTALL:
diff --git a/README.sgml b/README.sgml
deleted file mode 100644
index b321b51..0000000
--- a/README.sgml
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
-]>
-
-<article>
-
-<!-- Title information -->
-<title>Information for SiS and XGI Users
-<author>Thomas Winischhofer (thomas@winischhofer.net)
-<date>6 July 2005
-
-<!-- Table of contents -->
-<toc>
-
-<sect> Introduction <p>
-
-This driver is written by Thomas Winischhofer and is a (nearly) complete
-re-write of a driver written for the SiS6326 and SiS530 by Alan Hourihane
-and others.
-
-It currently supports the following chipsets:
-<itemize>
- <item>old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
- <item>300 series: SiS 300/305, 540, 630/730
- <item>315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740, [M]661&[F/M/G]X, [M]741[GX]
- <item>330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX]
- <item>340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
-</itemize>
-
-Among other features, the driver supports
-<itemize>
- <item>8/16/24 bits color depth; old series also 15
- <item>Hardware cursor; 315/330/340 series: Color HW cursor
- <item>XAA; EXA; XVideo (Xv); RENDER and other extensions
- <item>6326: TV output
- <item>300/315/330/340 series: TV output via Chrontel TV encoders or SiS video bridges
- <item>300/315/330/340 series: LCD output via LVDS transmitters or SiS video bridges
- <item>300/315/330/340 series: Dual head mode; Xinerama; Merged framebuffer mode
- <item>300/315/330/340 series: Interface for SiSCtrl (see below)
-</itemize>
-
-This document provides a brief overview over the driver's features and
-configuration options. Please see http://www.winischhofer.at/linuxsisvga.shtml
-for detailed documentation and updates.
-
-<sect> xorg.conf Options <p>
-
-The following options are of particular interest for the SiS driver. Each of them
-must be specified in the Device section of the xorg.conf file for this card.
-
-In the list below, the options' arguments are described by type. For "boolean",
-the keywords "on", "true" and "yes", as well as "off", "false" and "no" respectively
-have the same meaning.
-
-<sect1> For all chipsets<p>
-
-<descrip>
-<tag>Option "SWCursor" [boolean]</tag>
- <p/>
-<tag>Option "HWCursor" [boolean]</tag>
- These options select whether the software (SW) or hardware (HW) cursor should
- be used. The default is using the hardware cursor.
-<tag>Option "NoAccel" [boolean]</tag>
- Disables 2D acceleration. By default, 2D acceleration is enabled.
-<tag>Option "AccelMethod" [string]</tag>
- Determines which acceleration architecture should be used. Possible arguments
- are "XAA" or "EXA". As of this writing, EXA is still experimental and it
- is not recommended to be used on production machines. By default, XAA will
- be used.
-<tag>Option "Rotate" [string]</tag>
- This option enables clockwise ("CW") or counter-clockwise ("CCW") rotation of
- the display. Enabling either CW or CCW rotation disables the RandR extension
- as well as all 2D acceleration and Xv support. Default: no rotation.
-<tag>Option "Reflect" [string]</tag>
- This option enables reflecting the display horizontally ("X"), vertically ("Y")
- or in both directions ("XY"). Enabling reflection disables the RandR extension
- as well as all 2D acceleration and Xv support. Default: no rotation.
-<tag>Option "ShadowFB" [boolean]</tag>
- This option enables the shadow framebuffer layer. By default, it is disabled.
-<tag>Option "NoXVideo" [boolean]</tag>
- Disables the XVideo (Xv) support. Apart from the XGI Volari Z7, all chipsets
- support Xv. By default, XVideo support is enabled.
-<tag>Option "CRT1Gamma" [boolean]</tag>
- Enables or disables gamma correction. Default: gamma correction is enabled.
-</descrip>
-
-<sect1> Old series specific options <p>
-
-<descrip>
-<tag>Option "FastVram" [boolean]</tag>
- Enables 1 cycle memory access for read and write operations. The default
- depends on the chipset used.
-<tag>Option "Turboqueue" [boolean]</tag>
- SiS chipsets have the ability to extend the engine command queue in
- video RAM. This concept is called "TurboQueue" and gives some performance
- improvement. Due to hardware bugs, the TurboQueue is disabled on the 530/620,
- otherwise enabled by default.
-<tag>Option "NoHostBus" [boolean]</tag>
- For 5597/5598 only. This option, if set, disables the CPU to VGA host bus.
- Disabling the host bus will result in a severe performance regression.
-<tag>VideoRAM [size]</tag>
- The SiS 6326 can only directly address 4096K bytes of video RAM. However,
- there are some cards out there featuring 8192K (8MB) of video RAM. This RAM
- is not addressable by the engines. Therefore, by default, the driver will
- only use 4096K. This behavior can be overridden by specifying the amount of
- video RAM using the VideoRAM keyword. If more than 4096K is specified, the
- driver will disable 2D acceleration, Xv and the HW cursor. On all other
- chipsets, this keyword is ignored. The size argument is expected in KB, but
- without "KB".
-<tag>Option "NoYV12" [boolean]</tag>
- Due to hardware bugs, XVideo may display a corrupt image when using
- YV12 encoded material. This option, if set, disables support for YV12
- and hence forces the Xv-aware application to use either YUV2 or XShm
- for video output.
-<tag>Option "TVStandard" [string]</tag>
- (6326 only) Selects the TV output standard. May be PAL or NTSC. By default,
- this is selected by a jumper on the card.
-</descrip>
-
-<sect1> 300/315/330/340 series specific options<p>
-
-<descrip>
-<tag>Option "EnableSiSCtrl" [boolean]</tag>
- This option enables/disables the driver's interface for the SiSCtrl
- utility. Please see http://www.winischhofer.at/linuxsisvga.shtml
- for more information.
-<tag>Option "Turboqueue" [boolean]</tag>
- (300 series only) SiS chipsets have the ability to extend the engine
- command queue in video RAM. This concept is called "TurboQueue" and gives
- some performance improvement. The TurboQueue is enabled by default.
-<tag>Option "ForceCRT1" [boolean]</tag>
- Enables or disables CRT1 (= the external VGA monitor). By default,
- the driver will use CRT1 if a monitor is detected during server
- start. Some older monitors can't be detected, so they may require
- setting this option to true. To disable CRT1 output, set this option
- to false.
-<tag>Option "ForceCRT1Type" [string]</tag>
- (For SiS 650, M650, 651, 661, 741, 760 with either SiS 301LV, 302LV or
- SiS 301C video bridge only) The argument may be "VGA", "LCD" or "OFF".
- Specifying LCD will force the driver to use the VGA controller's CRT1
- channel for driving the LCD while CRT2 is free for TV usage. "OFF" is
- the same as setting the option ForceCRT1 to "false". Default is VGA.
-<tag>Option "ForceCRT2Type" [string]</tag>
- Selects the CRT2 output device type. Valid parameters are "LCD", "TV",
- "SVIDEO", "COMPOSITE", "SVIDEO+COMPOSITE", "SCART", "VGA", "YPBPR480I",
- "YPBPR480P", "YPBPR720P", "YPBPR1080I" or "NONE". NONE disables CRT2.
- SVIDEO, COMPOSITE, SVIDEO+COMPOSITE, SCART and all the YPBPR alternatives
- are only for systems with a SiS video bridge and select the desired plug
- or TV standard type. For Chrontel systems, TV should be used instead. VGA
- means secondary VGA and is only available on some SiS video bridges
- (301, 301B, 301C).
-<tag>Option "CRT2Gamma" [boolean]</tag>
- (For SiS video bridges only) This option enables or disables gamma
- correction for CRT2. Default: gamma correction for CRT2 is enabled.
-<tag>Option "DRI" [boolean]</tag>
- Although this option is accepted for all chipsets, it currently only
- makes sense on the 300 series; DRI is only supported on these chipsets.
- This option enables/disables DRI.
-<tag>Option "TVStandard" [string]</tag>
- Selects the TV output standard. May be PAL or NTSC, on some machines
- (depending on the hardware) also PALM and PALN. Default: BIOS setting.
-<tag>Option "TVXPosOffset" [integer]</tag>
- <p/>
-<tag>Option "TVYPosOffset" [integer]</tag>
- These options allow relocating the image on your TV. Both options take
- an integer within the range of -16 to 16. Default: 0. Not supported for
- Chrontel 7019.
-<tag>Option "CHTVOverscan" [boolean]</tag>
- (For Chrontel TV encoders only) Selects whether TV output should be
- overscan or underscan.
-<tag>Option "CHTVSuperOverscan" [boolean]</tag>
- (For Chrontel 7005 TV encoders in PAL mode only) Selects whether TV output
- should be super-overscan (slightly larger than the viewable area) or
- not.
-<tag>Option "SISTVXScale" [integer]</tag>
- <p/>
-<tag>Option "SISTVYScale" [integer]</tag>
- (For SiS video bridges only) These options allow zooming the image on
- your TV. SISTVXScale takes an integer within the range of -16 to 16.
- SISTVYScale accepts -4 to 3. Default: 0. Not all modes can be scaled.
-</descrip>
-
-<sect1> 300 series specific options<p>
-
-<descrip>
-<tag>Option "MaxXFBMem" [size]</tag>
- This option might only be needed if you are running X on a Linux 2.4 series
- kernel. This option is not needed and should be omitted on Linux 2.6 and *BSD.
-
- The Linux kernel features a framebuffer driver named "sisfb" which takes care
- of memory management for DRI/DRM (such as for 3D texture data). In order to
- keep the X driver and sisfb from overwriting each other's video memory, sisfb
- reserves a certain amount of video memory for the X driver. Reserved memory
- is for X 2D, pixmap cache and video data only. Sisfb will not present this
- memory to the DRI. The amount of reserved memory can either be selected using
- sisfb's mem parameter or auto-selected depending on the total amount of video
- RAM available.
-
- Fact of the matter is, the X driver needs to know about the amount of RAM
- sisfb reserved. For this purpose, the Option "MaxXFBMem" exists.
-
- If you start sisfb with a valid mode (ie you run a graphical console), the
- X driver can communicate with sisfb and doesn't require setting the MaxXFBMem
- option at all. The X driver will receive enough information from sisfb in
- this case.
-
- If you, on the other hand, use sisfb for memory management only, ie you started
- sisfb with mode=none and still have a text mode console, there is no communication
- between sisfb and the X driver. In this - and ONLY this - case, you need to set
- MaxXFBMem to the same value as you gave sisfb with its mem parameter. If you
- didn't specify any mem parameter, sisfb will reserve (and you will have to
- specify by MaxXFBMem) 12288KB if more than 16MB of total video RAM is available,
- 8192KB if between 12 and 16MB of video RAM is available, 4096KB in all other
- cases. The size is expected in KB, without the "KB".
-
- Final word of advice: If you intend to use DRI on an integrated chipset (such
- as the 540/630/730), it is recommended to set the total video memory in the BIOS
- setup utility to 64MB.
-</descrip>
-
-<sect1> 315/330/340 series specific options<p>
-
-<descrip>
-<tag>Option "RenderAcceleration" [boolean]</tag>
- Enables or disables RENDER acceleration. This feature, for instance, accelerates
- output of anti-aliased text. By default, RENDER acceleration is enabled. RENDER
- acceleration is currently only supported for XAA, not EXA.
-<tag>Option "XvOnCRT2" [boolean]</tag>
- (For 315, 650, 740, 330, 340 and XGI chips only) This option selects whether
- the XVideo (Xv) overlay should be displayed on CRT1 or CRT2. Setting this option
- means CRT2. The other CRT will only display the (by default: blue) color key
- or a black/red pattern.
-</descrip>
-
-</article>
diff --git a/configure.ac b/configure.ac
index 6705994..b6e5682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -130,8 +130,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=sis
AC_SUBST([DRIVER_NAME])
-XORG_CHECK_LINUXDOC
-
AC_OUTPUT([
Makefile
src/Makefile
commit 5f9fd07d54b8bc26c0403e1b46acce23db1365d9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Jun 14 07:58:26 2010 -0400
README: fix linuxdoc content
defs.ent are located under X11 directory
ident tag is not a Linuxdoc tag
replace docbook email tag with linuxdoc email tag
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/README b/README
index 6e26ad8..12169c5 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
Information for SiS and XGI Users
- Thomas Winischhofer <thomas@winischhofer.net>
+ Thomas Winischhofer (thomas@winischhofer.net)
6 July 2005
____________________________________________________________
@@ -17,7 +17,7 @@
______________________________________________________________________
- [1m1. Introduction[0m
+ 1. Introduction
This driver is written by Thomas Winischhofer and is a (nearly)
@@ -26,37 +26,37 @@
It currently supports the following chipsets:
- +o old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
+ o old series: SiS 5597/5598, 6236/AGP/DVD, 530/620
- +o 300 series: SiS 300/305, 540, 630/730
+ o 300 series: SiS 300/305, 540, 630/730
- +o 315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740,
+ o 315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740,
[M]661&[F/M/G]X, [M]741[GX]
- +o 330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX]
+ o 330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX]
- +o 340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
+ o 340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8
Among other features, the driver supports
- +o 8/16/24 bits color depth; old series also 15
+ o 8/16/24 bits color depth; old series also 15
- +o Hardware cursor; 315/330/340 series: Color HW cursor
+ o Hardware cursor; 315/330/340 series: Color HW cursor
- +o XAA; EXA; XVideo (Xv); RENDER and other extensions
+ o XAA; EXA; XVideo (Xv); RENDER and other extensions
- +o 6326: TV output
+ o 6326: TV output
- +o 300/315/330/340 series: TV output via Chrontel TV encoders or SiS
+ o 300/315/330/340 series: TV output via Chrontel TV encoders or SiS
video bridges
- +o 300/315/330/340 series: LCD output via LVDS transmitters or SiS
+ o 300/315/330/340 series: LCD output via LVDS transmitters or SiS
video bridges
- +o 300/315/330/340 series: Dual head mode; Xinerama; Merged
+ o 300/315/330/340 series: Dual head mode; Xinerama; Merged
framebuffer mode
- +o 300/315/330/340 series: Interface for SiSCtrl (see below)
+ o 300/315/330/340 series: Interface for SiSCtrl (see below)
This document provides a brief overview over the driver's features and
configuration options. Please see
@@ -64,7 +64,7 @@
documentation and updates.
- [1m2. xorg.conf Options[0m
+ 2. xorg.conf Options
The following options are of particular interest for the SiS driver.
@@ -76,72 +76,72 @@
"false" and "no" respectively have the same meaning.
- [1m2.1. For all chipsets[0m
+ 2.1. For all chipsets
- [1mOption[0m
+ Option
>
- [1mOption[0m
+ Option
These options select whether the software (SW) or hardware (HW)
cursor should be used. The default is using the hardware cursor.
- [1mOption[0m
+ Option
Disables 2D acceleration. By default, 2D acceleration is
enabled.
- [1mOption[0m
+ Option
Determines which acceleration architecture should be used.
Possible arguments are "XAA" or "EXA". As of this writing, EXA
is still experimental and it is not recommended to be used on
production machines. By default, XAA will be used.
- [1mOption[0m
+ Option
This option enables clockwise ("CW") or counter-clockwise
("CCW") rotation of the display. Enabling either CW or CCW
rotation disables the RandR extension as well as all 2D
acceleration and Xv support. Default: no rotation.
- [1mOption[0m
+ Option
This option enables reflecting the display horizontally ("X"),
vertically ("Y") or in both directions ("XY"). Enabling
reflection disables the RandR extension as well as all 2D
acceleration and Xv support. Default: no rotation.
- [1mOption[0m
+ Option
This option enables the shadow framebuffer layer. By default, it
is disabled.
- [1mOption[0m
+ Option
Disables the XVideo (Xv) support. Apart from the XGI Volari Z7,
all chipsets support Xv. By default, XVideo support is enabled.
- [1mOption[0m
+ Option
Enables or disables gamma correction. Default: gamma correction
is enabled.
- [1m2.2. Old series specific options[0m
+ 2.2. Old series specific options
- [1mOption[0m
+ Option
Enables 1 cycle memory access for read and write operations. The
default depends on the chipset used.
- [1mOption[0m
+ Option
SiS chipsets have the ability to extend the engine command queue
in video RAM. This concept is called "TurboQueue" and gives some
performance improvement. Due to hardware bugs, the TurboQueue is
disabled on the 530/620, otherwise enabled by default.
- [1mOption[0m
+ Option
For 5597/5598 only. This option, if set, disables the CPU to VGA
host bus. Disabling the host bus will result in a severe
performance regression.
- [1mVideoRAM [size][0m
+ VideoRAM [size]
The SiS 6326 can only directly address 4096K bytes of video RAM.
However, there are some cards out there featuring 8192K (8MB) of
video RAM. This RAM is not addressable by the engines.
@@ -152,41 +152,41 @@
all other chipsets, this keyword is ignored. The size argument
is expected in KB, but without "KB".
- [1mOption[0m
+ Option
Due to hardware bugs, XVideo may display a corrupt image when
using YV12 encoded material. This option, if set, disables
support for YV12 and hence forces the Xv-aware application to
use either YUV2 or XShm for video output.
- [1mOption[0m
+ Option
(6326 only) Selects the TV output standard. May be PAL or NTSC.
By default, this is selected by a jumper on the card.
- [1m2.3. 300/315/330/340 series specific options[0m
+ 2.3. 300/315/330/340 series specific options
- [1mOption[0m
+ Option
This option enables/disables the driver's interface for the
SiSCtrl utility. Please see
http://www.winischhofer.at/linuxsisvga.shtml for more
information.
- [1mOption[0m
+ Option
(300 series only) SiS chipsets have the ability to extend the
engine command queue in video RAM. This concept is called
"TurboQueue" and gives some performance improvement. The
TurboQueue is enabled by default.
- [1mOption[0m
+ Option
Enables or disables CRT1 (= the external VGA monitor). By
default, the driver will use CRT1 if a monitor is detected
during server start. Some older monitors can't be detected, so
they may require setting this option to true. To disable CRT1
output, set this option to false.
- [1mOption[0m
+ Option
(For SiS 650, M650, 651, 661, 741, 760 with either SiS 301LV,
302LV or SiS 301C video bridge only) The argument may be "VGA",
"LCD" or "OFF". Specifying LCD will force the driver to use the
@@ -194,7 +194,7 @@
free for TV usage. "OFF" is the same as setting the option
ForceCRT1 to "false". Default is VGA.
- [1mOption[0m
+ Option
Selects the CRT2 output device type. Valid parameters are "LCD",
"TV", "SVIDEO", "COMPOSITE", "SVIDEO+COMPOSITE", "SCART", "VGA",
"YPBPR480I", "YPBPR480P", "YPBPR720P", "YPBPR1080I" or "NONE".
@@ -205,53 +205,53 @@
secondary VGA and is only available on some SiS video bridges
(301, 301B, 301C).
- [1mOption[0m
+ Option
(For SiS video bridges only) This option enables or disables
gamma correction for CRT2. Default: gamma correction for CRT2 is
enabled.
- [1mOption[0m
+ Option
Although this option is accepted for all chipsets, it currently
only makes sense on the 300 series; DRI is only supported on
these chipsets. This option enables/disables DRI.
- [1mOption[0m
+ Option
Selects the TV output standard. May be PAL or NTSC, on some
machines (depending on the hardware) also PALM and PALN.
Default: BIOS setting.
- [1mOption[0m
+ Option
>
- [1mOption[0m
+ Option
These options allow relocating the image on your TV. Both
options take an integer within the range of -16 to 16. Default:
0. Not supported for Chrontel 7019.
- [1mOption[0m
+ Option
(For Chrontel TV encoders only) Selects whether TV output should
be overscan or underscan.
- [1mOption[0m
+ Option
(For Chrontel 7005 TV encoders in PAL mode only) Selects whether
TV output should be super-overscan (slightly larger than the
viewable area) or not.
- [1mOption[0m
+ Option
>
- [1mOption[0m
+ Option
(For SiS video bridges only) These options allow zooming the
image on your TV. SISTVXScale takes an integer within the range
of -16 to 16. SISTVYScale accepts -4 to 3. Default: 0. Not all
modes can be scaled.
- [1m2.4. 300 series specific options[0m
+ 2.4. 300 series specific options
- [1mOption[0m
+ Option
This option might only be needed if you are running X on a Linux
2.4 series kernel. This option is not needed and should be
omitted on Linux 2.6 and *BSD.
@@ -291,17 +291,17 @@
total video memory in the BIOS setup utility to 64MB.
- [1m2.5. 315/330/340 series specific options[0m
+ 2.5. 315/330/340 series specific options
- [1mOption[0m
+ Option
Enables or disables RENDER acceleration. This feature, for
instance, accelerates output of anti-aliased text. By default,
RENDER acceleration is enabled. RENDER acceleration is currently
only supported for XAA, not EXA.
- [1mOption[0m
+ Option
(For 315, 650, 740, 330, 340 and XGI chips only) This option
selects whether the XVideo (Xv) overlay should be displayed on
CRT1 or CRT2. Setting this option means CRT2. The other CRT will
diff --git a/README.sgml b/README.sgml
index 3f4b7bf..b321b51 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,12 +1,12 @@
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
-<!ENTITY % defs SYSTEM "defs.ent"> %defs;
+<!ENTITY % defs SYSTEM "X11/defs.ent"> %defs;
]>
<article>
<!-- Title information -->
<title>Information for SiS and XGI Users
-<author>Thomas Winischhofer (<email>thomas@winischhofer.net</email>)
+<author>Thomas Winischhofer (thomas@winischhofer.net)
<date>6 July 2005
<!-- Table of contents -->
commit 1bec9268f503e249cf1a20f2597f3f6c78a13af4
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Jun 13 10:56:05 2010 -0400
COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/COPYING b/COPYING
index 7f33cbf..d643012 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,139 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+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.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
+Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
+Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (C) 2003 Eric Anholt
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
+Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
+
+Portions from radeon_dga.c which is
+ Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
+ VA Linux Systems Inc., Fremont, California.
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation, and that the name of the providers not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission. The providers make no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without express or implied warranty.
+
+THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL THE PROVIDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Copyright 2007 George Sapountzis
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Copyright (C) 1999-2004 by The XFree86 Project, Inc.
+based on code written by Mark Vojkovich
+Copyright (C) 2003-2005 Thomas Winischhofer
+
+Licensed under the following terms:
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appears in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and
+and that the name of the copyright holder not be used in advertising
+or publicity pertaining to distribution of the software without specific,
+written prior permission. The copyright holder makes no representations
+about the suitability of this software for any purpose. It is provided
+"as is" without expressed or implied warranty.
+
+THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
+EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
-http://lists.freedesktop.org/mailman/listinfo/xorg
commit 13583aba3e2abafd55fc894070cf5f050bbea4f2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue May 18 13:11:01 2010 -0400
Remove mibank.h reference
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/sis_driver.c b/src/sis_driver.c
index d19cf17..22646d2 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -56,7 +56,6 @@
#include "shadowfb.h"
#include "fb.h"
#include "micmap.h"
-#include "mibank.h"
#include "mipointer.h"
#include "mibstore.h"
#include "edid.h"
commit 47233238a659318cae6b7d0f71ee44b689e249c3
Author: david@fries.net <david@fries.net>
Date: Tue Sep 15 22:32:45 2009 -0500
SISVGABlankScreen: only update the hardware if we're changing the state
The command `xset s reset` will reset the X server screensaver to
reset the timer for the screensaver and dpms. If the display is
already on, it should do nothing as far as the hardware goes. In the
SISVGABlankScreen routine it requires as reset to update the register,
but that will disrupt the VGA signal and cause the monitor to resync
leaving the screen blank for a couple seconds. I have a program that
wants to keep the screensaver from coming on, but allow normal
operation when it isn't running.
Debian bug#546838 <http://bugs.debian.org/546838>
Signed-off-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/sis_vga.c b/src/sis_vga.c
index b4cd69d..3f6219b 100644
--- a/src/sis_vga.c
+++ b/src/sis_vga.c
@@ -1922,11 +1922,17 @@ static void
SISVGABlankScreen(ScrnInfoPtr pScrn, Bool on)
{
SISPtr pSiS = SISPTR(pScrn);
- UChar tmp;
+ UChar tmp, orig;
inSISIDXREG(SISSR, 0x01, tmp);
+ orig = tmp;
if(on) tmp &= ~0x20;
else tmp |= 0x20;
+ /* Only update the hardware if the state changes because the reset will
+ * disrupt the output requiring the screen to resync.
+ */
+ if(orig == tmp)
+ return;
SiS_SeqReset(pSiS, TRUE);
outSISIDXREG(SISSR, 0x01, tmp);
SiS_SeqReset(pSiS, FALSE);
commit dff79298ae04cec6233cd043cbf3aeda6db67d42
Author: Tiago Vignatti <tiago.vignatti@nokia.com>
Date: Thu May 6 20:15:04 2010 +0300
Document better the resource access hack
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
diff --git a/src/sis_driver.c b/src/sis_driver.c
Reply to: