XLibre/xf86-video-sis
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sis.git synced 2026-03-24 01:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
372 Commits 7 Branches 112 Tags
b144cedfe12ed9b6ede4ddb80b02200292303f1a
Commit Graph

372 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Coopersmith
b144cedfe1 SiS_DDC2Delay: initialize variable before adding to it 
Fixes issue flagged by Oracle Parfait 13.3 static analyser:
   Uninitialised variable [uninitialised-var]:
      Uninitialised variable 'j' may be used for addition with
      SiS_GetReg(SiS_Pr->SiS_P3c4, 5)
        at line 424 of src/init301.c in function 'SiS_DDC2Delay'.

Though in truth, it doesn't matter much since we never read the
values written to 'j'.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/39>
 2024-10-12 15:00:33 -07:00
Semenov Herman
9709fe9741 micro-optimize: removed excess check exist pointer before free() 
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/38>
 2024-08-31 19:07:58 +00:00
Herman Semenov
0d0acc7d29 Added forgotten missing 'else if' 
Signed-off-by: Semenov Herman <GermanAizek@yandex.ru>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/35>
 2024-08-31 18:57:48 +00:00
Semenov Herman
597ef98b01 Fixed missing break in switch VDisplay (don't get mode 1280x720) 
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/34>
 2024-08-31 18:46:41 +00:00
Semenov German
42b78bc094 Fixed misprint in condition blocks with not used LCDheight (512x384, 400x300) 
Signed-off-by: Семёнов Герман <GermanAizek@yandex.ru>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/33>
 2024-08-31 18:35:17 +00:00
Semenov Herman
4f24960405 Fixed in SiS 315+ includes all chips (+XGI) set 'Blue' custom gamma RGB options 
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/32>
 2024-08-31 18:23:35 +00:00
Herman Semenov
cde13ef143 Fixed reset second XV display in DualHeadMode 
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/31>
 2024-08-31 18:12:57 +00:00
Семёнов Герман
9bbe2a772f Fixed invalid copy variable AllowHotkey in SiSCopyFromToEntity 
Signed-off-by: Herman Semenov <GermanAizek@yandex.ru>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/30>
 2024-08-26 21:37:56 +03:00
Enrico Weigelt, metux IT consult
fb3b448df7 fix FTBS on XSERVER_LIBPCIACCESS 
Not all Xserver versions define that symbol with a numeric value
(1 or 0), some just might not define it at all when disabled.

Using #if instead of #ifdef (as most sites do) will lead to compile break:

    ../../src/sis_driver.c:4008:25: error: expected value in expression
    #if XSERVER_LIBPCIACCESS
                            ^

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/27>
 2024-07-27 22:15:06 +00:00
Alan Coopersmith
a1f6d0148e README: Restore missing option name/type information 
The LinuxDoc to text conversion lost some important details.
Restored from LinuxDoc version removed in commit 116d40678d.

Fixes: a8ebd72 ("Check in generated README files")
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/29>
 2024-07-27 15:04:20 -07:00
Alan Coopersmith
e9ea79173c Move sizeof to second argument in calloc calls 
Clears -Wcalloc-transposed-args warnings from gcc 14.1, such as:

sis_utility.c: In function ‘SiSCtrlExtInit’:
sis_utility.c:1983:35: warning: ‘calloc’ sizes specified with ‘sizeof’ in the
 earlier argument and not in the later argument [-Wcalloc-transposed-args]
 1983 |       if(!(myctrl = calloc(sizeof(xSiSCtrlScreenTable), 1)))
      |                                   ^~~~~~~~~~~~~~~~~~~
sis_utility.c:1983:35: note: earlier argument should specify number of
 elements, later size of each element

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/28>
 2024-07-14 13:54:57 -07:00
Enrico Weigelt, metux IT consult
49187eddb5 drop unused SISDEINT code path 
This never had been enabled since it's incarnation back two decades ago.

Fixes: b41edc0ad1
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/25>
 2024-06-01 15:18:20 -07:00
Enrico Weigelt, metux IT consult
ce0eea80a4 drop XV_SD_DEPRECATED code paths 
This has been disabled since two decades, so probably not needed anymore.

Fixes: c8abdb74f9
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/24>
 2024-06-01 15:08:01 -07:00
Enrico Weigelt, metux IT consult
c13574e56f drop unused OLD1280720P code path 
This symbol was never enabled since it's incarnation two decades ago,
so there's probably no need for it at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/23>
 2024-06-01 22:02:18 +00:00
Enrico Weigelt, metux IT consult
51ae88d118 drop always-enabled ifdefs 
Always enabled ifdef's aren't needed. Dropping them and add the define's
comments to the corresponding places instead.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/22>
 2024-06-01 14:40:06 -07:00
Enrico Weigelt, metux IT consult
dada643639 drop obsolete ifdef SIS315H 
It's always enabled now, so no need for the 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/21>
 2024-06-01 14:27:24 -07:00
Enrico Weigelt, metux IT consult
0983d0ddcb drop obsolete ifdef SIS300 
It's always enabled, so no need for the 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/21>
 2024-06-01 14:27:24 -07:00
Enrico Weigelt, metux IT consult
41d550ec05 drop obsolete #ifdef SIS_XORG_XF86 
It's always enabled, so we don't need extra #ifdef's for that.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/21>
 2024-06-01 14:27:24 -07:00
Enrico Weigelt, metux IT consult
05dfca3f7d drop support for ancient Linux 2.4 framebuffer device 
This never seemed having been enabled, so most likely not needed at all.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/21>
 2024-06-01 14:27:22 -07:00
Enrico Weigelt, metux IT consult
989d909c3f drop unused code path behind #ifdef SIS_HAVE_DRIVER_FUNC 
This never had been enabled, so there's probably no need for it 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/20>
 2024-06-01 19:24:21 +00:00
Enrico Weigelt, metux IT consult
24876cce1f drop obsolete SIS_HaveDriverFuncs 
This has always been set to 0 - alternative code pathes never had been active
and also have been dropped 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/19>
 2024-06-01 12:07:52 -07:00
Enrico Weigelt, metux IT consult
49ed4f326f drop obsolete SISAGPHTYPE 
It's now always defined to drm_handle_t, so we can use that one directly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-sis/-/merge_requests/18>
 2024-06-01 19:05:15 +00:00
Enrico Weigelt, metux IT consult
4ee97929e8 drop obsolete SISISXORG6899900 
It's always defined, so no need for the 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/18>
 2024-06-01 19:05:15 +00:00
Enrico Weigelt, metux IT consult
1e4a5e8d9f drop ifdef on SISGAMMARAMP 
It's always enabled, so no nede for the 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/17>
 2024-06-01 18:58:51 +00:00
Enrico Weigelt, metux IT consult
5abf906ed6 drop ifdef on ENABLE_YPBPR 
It's always enabled, so no need for the 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/16>
 2024-06-01 18:51:54 +00:00
Enrico Weigelt, metux IT consult
d3303f38cc drop ifdef on UNLOCK_ALWAYS 
It's always enabled, so no need for the #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/15>
 2024-06-01 18:45:18 +00:00
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