408 Commits

Author SHA1 Message Date
Kevin Brace
6c1260b7bc Remove unnecessary SiS PCI Device IDs
These are SiS Device IDs for host to PCI bridges and a USB host.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:48:42 -06:00
Kevin Brace
df7837d4ff Fix type mismatch compilation warnings when TWDEBUG macro is defined
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:47:26 -06:00
Kevin Brace
1ac40451b8 Use unsigned long when performing PCI read / write
When thinking about 64-bit ISA environment, 32-bit PCI read / write
should be performed as a unsigned long type.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:37:54 -06:00
Kevin Brace
866e109fc1 Version bumped to 0.12.0
A maintenance release to support X.Org X Server 1.20.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
xf86-video-sis-0.12.0
2019-12-03 10:09:49 -08:00
Kevin Brace
f0c0896a83 Enable SISGAMMARAMP macro on X.Org X Server
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2019-11-26 09:31:52 -08:00
Kevin Brace
eac25b01ca Fix for xf86InterceptSigIll() discontinuation in X Server 1.20
xf86InterceptSigIll() will still be used on X.Org X Server 1.19 or
older.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2019-11-26 09:31:37 -08:00
Kevin Brace
5d816e15d8 Do not call xf86DisableRandR() for X Server 1.20
This is needed for X Server 1.20 support.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-11-26 09:31:22 -08:00
Kevin Brace
dfe2ce49b5 Version bumped to 0.11.0
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
xf86-video-sis-0.11.0
2019-07-26 15:44:13 -07:00
Kevin Brace
16fe430120 Convert text format specifier type to unsigned short
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2019-07-18 15:41:46 -07:00
Fabrice Fontaine
9e42918588 configure.ac: fix cross-compilation
AC_CHECK_FILE can't be used when cross-compiling

[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/x11r7/xdriver_xf86-video-sis/0001-cross.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-05-04 19:24:04 +02:00
Kevin Brace
22d3c79f97 Convert EXA support preprocessor macro to USE_EXA
All the other DDXs do it this way.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-12-17 18:53:46 -06:00
Kevin Brace
0baf5baf7e Eliminate constant related compilation warnings for native functions
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-12-17 15:23:07 -06:00
Kevin Brace
0b2cce041e Eliminate swap macro related unused variable compilation warnings
Unfortunately, commit c530ebb5d4 did not
the check for ABI_VIDEODRV_VERSION where the swap macros are actually
used in the code. Checking for ABI_VIDEODRV_VERSION suppresses unused
variable compilation warnings for newer versions of the X Server.

Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-12-17 15:08:45 -06:00
Kevin Brace
301cefae67 Suppress logical operation and parenthesis related compilation warnings
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-12-17 15:07:55 -06:00
Kevin Brace
940eed5b73 Eliminate set but not used variable compilation warnings
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-12-17 15:06:53 -06:00
Alan Coopersmith
7e75c8b1e9 Update configure.ac bug URL for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-12-07 19:09:21 -08:00
Alan Coopersmith
3fcdc11644 Remove obsolete B16 & B32 tags in struct definitions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-10 13:03:46 -08:00
Kevin Brace
413dfdfc45 Elimination of many "variable set but not used" compilation warnings
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-07-11 21:49:47 -07:00
Kevin Brace
5559abc347 Add conditional compilation directives to suppress compilation warnings
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-07-11 21:02:37 -07:00
Kevin Brace
31f3dd0df2 Minor adjustment to the compilation order
Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
2018-07-11 17:09:04 -07:00
Emil Velikov
a50b2b3412 xf86-video-sis: remove the GlxSetVisualConfigs stub and friends
The function was an empty since 2008 at least. Remove it alongside the
unused GLX visuals code.

With this all the GL/GLX dependencies in the driver are gone.

Cc: Connor Behan <connor.behan@gmail.com>
Cc: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2017-07-17 13:57:44 +01:00
Adam Jackson
4b1356a2b7 Remove reference to ->virtualFrom
The core will print this information as well anyway.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2017-02-16 11:21:27 -05:00
Mihail Konev
d8b449d331 autogen: add default patch prefix
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26 14:00:22 +10:00
Emil Velikov
e281d49ee4 autogen.sh: use quoted string variables
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
fall-outs, when they contain space.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26 11:26:28 +10:00
Peter Hutterer
96f78918e8 autogen.sh: use exec instead of waiting for configure to finish
Syncs the invocation of configure with the one from the server.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2017-01-26 11:23:46 +10:00
Alan Coopersmith
576d819d53 autogen.sh: Honor NOCONFIGURE=1
See http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-26 11:16:37 +10:00
Alan Coopersmith
9c55c0de3e configure: Drop AM_MAINTAINER_MODE
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2017-01-26 11:16:37 +10:00
Matt Turner
3b1aca6544 xf86-video-sis 0.10.9
Signed-off-by: Matt Turner <mattst88@gmail.com>
xf86-video-sis-0.10.9
2017-01-17 14:45:31 -08:00
Adam Jackson
96fee560cd Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
2016-07-19 10:10:23 -04:00
Thomas Klausner
328073e46f Fix arguments for miSetPointerPosition.
For the call for the API between versions 5 and 15.

Reviewed-by: Connor Behan <connor.behan@gmail.com>
2015-10-01 07:18:38 +02:00
Matt Turner
13b56dc68a xf86-video-sis: bump to version 0.10.8.
Signed-off-by: Matt Turner <mattst88@gmail.com>
xf86-video-sis-0.10.8
2015-08-29 16:35:43 -07:00
Connor Behan
e834b2cdae Remove upload / download EXA hooks
Support based on something other than libc memcpy was never added, so
these functions did not improve upon software fallback at all.

Signed-off-by: Connor Behan <connor.behan@gmail.com>
2015-08-17 18:52:25 -04:00
Dave Airlie
0f50f8c3db sis: force build, who uses this crazy code anyways 2014-11-12 09:27:33 +10:00
Dave Airlie
d2597696ba sis: more build fixes against master X server. 2014-11-12 08:04:21 +10:00
Dave Airlie
d0550de19c sis: fix build against latest xserver 2014-09-22 12:45:02 +10:00
Peter Hutterer
49796d6a32 Fix format-security warnings
sis_driver.c: In function 'SISErrorLog':
sis_driver.c:432:5: error: format not a string literal and no format arguments [-Werror=format-security]
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
     ^
sis_driver.c:439:5: error: format not a string literal and no format arguments [-Werror=format-security]
     xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
     ^
sis_driver.c: In function 'SiSUpdateXineramaScreenInfo':
sis_driver.c:1917:4: error: format not a string literal and no format arguments [-Werror=format-security]
    xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
    ^
sis_driver.c:1924:8: error: format not a string literal and no format arguments [-Werror=format-security]
        xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-23 09:43:15 +10:00
Alan Coopersmith
0a4336efaa Fix HDisplay/VDisplay typos
Found by gcc -Wlogicalops:

sis_driver.c: In function 'SiS_CheckModeCRT2':
sis_driver.c:13754:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
sis_driver.c:13755:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
sis_driver.c:13756:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
sis_driver.c:13758:5: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]
sis_driver.c:13759:6: warning: logical 'and' of mutually exclusive tests is always false [-Wlogical-op]

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2013-10-28 20:32:04 -07:00
Adam Jackson
7d4402786b Stop including xf86Priv.h
As the name might suggest, it's server-private.

Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-10-15 19:11:30 -04:00
Adam Jackson
926d4f655c Remove mibstore.h
Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-09-25 08:54:51 -04:00
Jan Lindemann
339fb3bc03 Replace xf86UnMapVidMem with pci_device_unmap_range
Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.

