Commit graph

2669 commits

Author SHA1 Message Date
Matt Turner
db00d4a4dc Check for __x86_64__ when we check for __amd64__
It seems Intel C Compiler neglects to define __amd64__, __amd64, or
amd64, but *does* define __x86_64__.
(cherry picked from commit 1fa4de80fc)
2008-04-15 11:47:48 +10:00
Peter Hutterer
099d1bef22 dix: Call DeleteInputDeviceRequest from CloseDownDevices (#14418)
The DDX (xfree86 anyway) maintains its own device list in addition to the one
in the DIX. CloseDevice will only remove it from the DIX, not the DDX. If the
server then restarts (last client disconnects), the DDX devices are still
there, will be re-initialised, then the hal devices come in and are added too.
This repeats until we run out of device ids.

This also requires us to strdup() the default pointer/keyboard in
checkCoreInputDevices.

X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418>
(cherry picked from commit 6d22a9615a)
2008-04-15 11:47:04 +10:00
Dave Airlie
566037a914 quirk: add quirk for ACR 640x350 default mode is wrong
RH #440186
(cherry picked from commit b19027fbae)
2008-04-15 11:46:36 +10:00
Adam Jackson
9a908769e6 Fix PCI config space cycles from int10 emulator.
The top bit of 0xCF8 is an enable bit, not part of the domain.  Sending
cycles to domain 128 instead of domain 0 is rarely the right thing to do.
(cherry picked from commit cc7c045bae)
2008-04-07 10:32:07 -04:00
Dave Airlie
b2704de8a7 quirk: add quirk for ACER EDID
(cherry picked from commit f0915fb3c4)
2008-04-07 10:31:46 -04:00
Hong Liu
8ccdaa288a Bug #15160: quirk Proview AY765C
prefer first detailed timing
(cherry picked from commit ebc56aca8b)
2008-04-07 10:30:38 -04:00
Goneri Le Bouder
8059b57f9b xfree86: don't crash in AutoConfig if the primary device is not pci
Only call matchDriverFromFiles() if we found a pci device.
Debian bug#472823 (http://bugs.debian.org/472823).
(cherry picked from commit 9500033b9e)
2008-04-07 10:30:26 -04:00
Dave Airlie
a2fcdfd5f9 quirk: fix LPL monitors properly.
no point having a h cm fix when we really want to copy the sizes from the
other place.

RH BZ 435216
(cherry picked from commit c747030a49)
2008-04-07 10:26:59 -04:00
Kristian Høgsberg
d1dd774910 Only autoload RECORD if it was enabled.
(cherry picked from commit 16a8ce7558)
2008-04-04 11:47:08 -04:00
Kristian Høgsberg
81af92f5d9 Pick up dri2proto from the standard proto header include path. 2008-04-02 19:22:05 -04:00
Kristian Høgsberg
bbd87f85a3 Add @XORG_CFLAGS@ to satisfy xf86* includes.
Pointed out by Hasso Tepper.
2008-04-02 18:00:06 -04:00
Xiang, Haihao
7d97c19c2d dri2: fix crasher if DRI2Connect fails 2008-04-02 12:03:12 -04:00
Kristian Høgsberg
2156bdf3b7 Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext.  Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.

Add protocol code to DRI2 module and load DRI2 extension by default.
(cherry picked from commit c40e0b51f0)
2008-04-01 11:58:27 -04:00
Eamon Walsh
c26bccf417 XSELinux: Add xorg.conf option for permissive/enforcing/disabled.
Patch by Joe Nall.

The option goes in the "extmod" subsection.
TODO: Make it easier for extension modules to handle their own options.
(cherry picked from commit b5f98fcea2)
2008-03-28 14:24:06 -04:00
David Nusinow
2d312eaf4f Bug #10016: Implement WM_CLASS hints in Xephyr.
(cherry picked from commit f028e245a7)
2008-03-24 16:59:22 -04:00
Adam Jackson
d6ec5eaded Bug #11510: Fix build without RECORD.
(cherry picked from commit 862ff9ac92)
2008-03-24 13:38:01 -04:00
Adam Jackson
f250352d2e Bug #11508: Fix build without XV.
(cherry picked from commit 87bfd3bd96)
2008-03-24 13:34:30 -04:00
Julien Cristau
80968c4a91 xaa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't return the option's value, just whether it's present
in the configuration.
(cherry picked from commit 4217ba0cf0)
2008-03-24 10:22:41 -04:00
Julien Cristau
f40bd686e5 exa: use xf86ReturnOptValBool instead of xf86IsOptionSet
The latter doesn't give you the option's value, it just tells you if
it's present in the configuration.  So using Option "EXANoComposite" "false"
disabled composite acceleration.
(cherry picked from commit 6b9d2bb1f7)
2008-03-24 10:22:37 -04:00
Michel Dänzer
84a27f7a92 Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big endian
platforms) fixes it for me with the radeon driver and doesn't break intel.

