Commit graph

2995 commits

Author SHA1 Message Date
Ben Byer
6b6b1d09bf make dist fixes 2007-10-29 18:11:10 -07:00
Ben Byer
2c8e36ecd1 Added patch fix yellow-cursor problem which appears on some Intel Macs 2007-10-29 16:18:48 -07:00
Ben Byer
353d0de660 Some autoconf hacks to make 'make dist' work correctly 2007-10-29 16:15:22 -07:00
Ben Byer
5d1193aa31 finished committing downstream changes 2007-10-29 00:07:29 -07:00
Ben Byer
1ffcc5371c more patches, autoconf fixes... 2007-10-28 17:22:16 -07:00
Ben Byer
c1e08cef60 More patches from downstream 2007-10-27 23:33:51 -07:00
Ben Byer
67fe8339fa added missing "f" flag to jump target in asm blocks
(This sometimes prevents builds on Darwin, but is apparently
universally incorrect.  I just work here.)
2007-10-27 04:17:29 -07:00
Ben Byer
de4fe33c71 removed CVS Id tags 2007-10-27 02:22:56 -07:00
Ben Byer
c6c23d7035 merged the rest of Apple patches to xserver 2007-10-27 01:38:31 -07:00
Ben Byer
cc9b4723ec added missing file from Apple version of 7.2 2007-10-26 15:40:35 -07:00
Ben Byer
8b0fcf2427 added Apple-specific defaults to configure.ac 2007-10-26 14:10:03 -07:00
Alan Coopersmith
dcc3de91d2 Xephyr: fix immediat segfault on amd64
This closes bug https://bugs.freedesktop.org/show_bug.cgi?id=11582
2007-08-18 11:50:33 +02:00
Keith Packard
1d7fbdfea4 Disable use of xf86RandR12TellChanged when unavailable (1.2 server).
When building the new mode setting code out-of-tree against an older server,
don't use xf86RandR12TellChanged as that is a RandR 1.2 specific interface.
2007-04-21 18:52:14 -07:00
Keith Packard
f9a0b93660 Update version to 1.3.0.0 2007-04-19 19:09:43 -07:00
Keith Packard
05e1c45ade Disable SourceValidate in rotation to capture cursor.
SourceValidate is used exclusively by the software cursor code to pull the
cursor off of the screen before using the screen as a source operand. This
eliminates the software cursor from the frame buffer while painting the
rotated image though. Disabling this function by temporarily setting the
screen function pointer to NULL causes the cursor image to be captured.
2007-04-19 17:39:51 -07:00
Keith Packard
8b217dee3a Was accidentally disabling rotation updates in mode set.
Setting a mode on an unrotated CRTC was causing all of the rotation updates
to be disabled; the loop looking for active rotation wasn't actually looking
at each crtc, it was looking at the modified crtc many times.
2007-04-19 17:37:18 -07:00
Erik Andrén
a63704f14a Syncmaster 226 monitor needs 60Hz refresh (#10545).
I've managed to solve my own bug (#10545) by applying the following
patch to the xserver.

Please apply.

<Conspiracy mode on>
This monitor is "Vista Certified". I wonder if this is a pure coincidence...
<Conspiracy mode off>

With kind regards
Erik Andrén
2007-04-17 21:34:47 -07:00
Keith Packard
a3d73ba2cb Allow outputs to be explicitly enabled in config, overriding detect.
Option "Enable" "True" will force the server to enable an output at startup
time, even if the output is not connected. This also causes the default
modes to be added for this output, allowing even sync ranges to be used to
pick out standard modes.
2007-04-16 09:55:58 -07:00
Keith Packard
f4a8e54caf Use default screen monitor for one of the outputs.
By default, use the screen monitor section for output 0, however, a driver
can change which output gets the screen monitor by calling
xf86OutputUseScreenMonitor.
2007-04-16 09:53:42 -07:00
Keith Packard
00cfd1f765 typo in built-in module log message 2007-04-16 09:39:47 -07:00
Keith Packard
e2e7c47a52 RandR 1.2 spec says CRTC info contains screen-relative geometry.
Was reporting mode size instead of adjusting for rotation.
2007-04-15 22:59:19 -03:00
Keith Packard
1328a288e9 Add quirk for Acer AL1706 monitor to force 60hz refresh.
This Acer monitor reports support for 75hz refresh via EDID, and yet when
that rate is delivered, the monitor does not sync and reports out of range.
Use the existing 60hz quirk for this monitor.
2007-04-13 15:04:29 -03:00
Keith Packard
efcec7dbd3 Rotate screen size as needed from RandR 1.1 change requests.
Screen size must reflect rotated mode size when setting rotated mode using
RandR 1.1 SetScreenConfig request.
2007-04-09 14:29:46 -07:00
Keith Packard
dc6c4f6989 Disable CRTC when SetSingleMode has no matching mode. Update RandR as well.
xf86SetSingleMode tries to resize all crtcs to match the selected mode. When
a CRTC has no matching mode, it now disables the CRTC (instead of crashing).

Also, poke the RandR extension when xf86SetSingleMode is done so that
appropriate events can be delivered, and so that future RandR queries return
correct information.
2007-04-09 14:12:27 -07:00
Keith Packard
7cf3a0e0b9 In AIGLX EnterVT processing, invoke driver EnterVT before resuming glx.
As the driver EnterVT function generally re-enables the hardware and
prepares it for rendering, it must be called before any gl functions are
called which could touch the hardware.
(cherry picked from commit f24391dbfd)
2007-04-09 12:59:10 -07:00
Keith Packard
970cacb264 Bump to version 1.2.99.905 (1.3 RC5) 2007-04-05 23:48:40 -07:00
Matthieu Herrb
44c4bd5df3 CVE-2007-1003: XC-MISC Extension ProcXCMiscGetXIDList() Memory Corruption
(cherry picked from commit 645d87cf8e)
2007-04-05 23:32:56 -07:00
Tomas Janousek
44ea7a3e0d Bug #10296: Fix timer rescheduling.
(cherry picked from commit 8c7f56d92d)
2007-04-05 23:32:56 -07:00
Keith Packard
042ef1f573 Bump version to 1.2.99.904 (1.3 RC4) 2007-04-05 23:21:19 -07:00
Keith Packard
56262a4ee9 Don't erase current crtc for outputs on CloseScreen
Erasing this variable causes some outputs (SDVO on intel) to fail
to be correctly reset at server reset time.
2007-04-02 14:15:36 -07:00
Keith Packard
00e33f87f4 Set version to 1.2.99.903 (1.3 RC3) 2007-03-26 21:21:50 -07:00
Michel Dänzer
4fd2d3aedf Bump video driver ABI version to 1.2.
This is necessary because server-1.2-branch bumped to 1.1 for xf86CVTMode and
we have xf86XVFillKeyHelperDrawable on top of that.
(cherry picked from commit 788cfce911)

Conflicts:

	hw/xfree86/common/xf86Module.h

Avoid picking up XInput ABI change.
2007-03-26 20:41:14 -07:00
Michel Dänzer
dc914ced69 Add per-drawable Xv colour key helper function.
This allows overlay Xv adaptors to work slightly better with compositing
managers.

Bump the video driver ABI minor so drivers only need to check for this at build
time.
(cherry picked from commit a232693c8c)

Conflicts:

	hw/xfree86/common/xf86Module.h

Avoid picking up XInput ABI version change.
2007-03-26 20:39:43 -07:00
Michel Dänzer
96636598ee fbdevhw: Only deal with RGB weight if default visual is True- or DirectColor.
(cherry picked from commit 14d6a9b327)
2007-03-26 20:32:37 -07:00
Michel Dänzer
7679b2c613 fbdevhw: Consider mode set equal to mode requested if virtual width is larger.
(cherry picked from commit 27a01e100b)
2007-03-26 20:32:31 -07:00
Michel Dänzer
1c2793d3ec fbdevhw: Override RGB offsets and masks after setting initial mode.
This is a hack, but it should be a NOP for all the setups that worked before
and actually seems to fix some others...

Based on a patch by Peter Teichmann from
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=338241 .
(cherry picked from commit dc5eb45232)
2007-03-26 20:32:25 -07:00
Michel Dänzer
d7bcad9c69 fbdevhw: Use displayWidth for fbdev virtual width when appropriate.
The fbdev API doesn't allow setting the pitch explicitly, so we have to set
the virtual width to the pitch we're using for drawing. This fixes corruption
after changing the virtual width with RandR.
(cherry picked from commit d077c0da47)
2007-03-26 20:32:20 -07:00
Michel Dänzer
28af734cb7 fbdevhw: Fix some issues with the previous commit.
Fix a TRACE_ENTER typo and only update the internal fbdev mode state cache
after actually setting a mode.
(cherry picked from commit c385bcf0bd)
2007-03-26 20:32:14 -07:00
Michel Dänzer
c0459d7476 fbdevhw: Consolidate modeset ioctl calling, report failure if it modifies mode.
The fbdev API allows the driver to 'accept' modes it doesn't really support by
modifying it to the nearest supported mode. Without this check, e.g. vesafb
would appear to accept all modes, even though it actually can't set any modes
other than the bootup mode at all.
(cherry picked from commit f6815cb68b)
2007-03-26 20:32:07 -07:00
Keith Packard
57e87e0d00 Make pending properties force mode set. And, remove AttachScreen calls.
Yes, two changes in one commit. Sorry 'bout that.

The first change ensures that when pending property values have been
changed, a mode set to the current mode will actually do something, rather
than being identified as a no-op. In addition, the driver no longer needs to
manage the migration of pending to current values, that is handled both
within the xf86 mode setting code (to deal with non-RandR changes) as well
as within the RandR extension itself.

The second change eliminates the two-call Create/AttachScreen stuff that was
done in a failed attempt to create RandR resources before the screen
structures were allocated. Merging these back into the Create function is
cleaner.
2007-03-23 23:41:36 -07:00
Keith Packard
36e5227215 Ensure that crtc desired values track most recent mode.
desiredX and desiredY were not recorded during xf86InitialConfiguration.
desiredX, desiredY and desiredRotation were not recorded during
xf86SetSingleMode.
2007-03-23 14:39:49 -07:00
Keith Packard
945aa0aa55 Incorrect extra memory copy in RRChangeOutputProperty.
Left over from previous version of the code, this memmove will break when
the mode is not Replace.
2007-03-23 01:17:14 -07:00
Keith Packard
8eb288fbd6 Fix Pending property API, adding RRPostPendingProperty.
Pending Properties take effect when the driver says they do, so provide an
API to tell DIX when a property effect is made. Also, allow driver
to reject property values in RRChangeOutputProperty.
2007-03-23 01:05:55 -07:00
Keith Packard
9ca7ba5d60 Make sure RandR events are delivered from RRCrtcSet.
Some paths were skipping the event delivery stage.
2007-03-23 01:03:40 -07:00
Keith Packard
492c768065 Clean up xf86CrtcRec and xf86OutputRec objects at CloseScreen.
Erase pointers to structures which are freed at server reset time.
2007-03-23 00:59:11 -07:00
Keith Packard
16f4c0c175 Clear allocated RandR screen private structure.
Use xcalloc instead of xalloc when allocating this structure to ensure
consistent contents at startup.
2007-03-23 00:57:18 -07:00
Keith Packard
f8db7665dc Clean up Rotate state on server reset.
The rotation state is stored in the xf86_config structure which is not
re-initialized at server reset time. Clean it up at CloseScreen time.
2007-03-20 07:17:27 -07:00
Keith Packard
0f80340a52 Slow down DDC I2C bus using a RiseFallTime of 20us for old monitors.
This time value makes the bus run slowly enough for even the least reliable
of monitors. Thanks to Pavel Troller for finding the necessary change.
2007-03-17 20:14:05 -07:00
Keith Packard
52fccb9d9f Remove extra (and wrong) I2C ByteTimeout setting in DDC code.
The DDC code sets the I2C timeouts to VESA standards, except that it had an
extra setting of the ByteTimeout value which was wrong (off by a factor of
50). Removing this should help DDC work on many more monitors. Note that the
Intel driver duplicated these settings, along with the error. Yay for cult
and paste coding.
2007-03-17 17:29:23 -07:00
Keith Packard
f521308ad2 Correct ref counting of RRMode structures
RRModes are referenced by the resource db, RROutput and RRCrtc structures.
Ensure that the mode reference count is decremented each time a reference is
lost from one of these sources. The missing destroys were in
RRCrtcDestroyResource and RROutputDestroyResource, which only happen at
server reset time, so modes would be unavailable in subsequent server
generations.
2007-03-15 20:26:07 -07:00