Commit Graph

1650 Commits

Author SHA1 Message Date
Maarten Maathuis
48744d20b1 xf86Crtc: Set mode to NULL, so nothing bad happens if crtc == NULL.
- Fix is courtesy of math_b.
2008-08-31 18:14:57 +02:00
Xavier Bestel
580e96d6d4 Cosmetic fix to EDID decoding.
(cherry picked from commit bb2cacd33e)
2008-08-29 14:48:40 -04:00
Julien Cristau
db918ea2b0 xfree86: use xorg.conf input devices if there is no ServerLayout
If xorg.conf has no ServerLayout section, use the first mouse and
keyboard sections as core devices, even with AllowEmptyInput.
(cherry picked from commit 2eaed4a10f)
2008-08-06 10:34:35 +09:30
Peter Hutterer
d199d800a4 xfree86: warn some more about potential missing input devices.
Put out a warning if xorg.conf has InputDevice sections, but these aren't
referenced in the used ServerLayout. This is only performed if AllowEmptyInput
is enabled.
The reason behind this is that the server used to auto-add the first
mouse/keyboard sections if none where referenced. Now, with HAL and AEI
enabled by default, setups that relied on this auto-adding break and are left
without input devices. The least we can do is warn them.
(cherry picked from commit 47160edec7)
2008-07-29 10:03:07 +09:30
Peter Hutterer
538942cc65 xfree86: if AllowEmptyInput is on, warn the user that we rely on HAL now.
(cherry picked from commit f30b0823db)
2008-07-29 10:03:07 +09:30
Eamon Walsh
ceffece78b Fix "warning: passing argument 1 of `modeIsPresent' from incompatible pointer type".
(cherry picked from commit 95d4ede538)
2008-07-21 17:13:59 -04:00
Dave Airlie
7f542ab37f modes: fix initial xorg.conf mode selection.
This was all kinds of broken, we ignored user preferred modes for multiple
monitors and also for side-by-side configurations.
(cherry picked from commit 0b9ef835a0)
2008-07-21 17:08:07 -04:00
Peter Hutterer
5cb38a3fca xfree86: don't free the config-file related information in DIDR. #15645
In DeleteInputDeviceRequest, leave the conf_idev (which is shared with
xf86ConfigLayout.input) alone for devices that were specified in the
ServerLayout section of the config file. This way, in the next server
generation we are left with what was the original config and can thus re-init
the devices.

This is an addon to 6d22a9615a, an attempt to
fix Bug 14418.

X.Org Bug 15645 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
X.Org Bug 14418 <https://bugs.freedesktop.org/show_bug.cgi?id=15645>
(cherry picked from commit 9ab4e2fd8e)
2008-07-16 10:32:46 +09:30
Julien Cristau
2b3faf2a75 Bug #16674: Make sure RANDR reports refresh as 0 if pixel clock is 0.
(cherry picked from commit 9111944b29)
2008-07-15 10:37:31 -04:00
Peter Hutterer
5b546f1c49 xfree86: append, not prepent, new input devices to xf86InputDevs.
If devices are prepended to the list, their wake-up order on resume is not the
same as the original initialisation order. Hot-plugged devices, originally
inited last, are re-enabled before the xorg.conf devices and in some cases may
steal the device files. Result: we have different devices before and after
suspend/resume.

RedHat Bug 439386 <https://bugzilla.redhat.com/show_bug.cgi?id=439386>
(cherry picked from commit 11ee0ae939)
2008-07-14 12:53:28 +09:30
Sascha Hlusiak
c30f36c8c1 xfree86: AllowEmptyInput is now enabled by default if hotplugging is enabled.
Remove AEI check from configImpliedLayout as the setting isn't actually parsed
at this point anyway.

Set AllowEmptyInput to enabled by default if hotplugging is enabled.
2008-07-03 21:42:10 +02:00
Dave Airlie
793ff6754e modes: check the crtc is valid before using its desired modes.
this fixes a crash I was getting on radeon rotate when gnome is running.
I'm sure g-s-d was doing something bad, but really not crashing ftw.
(cherry picked from commit 1771edcb44)
2008-07-03 19:01:44 +10:00
Dave Airlie
e9f83740e3 cursor: don't dereference NULL pointer is devPrivates not yet set.
This fixes a bug on server recycle with ati zaphod.
2008-07-03 18:46:38 +10:00
Julien Cristau
81e6ab4851 autoconfig: don't call closedir() when opendir() failed
If opendir() fails, return from matchDriverFromFiles() immediately.
Ubuntu bug 217647.
(cherry picked from commit fbad87f2ae)
2008-07-01 13:27:54 -04:00
Aaron Plattner
75b5e999f0 Work around the DIX losing mmWidth/mmHeight for RandR 1.1 DDXen.
RandR 1.1 has a physical size for each mode.  It used to be that the DIX would
remember these modes and pass them back up to the DDX when changing the screen
configuration.  The DDX uses RR_GET_MODE_MM to query the driver for the physical
dimensions of the screen, allowing it to preserve the DPI.

With RandR 1.2, the physical dimensions are stored as part of the output, rather
than per mode.  The DIX only uses the sizes passed in from the DDX to select the
mode pool for the "default" output, and forgets the physical sizes.  Then, when
reconfiguring the screen, it makes up a new RRScreenSizeRec using the dimensions
from the output, screwing up the DPI.