Correct patch this time :)
(cherry picked from commit da973e962d)
2008-03-24 10:20:14 -04:00
Dodji Seketeli
21dc186245 [Xephyr/DRI] correctly route motion events targeted at GL drawable
(cherry picked from commit cdadd2ff9b)
2008-03-24 10:18:52 -04:00
Jesse Barnes
4f0755d6d4 Fail CRTC configuration if !vtSema
Unless we check for vtSema before calling into the CRTC and output callbacks,
we may end up trying to access video memory that no longer exists, leading to a
crash.  So if we don't have vtSema, return FALSE to the caller, indicating that
we didn't do anything.

Fixes #14444.
(cherry picked from commit bee2ddf35f)
2008-03-24 10:09:23 -04:00
Matthieu Herrb
727e22c830 test for the presence of pci_system_init_dev_mem() before calling it.
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
(cherry picked from commit db248ffb84)
2008-03-24 10:09:09 -04:00
Donnie Berkholz
a399b77e8f Xephyr: Build fix: Port across XF86dri.c changes from Mesa.
(cherry picked from commit aa231f28d5)
2008-03-24 10:08:47 -04:00
Donnie Berkholz
c81a8c3eac Xephyr: Distribute ephyrdriext.h in tarballs.
(cherry picked from commit a955c3b587)
2008-03-24 10:08:40 -04:00
Adam Jackson
4a61cf3b08 Fix a stray use of ALLOCATE_LOCAL.
(cherry picked from commit 57d48d94b8)
2008-03-14 14:46:34 -04:00
Adam Jackson
43739b9a32 RANDR 1.2: Fix initial mode aspect ratio match in a corner case.
Actually more like in the mainline case, where the ideal mode happens to
be the very first aspect match on the first monitor.  But let's not
split hairs.
(cherry picked from commit 8248537722)
2008-03-14 14:25:27 -04:00
Bart Trojanowski
92cffb8cc2 Bug #14332: Fix PCI access cycles from x86emu.
The address written to 0xcf8 contains the PCI slot address to send the
config cycle to.  However, we would ignore that and always send the
cycle to the device whose BIOS we were running.  This breaks some
integrated graphics platforms that have explicit knowledge about the
system's host bridge, for example.
2008-03-14 14:10:22 -04:00
Doug Chapman
db26f32d0d Bug #14091: Fix build (and runtime) on ia64. 2008-03-14 14:10:11 -04:00
Adam Jackson
95f6d8822d RANDR 1.2: Fix the RANDR 1.1 screen size estimation to approach reality.
While the ScreenRec's notion of size in millimeters would get updates,
the RANDR 1.1 notion wouldn't, so your screen would appear to be square
and probably at some ludicrous DPI.
2008-03-14 14:10:06 -04:00
Adam Jackson
e4dee1626d RANDR 1.2: Don't report a square resolution to RANDR 1.1 clients.
It can't possibly do anything useful, and older versions of Gnome (and
proably others) get very confused by it.  So do the drivers, for that
matter.
2008-03-14 14:09:57 -04:00
Mark Kettenis
ce70eb1fe3 OpenBSD support for libpciaccess.
xserver and libpciaccess both need to open /dev/xf86, which can only
be opened once.  I implemented pci_system_init_dev_mem() like Ian
suggested.  This requires some minor changes to the BSD-specific
os-support code.  Since pci_system_init_dev_mem() is a no-op on
FreeBSD this should be no problem.
2008-03-14 14:09:45 -04:00
Kristian Høgsberg
b02d11e629 DRI2: Add DRI2AuthConnection().
DRI2 uses the same authentication scheme as XF86DRI, so implement this
entry point so DRI2 protocol code can access it.
2008-03-14 14:08:12 -04:00
Kristian Høgsberg
12829f1e91 DRI2: Return event buffer head index in DRI2CreateDrawable.
And pass it to the DRI driver in AIGLX.
(cherry picked from commit acedc03367)
2008-03-10 18:18:14 -04:00
Adam Jackson
921cbc5803 Add the "amd" driver to magic driver selection. 2008-03-10 13:40:23 -04:00
Adam Jackson
e5bd75e11f Bug #14927: Fix the math for xf86NumDefaultModes.
(cherry picked from commit 0f6aaf636b)
2008-03-10 09:14:38 -04:00
Adam Jackson
ef702d5866 Size xf86DefaultModes explicitly.
i.e., don't check for the end of the list by ->name == NULL, since that
won't work now.  Fix the consumers of xf86DefaultModes to use the new
explicit size as well.
2008-03-07 09:25:34 -05:00
Adam Jackson
b260febcec Fix segfault when a monitor exists but has no modes.
Thanks to Zhenyu Wang for finding this.
(cherry picked from commit 3fcb6445dc)
2008-03-07 08:31:40 -05:00
Adam Jackson
2a47accff8 Fix distcheck. 2008-03-05 23:56:49 -05:00
Adam Jackson
e4d92a13e8 Make xf86InitialConfiguration slightly smarter.
Old heuristic was to find the first monitor that expressed a preference,
then attempt to get all other monitors to agree.  This doesn't work
particularly well when the two sets of modes don't precisely intersect,
you get overlapping-but-not-identical output geometry and things go wrong.

