Commit Graph

396 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult
1a4e3e15aa drop ifdefs on INCL_YUV_BLIT_ADAPTOR
It's always enabled now, so no need for extra #ifdef's.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/14>
2024-06-01 18:39:07 +00:00
Enrico Weigelt, metux IT consult
823e5bd6eb drop #ifdef's on SISVRAMQ
It's always enabled, so we don't need these ifdefs (as well as the ifndef'ed
code pathes for MMIO) anynmore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/14>
2024-06-01 18:39:07 +00:00
Enrico Weigelt, metux IT consult
e440af7360 drop ifdef on SIS_ARGB_CURSOR and ARGB_CURSOR
* SIS_ARGB_CURSOR is always enabled (hard-coded)
* ARGB_CURSOR is always enabled in xserver 1.10 or above

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/13>
2024-06-01 18:33:02 +00:00
Enrico Weigelt, metux IT consult
07a8549e05 drop SIS_NEED_MAP_IOP code paths
This is known to be broken and never had been activated, so not needed anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/11>
2024-06-01 11:20:28 -07:00
Enrico Weigelt, metux IT consult
2ecda6541e drop ifdef on REGION_NULL
It's always defined since our minimal version (1.18), so no need for
extra ifdef's.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
2024-06-01 18:08:00 +00:00
Enrico Weigelt, metux IT consult
99912aad26 drop obsolete IODBase from SISRec
IODBase is always zero, so no needed anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
2024-06-01 18:08:00 +00:00
Enrico Weigelt, metux IT consult
78b5db44c8 drop obsolete _swapl() and _swaps() macros
Since these are just directly mapping to swapl() and swapn(), we don't
need them anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
2024-06-01 18:08:00 +00:00
Enrico Weigelt, metux IT consult
4f41d5a36a drop compat with ancient xinput abi major below 22
We're relying on at least 1.18 now, so Xinput ABI major is at least 22.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
2024-06-01 18:08:00 +00:00
Enrico Weigelt, metux IT consult
5f37a60ce5 drop compat with ancient videodrv abi major below 20
We're relying on at least 1.18 now, so video driver ABI major is at least 20.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/12>
2024-06-01 18:08:00 +00:00
Enrico Weigelt, metux IT consult
ea5a1710da no need to check on _X_EXPORT
It's always present (in supported Xserver versions), so no need for extra check.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/10>
2024-06-01 17:56:09 +00:00
Enrico Weigelt, metux IT consult
660059cf1a drop SIS_CP conditional'ed code pathes
This never had been enabled, since it's introduction in XFree86 4.3.99.16,
back two decades ago.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/9>
2024-05-22 10:35:16 +02:00
Enrico Weigelt, metux IT consult
cc96a86be6 drop compat with ancient xorg version
We're relying on at least 1.18 now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-15 15:47:52 +02:00
Enrico Weigelt, metux IT consult
670469aaeb drop compat with ancient XFree86 2/2
Since we're not compiling on ancient XFree86 anymore, the XF86_VERSION_CURRENT
is fixed at 4.3.99.902.0. Therefore we can now remove all code pathes meant
for lower versions.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-15 15:42:37 +02:00
Enrico Weigelt, metux IT consult
f5bc9cef56 drop compat with ancient XFree86 1/2
We still have lots of code pathes for XFree86, which is gone for
aeons now. That's detected by precense of XORG_VERSION_CURRENT define.