This change works around this problem by ignoring the DIX and querying the real
size from the driver.
(cherry picked from commit 2e8daee053)
2008-07-01 09:08:36 -07:00
Adam Jackson
9ab88bb9b1 Don't try to load DRI2 if built without it.
(cherry picked from commit e2bbf2d248)
2008-07-01 12:02:18 -04:00
Adam Jackson
bee463bd8a XInput ABI is 2.1, not 3.1.
(cherry picked from commit 76576c87b0)
2008-06-30 16:11:04 -04:00
Adam Jackson
6e8ed1398d Bump ABI minor numbers for the devPrivate ABI functions.
(cherry picked from commit 211e2bdcc6)
2008-06-30 10:31:55 -04:00
George Sapountzis
90f2a82ba5 glx: fix forgotten swrast -> SWRast
(cherry picked from commit 21a8052fdc)
2008-06-26 16:14:52 -04:00
George Sapountzis
6e278e3944 glx: missing swrast is fatal
(cherry picked from commit 877e6c35ff)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
0234d3d48f Get out of the mesa symlinking business.
This copies over the files generated from mesa/src/mesa/glapi.  There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.

The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch].  Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.

The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
(cherry picked from commit e5aad4bc08)
2008-06-26 16:14:51 -04:00
Dan Nicholson
d3a2e060bf Fix up paths for GL/glx -> glx renaming
(cherry picked from commit c76fddeea2)
2008-06-26 16:14:51 -04:00
Kristian Høgsberg
bd81faff8c Drop glcore GLX provider.
Obsoleted by the DRI swrast driver.
(cherry picked from commit 77ff8fd507)
2008-06-26 16:14:51 -04:00
George Sapountzis
988b1b8df3 Add loader for the swrast dri driver.
(cherry picked from commit 6ff6465931)
2008-06-26 16:14:51 -04:00
George Sapountzis
1efc0329b1 glcore: drop GLcore (files)
(cherry picked from commit a88c6b6646)
2008-06-26 16:14:50 -04:00
George Sapountzis
9b4d5b6521 glcore: drop GLcore (build system)
(cherry picked from commit dd7a53f8f2)
2008-06-26 16:14:50 -04:00
George Sapountzis
1ea2e69cfc glcore: build from mesa, dlopen from xorg
* The GLcore interface is disposable
* GLcore is installed in DRI_DRIVER_INSTALL_DIR which is overloaded for
  GLX_PROVIDER_INSTALL_DIR
(cherry picked from commit 567d389d47)
2008-06-26 16:14:50 -04:00
Adam Jackson
429b2a97a0 Bug #11842: Fix emulation of int1A PCI BIOS services.
Use only %di to name the PCI register to read/write, rather than %edi.
DOS is only expecting the base PCI config space anyway, and the BIOS
might be using the high bits of %edi.
(cherry picked from commit 9e5b3deafb)
2008-06-24 14:10:12 -04:00
Paul Bender
2334ff9bb2 Bug #15665: Fix building without Composite.
(cherry picked from commit 4c4e06af79)
2008-06-24 10:45:16 -04:00
Adam Jackson
85e598cc62 Remove some default modes that really shouldn't be in the default set.
(cherry picked from commit 59510a7643)
2008-06-24 10:41:27 -04:00
Alan Coopersmith
dfb326790e Restore return type on xf86SetScrnInfoModes
Seems to have been accidentally lost by commit 	76943fec86
(cherry picked from 925e895b86 commit)
2008-06-23 19:32:01 -07:00
Adam Jackson
89d73d7595 Implement bswap in x86emu.
Yes, this is a 486+ instruction and thus not strictly legal in vm86
mode, but enough BIOSes use it (looking at you VIA) that we might as
well implement it.
(cherry picked from commit c8d066a151)
2008-06-23 14:01:15 -04:00
Matthieu Herrb
b0df9a6a42 preserve errno around the SIGIO handler
(cherry picked from commit 19c7e9da55)
2008-06-20 13:36:16 -04:00
Adam Jackson
7822a3d05f XAA: Disable offscreen pixmaps by default.
Say Option "XaaOffscreenPixmaps" to turn them back on.

Apropos of bugs #13795 and #15098.  Not yet applied to master as this wants
a proper solution someday, but then, those bugs aren't closed yet either.
2008-06-17 16:10:51 -04:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
2008-06-17 10:48:41 -04:00
Eamon Walsh
2552026664 Make devPrivates lookup functions ABI instead of static inlines.
This is required to preserve compatibility across changes to the
internal representation of the privates list.
(cherry picked from commit 2d7ba09dc4)
2008-06-13 16:45:08 -04:00
Dave Airlie
21248705bb modes: make aspect choosing work on single output case.
In the single output enabled case we never enter the loop and test
never gets set and so we fail to match a good mode.

This was causing my 2560x1600 to end up at 2048x1536.
2008-06-12 14:54:56 +10:00
Julien Cristau
53a84d75c6 xfree86: fix build on GNU/kFreeBSD
GNU/kFreeBSD defines __FreeBSD_kernel__, but not __FreeBSD__.
Unify preprocessor conditionals between variable declaration and use.
Debian bug #482550.
(cherry picked from commit e6cbb1e11e)
2008-06-12 10:01:41 +10:00
Paulo Cesar Pereira de Andrade
60990c69b4 Correct a NULL pointer deference
The problem happens if Monitor/Card combo doesn't provide EDID info,
and the XFree86-VidModeExtension extension is used.

Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
(cherry picked from commit c8af7ce35a)
2008-06-09 14:09:39 -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
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