Commit Graph

291 Commits

Author SHA1 Message Date
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
Peter Hutterer
bdaf1ba97c Undo typos from last commit
Reported-by: Tormod Volden <debian.tormod@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-01-17 15:22:22 +10:00
Peter Hutterer
9c1f8f775c Untangle XF86DRI from the driver-specific DRI define
XF86DRI is defined by xorg-server.h, so --disable-dri in the sis driver
itself does exactly nothing other than not fill in the CFLAGS and thus stop
the driver from compiling.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-04 14:13:46 +10:00
Peter Hutterer
16724f3ecd Use miPointerSetPosition, not miPointerAbsoluteCursor
miPointerAbsoluteCursor was removed in '09.

Technically this shouldn't just work on the VCP since any master pointer may
end up in the dead area. However, I suspect the Venn diagramm of MPX users
and sis merged framebuffer users shows little overlap.

miPointerSetPosition's prototype changed a few times, these are a bunch of
untested ifdefs that should be correct according to the git history.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-01-04 13:16:38 +10:00
Adam Jackson
3e0d8e1192 Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-12-19 17:28:33 -05:00
Jeremy Huddleston
2b459f385d Build fix for older servers (error: conflicting types for 'pciTag')
/usr/include/xorg/xf86Pci.h:254:25: note: previous declaration of 'pciTag' was here

Reported-by: Johannes Obermayr <johannesobermayr@gmx.de>
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-31 11:59:20 -07:00
Jeremy Huddleston
0ab07a477a Use pci_device_map_legacy rather than xf86MapDomainMemory on newer servers
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-30 11:09:30 -07:00
Jeremy Huddleston
77046f9be0 Convert use of LookupWindow to dixLookupWindow
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-30 10:59:46 -07:00
Jeremy Huddleston
06f8213bff pciTag was removed from xorg-server, so provide it in-driver until this is updated to use libpciaccess
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-29 17:38:22 -07:00
Jeremy Huddleston
03644653d0 Silence warnings by using newer xf86dgaproto
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-29 17:25:18 -07:00
Jeremy Huddleston
4b0aab53a1 Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains.  If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-19 00:40:32 -07:00
Jeremy Huddleston
69aa104ed0 Use unsigned long rather than deprecated IOADDRESS
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-19 00:37:25 -07:00
Jeremy Huddleston
28f3a899a1 Use malloc/calloc/realloc/free directly
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-07 12:32:22 -07:00
Jeremy Huddleston
c530ebb5d4 Fix build failures with recent server changes to swapl and swaps
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-07 12:24:40 -07:00
Matt Turner
89e9a38f0c Fix wrong-sized swaps
Signed-off-by: Matt Turner <mattst88@gmail.com>
2011-09-25 12:32:08 -04:00
Alan Coopersmith
94f23a5672 Convert sis.man from XORG_RAWCPP to using sed like other drivers
Upgrade to util-macros 1.8 for additional man page support

Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
The value of MAN_SUBST is the same for all X.Org packages.

Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
The existing statement can now be removed from the configuration file.

Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
Enables silent rule and use platform appropriate version of sed.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-07 22:16:43 -07:00
Jesse Adkins
b3368984ae Purge cvs tags.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-06 20:47:19 -07:00
Gaetan Nadon
c2a6ffda81 config: add comments for main statements 2010-07-22 15:38:56 -04:00