Commit Graph

7804 Commits

Author SHA1 Message Date
Chris Wilson 08d73f1a44 sna: Only couple up a proxy->rq when inserting into the request->buffers list
Otherwise, we may never decouple it again afterwards leading to a
dangling pointer dereference.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1289923
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-12 12:23:53 +00:00
Chris Wilson 2f50261539 sna: Simplify code when no 64-bit registers are available in the ISA
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-12 10:55:00 +00:00
Chris Wilson 20026626d2 sna: Missing fixes for using BLT points
On a lone machine I had a vital fix for setting the destination tiling
bit inside the XY_PIXEL_BLT command. Sadly, I forgot about the fix before
the patch from another machine.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 14:16:20 +00:00
Chris Wilson fd189c8689 sna/glyphs: Add a smattering of DBG for validating the glyph mask
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 11:37:01 +00:00
Chris Wilson d31569455c sna: Avoid using the wrong pitch for comparing replacement sizes
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 11:08:00 +00:00
Chris Wilson 8c5593037f sna: Assert that the pixmap pitch is initialised before use
This is a sanity check that the pixmap is mapped for use by the CPU
prior to us actually using it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 10:44:52 +00:00
Chris Wilson dd1ff32302 intel: Protect against a NULL platform device with server fd
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 10:06:24 +00:00
Chris Wilson 59f2f4885d intel: Fix versioning of SUPPORTS_SERVER_FD
The current snapshot is 1.15.99.901, which means that the new feature
will first be available in 1.15.99.902.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 10:01:04 +00:00
Chris Wilson 78970676e7 sna: Be defensive when applying size restrictions to bo
The assumption that all paths prevalidate the restrictions upon creation
the bo are false. Some important paths try to force the bo creation in
order to meet client expectations (e.g. DRI). So we are faced with
impossible requests which must fail, so make sure we do report those
failures.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1289049
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-11 07:33:09 +00:00
Chris Wilson d10a5abcbd intel: Supply a fallback guess for the device path
If for some reason we have an fd, but no device path, use the likely
default path (derived from and validated against the major/minor of the
open device fd).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 22:19:25 +00:00
Hans de Goede 28cab948f5 intel: Add support for server managed fds
In the post-modern world, the platform device nodes are handed to a
non-privileged Xserver by systemd/logind. We can then query the core for
our assigned fd rather than try to open the device for ourselves (which
would fail when trying to obtain DRM_MASTER status). A consequence is
that we then do not directly control DRM_MASTER status and must act as a
delegate of systemd.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-03-10 22:19:25 +00:00
Chris Wilson e5f8118bdb sna: DBG compilation fixups
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 22:13:25 +00:00
Chris Wilson 6ed8570f6a sna: Pass render hints for migration based on source location
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 22:12:22 +00:00
Chris Wilson 955b5de4ba sna/glyph: Release the pixman glyph cache along the error paths
If we lock the glyph cache and then hit an error, we must make sure we
release our lock. An easy way would be not to lock when we may err.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 22:12:22 +00:00
Chris Wilson e1cb028421 sna/gen2: Fix build after last minute patch editing
Whoops, the selective editing of the patch left a trailing '{' and
breaking the build.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 15:01:54 +00:00
Chris Wilson 142f846194 sna/gen2: Tidy blend factor selection for the source
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 14:54:53 +00:00
Chris Wilson 0075c90d31 sna/gen2: Fix alpha blending with 8bit destination surfaces
On gen2 (like gen3), 8-bit destination surfaces are read into the Green
channel (and written to from the Green channel). Therefore the expected
alpha blending must instead be converted to colour blending.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75818
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 14:54:53 +00:00
Chris Wilson f0b70ca660 sna: Unroll finding bbox of points
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 14:54:38 +00:00
Chris Wilson 928453b1bc sna: Emit points using the BLT primitive when appropriate
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-10 14:54:38 +00:00
Chris Wilson a2b4f2657f sna/gen8: Correct MOCS settings for render targets
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-05 09:51:24 +00:00
Chris Wilson a7123410a3 NEWS: Fix dates for 2014
It has come to my attention that between December and January is
traditionally a New Year.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-03-03 10:12:11 +00:00
Chris Wilson a3bfb4d3c1 sna: Reorder writes during thread task decoupling
So that the lockless reads do not see the task complete signal prior to
marking the task as successful. Otherwise, we falsely detect that the
thread trapped a signal and kill them all.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-28 08:50:06 +00:00
Chris Wilson 37d080929a sna: Limit the WHOLE_HINT to large PutImages
The goal here is to predict when we are uploading an entire image though
multiple PutImage requests. If the image is small enough, then the
PutImage will be contained within a single request and the damage
tracking will be accurate.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-27 08:37:44 +00:00
Chris Wilson 27ac9f574f sna: Avoid promoting region-to-whole migration and discarding damage
Fixes regression from
commit 1de1104064
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Feb 21 22:43:04 2014 +0000

    sna: Use a hint to do whole image uploads inplace

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75549
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-27 08:33:52 +00:00
Chris Wilson ff49944928 sna: Tighten assertion for tiling blt fallbacks
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:07 +00:00
Chris Wilson cf4683209d sna/gen6+: Add missing DBG argument
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:07 +00:00
Chris Wilson a4d23ff3b2 sna: Add DBG for why trapezoids may be preferred inplace
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:07 +00:00
Chris Wilson d316d14283 sna: Include mono/precise hints in trapezoids DBG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:07 +00:00
Chris Wilson 2a144baec8 sna: Add a little more DBG to watch the flow of allocated bo sizes
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:07 +00:00
Chris Wilson 921e9aff3f sna: Avoid signed overflow when printing allocated bytes in DBG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:53:06 +00:00
Chris Wilson b0b6c043c9 sna: Cleanup caches if execbuf fails
One of the failure modes for execbuf is running out of memory - often
this is reported as a false ENOSPC (thanks shmemfs!). Because of this,
we should try to resubmit after we purge our caches.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-23 07:52:02 +00:00
Chris Wilson bfef991612 sna: Propagate thread signals for extra DBG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 18:13:22 +00:00
Chris Wilson 64fc1bb9c8 sna: Allow SIGBUS/SEGV to kill the thread
To handle sigtrapping of the threads, we allow the threads to handle
their async signals and upon hitting the trap, we kill the thread. All
the rest of the threads are reaped by the main xserver thread
afterwards.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 16:58:58 +00:00
Chris Wilson 900499bff9 sna: Move sigtrap wrapping closer to threaded sw composite
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 14:35:10 +00:00
Chris Wilson aae3bfeb28 sna: Assert that sigtrap is active
Curiouser and curiouser.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 14:35:10 +00:00
Chris Wilson 75cff26eba sna: Apply the dst offset for pixman fills
Along one of the sw blt paths we failed to apply the offset for
Composite redirection.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73811
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 10:05:41 +00:00
Chris Wilson 59d471de7f sna: Handle asynchronous signals from threads
By killing the threads and leaking their allocations - marginally
preferrable to losing the entire Xserver.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-22 09:39:35 +00:00
Chris Wilson 1de1104064 sna: Use a hint to do whole image uploads inplace
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 22:43:04 +00:00
Chris Wilson 2c0aacb869 sna: Allow allocation to fail even when debugging
Let the malloc failure propagate rather than assert.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 21:48:36 +00:00
Chris Wilson cb87b17953 sna: Wrap inplace trapezoid operators with SIGBUS protection
For the moment, this still leaves open the vexing question of how to
protect the multi-threaded variants, but it should provide more shelter
for extreme OOM.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 21:41:52 +00:00
Chris Wilson b6fc46d63c sna: Tighten assertion for tiling blt fallbacks
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 21:22:23 +00:00
Chris Wilson be6d218c68 sna: Do not attempt fallback configuration without any CRTCs
The fallback xf86InitialConfiguration() is another function that may
explode if called without any CRTCs attached.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 19:44:05 +00:00
Chris Wilson 769a959d84 sna: Do not register colormaps without any CRTCs
The xserver may crash if we try to setup colormap handling without any
CRTCs, so don't.

