Commit Graph

2684 Commits

Author SHA1 Message Date
Drew Parsons
2f994cb00e Create dix/libXpdix.la for Xprint-specific build of libdix.la
(cherry picked from commit 4e2c6dbabdbbaaca213fd08edd422de15d0900cc)

required because of commit 7c0709a736,
which made requestingClient in dix specific to Xprint only.
Add to XPRINT_LIBS in hw/xprint/Makefile.am in front of
$(XSERVER_LIBS) to override definitions in libdix.la for standard xservers.

Follows 571206832d (providing -DXPRINT
to xprint subdirs).

Note it may be possible to restructure the code so that
requestingClient is stored elsewhere than in dix. See discussions
following http://lists.freedesktop.org/archives/xorg/2008-March/033844.html
If this is done it may be possible to revert this commit (if not 571206...).
(cherry picked from commit 966ae1781f)
2008-06-09 13:56:59 -04:00
Drew Parsons
30774d6b3c Define XPRINT in XPRINT_CFLAGS (configure.ac)
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736 it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
(cherry picked from commit 571206832d)
2008-06-09 13:56:53 -04:00
Dave Airlie
50e77eb838 int10: add pci_device_enable support on Linux
(cherry picked from commit ea4ec9e998)
2008-06-09 13:29:32 -04:00
Adam Jackson
5efe36f7af Fix reduced-blanking mode filtering in RANDR 1.2.
If the monitor isn't reduced-blanking (either through EDID logic, or
config file setting), then remove RB modes from the default pool.  Any
RB modes from the driver and config file pools will stick around though;
you asked for them, you got them.
(cherry picked from commit 0178b6a4ab)
2008-05-19 11:27:58 -04:00
Adam Jackson
0230f39fa3 RANDR 1.1 compat: remove senseless comparison against the virtual size.
(cherry picked from commit aad1c37b09)
2008-05-16 11:11:40 -04:00
Adam Jackson
95985256ef xf86SetDesiredModes(): Skip disabled CRTCs first thing.
(cherry picked from commit 14726b776d)
2008-05-16 11:11:40 -04:00
Adam Jackson
bedcf98558 Fix initial mode selection even harder.
The first guess used to be "is the preferred mode for one output the
preferred mode on all outputs".  Instead, do "find the largest mode that's
preferred for at least one output and available on all outputs".
(cherry picked from commit 459f34b089)
2008-05-16 11:11:40 -04:00
Adam Jackson
bd50c41f6f Redo RANDR compatibility output selection.
Old logic was just the first one that happened to have an associated
CRTC.  The new logic tries to find one that's definitely connected, has
probed modes, and has the largest candidate mode.
(cherry picked from commit 96111c1547)
2008-05-16 11:11:40 -04:00
Adam Jackson
0b031442fe Re-add sync range inference from legacy setup to RANDR 1.2.
(cherry picked from commit a4bbe1c8bc)
2008-05-16 11:11:39 -04:00
Adam Jackson
cfff55a2bb Fix fbdevhw initialization for PCI drivers.
graphics/fb%d, not graphics:fb%d.  Thanks sysfs.  Thysfs.
(cherry picked from commit 86678e7cc2)
2008-05-16 10:03:24 -04:00
Julien Cristau
f2278a882f kdrive: allow disabling Composite
KdInitOutput() used to enable Composite when it was disabled by default,
but now this hack prevents ``-extension Composite'' from working.
Remove it, as Composite is enabled by default anyway.
(cherry picked from commit 9dfb525f6c)
2008-05-11 23:38:03 +02:00
Adam Jackson
64948dc667 Bug #13104: Remove broken XAA a1 glyph fast path.
(cherry picked from commit f17ba5d584)
2008-05-08 16:12:01 -04:00
Adam Jackson
f2aa0000a2 Bug #13104: Don't let XAA glyph pixmaps anywhere near video memory.
Since glyphs are stored in pixmaps now, they can make their way into VRAM,
which invalidates a bunch of fast-path assumptions in the XAA code.  Thus
you end up doing color-expands or WriteBitmap from la-la land and your
aliased glyphs go all funny.

Since XAA isn't ever growing the ability to do sane glyph accel, just force
glyph pixmaps into host memory by catching them at CreatePixmap time.
(cherry picked from commit 718652eaf9)
2008-05-08 16:09:56 -04:00
Jordan Crouse
fd0ec73bcb xf86: Change AutoConfig driver for PCI ID 022:2091 to 'geode'
(cherry picked from commit 4fa89fbe18)
2008-04-30 11:51:08 +03:00
Kristian Høgsberg
5a2b538c1b Make DRI2 a serverlayout/serverflags option.
Add xf86DRI2Enabled() to export the value of the setting.
(cherry picked from commit 35982bc109)
2008-04-15 11:48:33 +10:00
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