X.Org bug#18028 <https://bugs.freedesktop.org/show_bug.cgi?id=18028>

Bug found by Bryan Henderson <bryanh@giraffe-data.com>

Signed-off-by: Julien Cristau <jcristau@debian.org>
2012-08-30 20:14:28 +02:00
Dave Airlie
8c5127a681 xf86-video-sis: bump to version 0.10.7
Signed-off-by: Dave Airlie <airlied@redhat.com>
xf86-video-sis-0.10.7
2012-07-17 16:05:09 +10:00
Dave Airlie
c3d8d70edd sis: add xaa configure support
SIS is already plumbed to not need XAA, just hook it up.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-15 19:55:19 +10:00
Alan Coopersmith
314d56d0ad Make SiSRegInit & SiSSetLVDSetc args match in both headers that define them
Adds include of "sis_dac.h" to init.c to force compilers to compare the
definitions, making it obvious that sis_dac.h defined an extra argument
to SiSSetLVDSetc that the function itself didn't have, and that SiSRegInit
expected an unsigned long (in the form of SISIOADDRESS), not the unsigned
short that sis_dac.h claimed to pass it.

Found by the Parfait 1.0 bug checking tool:

Error: Function Call Mismatch
   Function call with extra args: Forward declaration of function 'SiSSetLVDSetc' does not match its definition
      Function expects 1 argument (SiS_Private*); given 2 (SiS_Private*, unsigned short)
        at line 604 of driver/xf86-video-sis/src/sis_dac.c in function 'SiS300Restore'.
          Function defined at line 1153 of driver/xf86-video-sis/src/init.c.
[repeated for each call]

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-07-02 07:45:02 -07:00
Dave Airlie
aa79b0f5db sis 0.10.6 release.
Signed-off-by: Dave Airlie <airlied@redhat.com>
xf86-video-sis-0.10.6
2012-07-02 13:19:04 +01:00
Dave Airlie
df17d3039e sis: fix build against older servers.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-02 13:17:23 +01:00
Dave Airlie
331c276b47 sis: 0.10.5 release
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-07-02 13:13:42 +01:00
Dave Airlie
f6d49466ca sis: drop xf86PciInfo.h
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-06 09:50:31 +01:00
Dave Airlie
1b20cd63a9 sis: port to new compat API.
Signed-off-by: Dave Airlie <airlied@redhat.com>
2012-06-06 09:48:35 +01:00
Alan Coopersmith
e067fc080c xf86-video-sis 0.10.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
xf86-video-sis-0.10.4
2012-03-23 19:52:38 -07:00
Johannes Obermayr
f5dafa24d8 Fix build with XInput version 12.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-02-07 22:56:47 +10:00