Suggested-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-21 13:47:45 +00:00
Chris Wilson 0b92b1285c backlight: Make search routine for device specific backlight common
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-20 19:22:03 +00:00
Chris Wilson caaf528340 sna: Query cursor size from the kernel
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-20 07:51:40 +00:00
Mark Kettenis c91af569ee backlight: Build fixes for OpenBSD
Chris would like to humbly apologise for making these changes to the
OpenBSD code blind, and to thank Mark and Jonathan for their support
and understanding.
2014-02-18 19:04:09 +00:00
Chris Wilson ecc20fbcf8 intel-virtual-output: Discard unwanted events from the mouse recorder
X always sends MappingNotify events (there is no way for the client
to ignore them). In particular, MappingNotify would be sent after a VT
switch, and this would knock out our ability to track the cursor..

Reported-by: Raul Dias <raul@dias.com.br>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75115
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-02-18 07:56:07 +00:00
Hans de Goede e860b3eaed backlight-helper: Simplify reading the level from stdin
Since the helper is a standalone app, the usual xserver rules of not using
stdio because of signal handling don't apply.

And since the helper does run with elevated rights, it is important to keep
the code KISS so that it can be audited easily.

This commit replaces the hard to read "raw" read loop with a much simpler
loop using fgets, improving readability of the code.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-02-17 18:38:54 +00:00
Hans de Goede b5229c6e15 backlight: Drop rights before executing pkexec
Event though we've failed to open the backlight normally, we may still be
running under a suid-root xserver, so drop any elevated rights before
executing what we hope will be pkxec.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-02-17 18:38:54 +00:00
Hans de Goede 27a9dc4ce8 backlight: Use System instead of system when checking for pkexec
Even though we've failed to open the backlight normally, we may still be
running under a suid-root xserver, so use the servers build in System instead
of system so as to properly drop root rights.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2014-02-17 18:38:45 +00:00