Commit Graph

370 Commits

Author SHA1 Message Date
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
Gaetan Nadon
ae7ac7fe58 config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-21 16:07:00 -04:00
Gaetan Nadon
fe34acc246 config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-21 14:37:41 -04:00
Gaetan Nadon
4d77c76f9c config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-21 14:05:23 -04:00
Gaetan Nadon
2a3e9ff446 config: complete AC_INIT m4 quoting
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-21 09:27:42 -04:00
Gaetan Nadon
00d2b8790a config: remove unrequired AC_SUBST([DRI_CFLAGS])
This macro is called by PKG_CHECK_MODULES

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-20 21:54:12 -04:00
Gaetan Nadon
ca0dd9ac3d config: remove unrequired AC_SUBST([XORG_CFLAGS])
This macro is called by PKG_CHECK_MODULES

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-20 21:44:58 -04:00
Gaetan Nadon
96daa64b9c config: remove unrequired AC_HEADER_STDC
Autoconf says:
"This macro is obsolescent, as current systems have conforming
header files. New programs need not use this macro".

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-20 20:24:42 -04:00
Gaetan Nadon
517a7563c4 config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-20 19:41:31 -04:00
Gaetan Nadon
494ce36b3b config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.

ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-07-20 18:45:19 -04:00
Fernando Carrijo
519a4653ff Purge macros NEED_EVENTS and NEED_REPLIES
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-07-09 20:50:00 -07:00
Dave Airlie
75a8a7c515 sis 0.10.3 xf86-video-sis-0.10.3 2010-07-05 14:23:33 +10:00
Julien Cristau
ac05588db7 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>
2010-06-29 21:41:05 +01:00
Gaetan Nadon
116d40678d 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>
2010-06-14 08:14:30 -04:00
Gaetan Nadon
5f9fd07d54 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>
2010-06-14 07:58:26 -04:00
Gaetan Nadon
1bec9268f5 COPYING: replace stub file with actual Copyright notices.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-06-13 10:56:05 -04:00
Adam Jackson
13583aba3e Remove mibank.h reference
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-05-18 13:11:01 -04:00
david@fries.net
47233238a6 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>
2010-05-11 15:19:48 +02:00
Tiago Vignatti
dff79298ae Document better the resource access hack
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
2010-05-06 20:15:04 +03:00
Alan Coopersmith
d33e45dcae Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-01-15 13:55:44 -08:00
Gaetan Nadon
2c9baaaa8a configure.ac: use backticks rather than $() for cmd subs
Use "$PKG_CONFIG" rather than hard coded "pkg-config"

Acked-by: Dan Nicholson <dbn.lists@gmail.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-12-28 15:17:12 -05:00
Gaetan Nadon
cbfa94ccb1 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
2009-11-23 09:25:05 -05:00