Since the whole show is quite complex now, yet just dropping all code pathes
only active if XORG_VERSION_CURRENT isn't defined. Still leaving the places
where Xorg is treated as Xf86 version 4.3.99.902.0 - these are cleaned up later.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-15 13:09:22 +02:00
Enrico Weigelt, metux IT consult
77384d1115 sis.h: drop fixed-value ifdefs
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-15 11:47:39 +02:00
Enrico Weigelt, metux IT consult
db6dc18cbc drop compat for ancient xserver versions
We're relying on at least 1.18 now.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-14 15:59:38 +02:00
Enrico Weigelt, metux IT consult
1911c96f92 bump minimal xorg version to 1.18
1.18 was released a decade ago, so it seems reasonable stop supporting
older ones.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/8>
2024-05-14 15:57:33 +02:00
Enrico Weigelt, metux IT consult
bfe2dd6d5d use XNFcallocarray() instead of xnfcalloc macro
xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve
any practical purpose, so it can go away once all drivers stopped using it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/7>
2024-05-08 16:40:53 +02:00
Alan Coopersmith
cc2f4d685f Use strdup() instead of malloc(strlen()+1); memcpy() pairs
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-03-10 15:32:12 -07:00
Alan Coopersmith
4c5ce451f0 Quiet -Wredundant-decls from xorg/os.h fallbacks for new libc functions
The Xorg headers provide their own versions of strlcat, strlcpy, and
timingsafe_memcmp for platforms that don't have them in libc yet, but
rely on configure to set HAVE_* defines to determine if they should be
defined in the headers.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-17 10:43:12 -08:00
Alan Coopersmith
1174436d1a Fix 5 of 5 -Wstringop-truncation warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-15 11:17:47 -08:00
Alan Coopersmith
5072df5b9d Fix warning: no previous prototype for ‘sis_get_device’ [-Wmissing-prototypes]
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-15 11:17:47 -08:00
Alan Coopersmith
2d64d83f24 Fix 40 of 42 -Wformat-nonliteral warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-15 11:17:47 -08:00
Alan Coopersmith
f5f1239385 Fix 2 of 2 -Wformat warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-15 11:17:38 -08:00
Alan Coopersmith
4edff7ddd4 Fix 20 out of 23 -Wshadow warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-12 17:34:06 -08:00
Alan Coopersmith
b691956206 Add X.Org's standard C warning flags to AM_CFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-11 13:45:44 -08:00
Alan Coopersmith
02169f1c5f configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
so it's time to rely on it.

Clears autoconf warnings:

configure.ac:44: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
configure.ac:44: You should run autoupdate.
aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from...
configure.ac:44: the top level

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2024-01-11 13:43:45 -08:00
Alan Coopersmith
82efbb311e gitlab CI: ensure libtool is installed in build container
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-10-06 16:08:16 -07:00
Alan Coopersmith
6b5e207863 SISErrorLog: Add printf attribute
sis_driver.c: In function ‘SISErrorLog’:
sis_driver.c:435:5: warning: function ‘SISErrorLog’ might be a candidate
  for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
     ^~~~~~~~~~~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-08 18:30:12 -08:00
Alan Coopersmith
7aca631c94 Resolve 174 out of 180 -Wdiscarded-qualifiers warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-08 18:24:49 -08:00
Alan Coopersmith
7a4afa9595 gitlab CI: stop requiring Signed-off-by in commits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-12-08 18:12:11 -08:00
Alan Coopersmith
aba561682d gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-28 16:31:55 -08:00
Alan Coopersmith
95129eb902 Fix spelling/wording issues
Found by using:
    codespell --builtin clear,rare,usage,informal,code,names

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-28 16:30:08 -08:00
Alan Coopersmith
87cf091427 Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-28 16:22:14 -08:00
Kevin Brace
63b17bc846 Version bumped to 0.12.1
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 21:20:11 -06:00
Kevin Brace
563cf3c47a Clean up XGI Technology PCI Device IDs
Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:50:24 -06:00
Kevin Brace
49b642e902 Clean up SiS PCI Device IDs
Define newer (?) SiS PCI Device IDs without the use of #ifndef.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:49:56 -06:00
Kevin Brace
500ca55f6d Remove a reference to _XF86_PCIINFO_H
xf86PciInfo.h was removed long time ago by commit
f6d49466ca.

Signed-off-by: Kevin Brace <kevinbrace@bracecomputerlab.com>
2019-12-16 20:48:57 -06:00
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