Commit Graph

231 Commits

Author SHA1 Message Date
Jeremy Huddleston
3b0201f893 Merge branch 'server-1.3-branch' into xorg-server-1.2-apple
Conflicts:

	configure.ac
2007-11-19 20:27:52 -08:00
Ben Byer
fe7d2be313 Some autoconf hacks to make 'make dist' work correctly 2007-11-19 02:38:18 -08:00
Alan Coopersmith
e707604ab3 Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's
been useless to Xorg for a long time (it only declared a couple of kernel
variables)
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003>
2007-03-04 19:19:18 -08:00
Samuel Thibault
bd7377f9e8 xfree86/hurd: re-add missing keyboard support (bug #5613)
Re-add missing hurd_io.c and hurd_kbd.c, which aren't needed in master,
but are required in the 1.2.x branch.
2006-12-16 19:41:25 +02:00
Alan Hourihane
731952c561 Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
2006-12-13 12:13:11 +00:00
Alan Coopersmith
77df812453 Map missing keycodes for Sun Type 5 keyboard on Solaris SPARC 2006-12-05 20:05:15 -08:00
airlied
7c639791be fixup configure.ac problems with DRI_SOURCES and LBX_SOURCES 2006-12-01 11:10:19 +11:00
airlied
03fcf5ec99 DRI: call drmSetServerInfo() before drmOpen().
Also, remove some libdrm remnants.
(cherry picked from 5bfe7f4dfc commit)
2006-12-01 10:35:03 +11:00
Eric Anholt
d8c3c0ee09 Fix typo before the last commit.
(cherry picked from 28337cc106 commit)
2006-12-01 10:34:01 +11:00
Eric Anholt
5a91845236 Bug #8868: Remove drm from SUBDIRS now that the directory is gone.
(cherry picked from e1720b1089 commit)
2006-12-01 10:33:46 +11:00
airlied
e87285c2a0 make X server use system libdrm - this requires libdrm >= 2.3.0
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
(cherry picked from fd91630b73 commit)
2006-12-01 10:32:57 +11:00
Adam Jackson
07c437e195 Include a forgotten ia64 header in the distball. Builds on ia64 now. 2006-11-13 13:54:19 -05:00
Matthias Hopf
9ded9241ba Fix obviously wrong boundary checks + cleanup unused vars.
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
(cherry picked from 072c022e73 commit)
2006-11-10 15:04:57 -05:00
Matthias Hopf
f816eafa51 Fix device path in altixPCI.c to be domain aware.
(cherry picked from d50fc413b3 commit)
2006-11-10 15:04:51 -05:00
Matthias Hopf
6d56600c0c Add domain support to linuxPciOpenFile().
Loosely based on patch from David S. Miller <davem@davemloft.net>
See also bug #2368.
(cherry picked from 1d731fc54a commit)
2006-11-10 15:04:42 -05:00
Matthias Hopf
dbe3e8d604 Fixing domain support for ia64
ia64 specific functions + defines.
Still uses /proc interface for some scaning code.
Based on code from Egbert Eich <eich@freedesktop.org>.
(cherry picked from caaa113acf commit)
2006-11-10 15:04:34 -05:00
Matthias Hopf
5ab79d69e3 Added linux 2.6 compatible domain aware device scanning code.
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
(cherry picked from 5afc6c1a14 commit)
2006-11-10 15:04:24 -05:00
Matthias Hopf
bb8f02dbea Added missing domain stripping in already domain aware code.
(cherry picked from f4dd2665b0 commit)
2006-11-10 15:04:12 -05:00
Bram Verweij
be91a981df xfree86/linux acpi: fix tokenising
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
(cherry picked from 0567a6337b commit)
2006-11-08 18:10:40 +02:00
Daniel Stone
66b2c9bd2d add 'general socket' handler, port ACPI to use it
Add a general socket (not input device, but still need to be woken for it)
handler to both the DIX and XFree86, and make XFree86's ACPI handling use
it.  This stops DPMS waking up every time an ACPI notification comes in.
2006-11-08 18:10:40 +02:00
Bjorn Helgaas
58653b676d Do not map full 0-1MB legacy range
If we're mapping something in the "legacy range" (0-1Mb), we shouldn't
expand the requested range to the entire 0-1Mb range.  Typically this
is for mapping the VGA frame buffer, and some platforms support mmap of
the frame buffer but not the entire 0-1Mb range.

For example, HP sx1000 and sx2000 ia64 platforms can have memory from
0-0x9ffff, VGA frame buffer from 0xa0000-0xbffff, and memory from
0xc0000-0xfffff.  On these platforms, we can't map the entire 0-1Mb
range with the same attribute because the memory only supports WB,
while the frame buffer supports only UC.  But an mmap of just the
frame buffer should work fine.
(cherry picked from bd0c829654 commit)
2006-11-08 10:18:51 -05:00
Egbert Eich
93ae22b16b Fixing mach64 driver bailing out on ia64
Mach64 driver bails out on ia64 because it cannot map device
memory. It turns out that some bogus and unneeded code attempts
to find the root bridge of the device and fails to do so proberly
as there this host-to-pci bridge is not existant. This code has
been around for years although it completely unclear what it had
been intended for. Fixing this by eliminating the bogus code.
(cherry picked from c1828a8ff5 commit)
2006-11-08 10:17:58 -05:00
Myron Stowe
267dc25e5c xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
(cherry picked from 794f2e7291 commit)
2006-11-08 09:53:33 -05:00
Donnie Berkholz
0790665ff0 Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd0 used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
(cherry picked from d812f486a0 commit)
2006-10-11 16:00:34 -04:00
Adam Jackson
61f3eb816b Back out merge of master to 1.2 branch. Undoes 89987ca...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
2006-10-11 15:56:45 -04:00
Michel Dänzer
54d371e7a4 Add wrapper for new ioctl to update drawable information in the DRM. 2006-09-27 10:48:41 +02:00
Donnie Berkholz
d812f486a0 Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd0 used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
2006-09-20 15:39:39 -07:00
Jesse Barnes
b3a3020fd0 the new PCI mapping routines are broken on sparc64 (in fact they look
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now.  the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
2006-09-10 11:13:18 -07:00
Bastian Blank
f7919c2879 xfree86: don't do legacy IO on ARM or S/390 (Debian #362641)
Don't attempt to poke legacy IO ranges on ARM or S/390.
2006-08-12 20:43:25 +03:00
Samuel Thibault
e641000b98 xfree86: add Hurd support (#5613)
Add support for GNU/Hurd.
2006-08-12 19:41:59 +03:00
Adam Jackson
0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Ian Romanick
2f98841fde Remove unused variable. 2006-07-20 16:08:27 -07:00
Ian Romanick
c69c00d652 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-07-20 12:08:38 -07:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Adam Jackson
881953813c Fix the Linux ACPI reopen code to use a repeating timer, rather than a
one-shot sleep-and-reopen attempt.
2006-07-17 13:50:38 -04:00
Ian Romanick
d3ee49bcba Refactor common code from the generic.c and linux.c version of
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.

These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
2006-07-14 15:13:35 -07:00
Ian Romanick
8793c7fd4b Refactor identical xf86InitInt10 function from generic.c and linux.c
to helper_exec.c.
2006-07-14 09:11:39 -07:00
Tilman Sauerbeck
39b2f7b218 Bug #3042: Use autoconf to get the correct name of a struct member.
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
2006-07-08 19:55:53 +02:00
Adam Jackson
d7a96dd6f1 Switch the default mouse device on Linux to /dev/input/mice. 2006-07-06 17:39:14 -04:00
Ian Romanick
8d07ee070e Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
optimization in the search loop.
2006-07-06 12:48:51 -07:00
Greg Kroah-Hartman
cc3e99f747 fix some more compiler warnings due to defines being declared differently 2006-07-05 10:13:19 -07:00
Eric Anholt
002e28c12c Correct AGP memory deallocation argument on *BSD.
This fixes leaks and eventual crashes with RandR resizing on Intel.
2006-07-03 12:48:12 -07:00
Martin Bochnig
6bd4c25439 Updated Solaris aperture driver to build on sun4v & amd64 kernels
Updated for Solaris 10 changes to DDI
2006-06-29 16:25:36 -07:00
Matthieu Herrb
2b58685402 Check setuid() return value. Bugzilla #7116. 2006-06-20 21:07:53 +02:00
Daniel Stone
8444bb77c9 When we can, bound the maximum number of PCI devices to attempt to scan, by
the number found on the system. Only implemented for Linux right now.
2006-06-05 20:22:06 +00:00
Adam Jackson
52fc7c8dc7 Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
    now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
    ifdefs surrounding a call to a function added in XFree86 4.1 (!).
    Miscellaneous static markings.
2006-06-05 03:00:24 +00:00
Daniel Stone
8e8c6faecd Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) 2006-06-03 10:48:37 +00:00
Daniel Stone
56f21bda1c Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham) 2006-06-01 22:30:52 +00:00
Daniel Stone
a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Matthieu Herrb
fc5ca97284 Powerpc machines also need ioperm_noop.c 2006-05-30 22:56:36 +00:00