New heuristic is:
- Exact user preference, if given
- Exact output preference, if the same for all outputs
- Best (largest) mode of modes common to all outputs:
  - with the same aspect ratio as all outputs (may be NULL)
  - with 4:3 aspect ratio
- Then the old heuristic to try to get something lit

Note that it is simply not doable to have a reliable initial output guess if
you insist on trying to clone all outputs together.  It's far too easy to
end up with displays that simply don't have modes in common.  We need to
switch to right-of placement someday, once we're not limited to CRTC size
limits and we have working multi-GPU in RANDR.
(cherry picked from commit 27e7dacbf7)
2008-03-04 13:01:15 -05:00
Adam Jackson
5afdba241e Remove all mention of the vga driver from the config logic.
(cherry picked from commit 95df04b744)
2008-03-04 13:01:03 -05:00
Adam Jackson
5d2946655b RANDR 1.2: Inherit PreferredMode from the global configuration, if any.
If you don't do this, then Modes "800x600" in the Display subsection will
be dutifully ignored and the driver will start at whatever resolution it
feels like.
2008-03-03 15:52:50 -05:00
Adam Jackson
28c156e2ba Fix Motif menu drawing in Xnest.
See also Red Hat bug #229350, OpenSolaris bug #6366490.
2008-03-03 15:52:42 -05:00
Adam Jackson
71037ebfb4 xf86DDCMonitorSet: Honor the DisplaySize from the config file.
We honor sync ranges and pixel clock settings from the config here, no
reason to ignore DisplaySize.
2008-03-03 15:52:32 -05:00
David Nusinow
f7ab2d3821 Add missing file from previous commit. 2008-03-02 18:36:25 -05:00
David Nusinow
b5ce0e1d0b Bug #13860: Ensure that the DRI mode is in octal format. 2008-03-02 17:12:02 -05:00
Matthieu Herrb
c934366424 use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly 2008-03-02 19:32:01 +01:00
David Nusinow
2bb9c1f36f bug #10008: Make Xvfb.1 document the correct default depth 2008-03-01 18:45:46 -05:00
George Sapountzis
3d64290547 clean some "unused" warnings 2008-03-01 19:49:24 +02:00
Maarten Maathuis
8af2c39bcc Fix big mistake in commit fd41f46ac6.
- When a mode is deleted, the name pointer is also free()'ed.
- This leaves other modes with an invalid pointer.
2008-03-01 16:54:01 +01:00