~thopiekar/xorg-server/+git/xorg-server-salsa.debian:upstream-squeeze

Last commit made on 2011-01-31
Get this branch:
git clone -b upstream-squeeze https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Branch merges

Branch information

Name:
upstream-squeeze
Repository:
lp:~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Recent commits

d77ffa9... by Julien Cristau

Revert "randr: check for virtual size limits before set crtc"

Apparently these checks break rotation with the nvidia drivers:
https://bbs.archlinux.org/viewtopic.php?pid=877761
http://bugs.debian.org/611619
Let's not do that in a stable branch.

This reverts commit 6a6d907e77777057cadbd80572119c09732385cd.

Signed-off-by: Julien Cristau <email address hidden>

5549d99... by Peter Hutterer

mi: handle DGA subtypes when determining the master device.

The subtype in the DGA event is the core type and all ET_ event types (where
applicable) are identical to the core types. Thus the switch statement below
will work as required and assign the right master device.

Fixes a crasher bug on keyboard devices with valuators. If a device sends a
motion event while grabbed and a DGA client is active (but has not selected
input through DGA), the valuator event is posted through the VCK and
eventually results in a NULL-pointer dereference on dev->valuator.

Signed-off-by: Peter Hutterer <email address hidden>
(cherry picked from commit 31ab9f8860848504df18a8be9d19b817b191e0df)
(cherry picked from commit faecab3b13bbaecf4f35f49b833d1b79a5fb647d)

2fd67c3... by =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <email address hidden>

xfree86/modes: Take rotation into account when checking mode size

Assume that a mode can be used in either landscape or portrait
orientation. I suppose the correct thing to do would be to
collect all the supported rotations from the CRTCs that can be used
with a specific output, but that information doesn't seem to be
readily available when these checks are done. So just assume that
either orientation is fine.

Signed-off-by: Ville Syrjälä <email address hidden>
Reviewed-by: Adam Jackson <email address hidden>
(cherry picked from commit 2e781457d43ec4bf0d633257ac6852cde3b00541)
(cherry picked from commit aec278eb65fe1ca98ab551a8c3873a7195bad540)

6a6d907... by Tiago Vignatti <email address hidden>

randr: check for virtual size limits before set crtc

Return a error if the screen is configured to an invalid size.

Signed-off-by: Tiago Vignatti <email address hidden>
Reviewed-by: Adam Jackson <email address hidden>
Reviewed-by: Daniel Stone <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit d1107918d4626268803b54033a07405122278e7f)

5b979a1... by Michel Dänzer

EXA: Fix crash with fill using 1x1 tile of depth < 8 (bug #24703).

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=24703 .

Signed-off-by: Michel Dänzer <email address hidden>
Reviewed-by: Dave Airlie <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit e06fa804009798ea95efa8babaabb0228dfdfe65)

561afd7... by Jörn Horstmann

Add EDID quirk for HP Compaq nc8430.

Like some other LPL panels, this one reports the vertical size in cm rather
than mm.
Patch taken from Launchpad bug #380009 <https://launchpad.net/bugs/380009>

X.Org Bug 28414 <https://bugs.freedesktop.org/show_bug.cgi?id=28414>

Signed-off-by: Christopher James Halse Rogers <email address hidden>
Reviewed-by: Adam Jackson <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit 4b88c7be8de4149fe3d166bf115775f9e81a1373)

cd82012... by Adam Jackson <email address hidden>

x86emu: Fix more mis-decoding of the data prefix

cc2c73ddcb4370a7c3ad439cda4da825156c26c9's three-cent titanium tax
doesn't go too far enough. Fix the rest of the call and jmp
instructions to handle the data prefix correctly.

Reference: Intel 64 and IA-32 Architectures Software Developer's Manual
Volume 2A: Instruction Set Reference, A-M

http://www.intel.com/Assets/PDF/manual/253666.pdf

Reviewed-by: Julien Cristau <email address hidden>
Signed-off-by: Adam Jackson <email address hidden>
(cherry picked from commit bb18f277156c08be028a6e12d8987fb1593e9168)

2194c38... by libv

x86emu: fix jump_near_IMM to handle DATA: flag correctly.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=24348

Before (data flag ignored -> broken):
66 DATA:
e944f1 JMP 1ff6

After (fixed):
66 DATA:
e944f1ffff JMP 00001ff8

This subtle difference in the length of decoded instruction meant
that the VBE call jumped to the routine setting AX=0x14F (VBE Failed)
instead of the routine that set AX=0x4F (VBE success).

The ability to run the same code in vm86 significantly aided the
debugging of this issue. Those X.org developers who would like to drop
vm86 better take special care towards _all_ vesa bugs, as those will
expose further issues.

Patch applies easily to even xserver 1.4.2.

Signed-off-by: Luc Verhaegen <email address hidden>
Tested-by: Luc Verhaegen <email address hidden>
Reviewed-by: Adam Jackson <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit cc2c73ddcb4370a7c3ad439cda4da825156c26c9)

c038d00... by James Jones

Add and use SERVER_SYNC_*_VERSION

Most extensions have a version defined
in the protocol headers, and also in the
server's protocol-versions.h. The latter
defines which version the server advertises
support for. Sync wasn't included in
protocol-versions.h, and was advertising
support for whatever was in the protocol
headers the server was built against.

Signed-off-by: James Jones <email address hidden>
Reviewed-by: Keith Packard <email address hidden>
(cherry picked from commit 27593eea7efcbed8de0c6e8233cbd1a1b8a50459)

472163b... by Ranma42

render: Fix byteswapping of gradient stops

The function swapStops repeatedly swaps the color components as
CARD16, but incorrectly steps over them as if they were CARD32.

This causes half of the stops not to be swapped at all and some
unrelated data be swapped instead.

Signed-off-by: Andrea Canciani <email address hidden>
Reviewed-by: Soren Sandmann <email address hidden>
Reviewed-by: Julien Cristau <email address hidden>
Signed-off-by: Keith Packard <email address hidden>
(cherry picked from commit dab064fa5e0b1f5c67222562ad5367005832cba1)