Commit Graph

8489 Commits

Author SHA1 Message Date
Chris Wilson 07fe45b84b sna/glyphs: Prevent NULL vfunc deref with glyphs
Requires running a PRIME setup with Intel loaded as the secondary GPU
and attempting to execute an empty glyph string.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-09 08:12:45 +01:00
Chris Wilson faf0bdd477 sna: Add some DBG spam for BLT boxes
References: https://bugs.freedesktop.org/show_bug.cgi?id=77074
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-09 07:36:40 +01:00
Chris Wilson e0f7e9fc2f sna: Initialise and check for batch space
commit 30932a7b9d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Sep 8 12:41:06 2014 +0100

    sna: Avoid u16 underflow when computing reserved batch space

relied on gcc a little to much to warn me when I missed initialising 'rem'

References: https://bugs.freedesktop.org/show_bug.cgi?id=77074
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-08 16:49:29 +01:00
Chris Wilson 30932a7b9d sna: Avoid u16 underflow when computing reserved batch space
If we filled the batch exactly, then subtract -1 for the reserved
BATCH_BUFFER_END, it would underflow to a large value - convincing us
that we had sufficient room to stuff many, many more commands in.

However, all the callsites should be guarded by checking already that
they had sufficient space to emit at least one operation...

References: https://bugs.freedesktop.org/show_bug.cgi?id=77074
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-08 12:50:29 +01:00
Chris Wilson 692c14d405 2.99.916 snapshot 2014-09-08 08:53:32 +01:00
Dave Airlie 84fb3bb65f uxa: actually create the randr outputs for hotplug connectors
I somehow lost this chunk in my mst patch I sent.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2014-09-08 08:49:49 +01:00
Chris Wilson 001c542618 2.99.915 snapshot 2014-09-08 07:54:25 +01:00
Chris Wilson db01c9d627 sna: Fix backlight assertion after only hiding planes
If we only hide the planes, we do not turn off any outputs and so can
skip resetting the backlight entirely.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-08 07:13:47 +01:00
Chris Wilson da0c9638d7 sna: Fix an unreachable piece of code
It doesn't do anything but the static analyzers at bay.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-08 07:07:08 +01:00
Dave Airlie 908520a7da uxa: add MST support.
This adds MST support to the UXA paths in the driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
[ickle: Restore current output naming scheme]
2014-09-07 18:40:10 +01:00
Dave Airlie b64a8f0e3e uxa: drop mode_res caching.
This will cause problems with MST displays which need to update the
connector list after topology changes.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2014-09-07 18:25:39 +01:00
Chris Wilson aca0bf6387 sna/gen2: Fallback to kernel batch w/a rather than incur a stall
If we have no pinned batches available, use the kernel w/a if available
rather than stall waiting for an active batch.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-07 17:26:33 +01:00
Chris Wilson 57bf3d5f0f sna: Disable the fb on switching away from X
Currently we turn off the CRTCs when switching away from X in order to
not leak our framebuffer. With the new drm_plane support, we can simply
unset the framebuffer, which should be a lighterweight operation than
disabling the CRTC.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-07 17:22:31 +01:00
Chris Wilson c17d3b5d5c sna: Compute clones on final ordering
The clones are indices into the output arrays, so recompute the clones
if we reorder the outputs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-07 17:22:12 +01:00
Chris Wilson aa10f480c5 sna: Drop false IGNORE_DAMAGE hint
IGNORE_DAMAGE is used by sna_drawable_use_bo to ignore both CPU/GPU
damage. It used to only ignore CPU damage, but now is a more general
hint. However, here we were intending to only say ignore the cpu damage
that we explicitly discarded anyway.

References: https://bugs.freedesktop.org/show_bug.cgi?id=81973
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-03 10:24:19 +01:00
Chris Wilson 51e364ded2 sna: Trace move-to-gpu overrides with extra DBG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-03 10:23:18 +01:00
Chris Wilson ee7ed478a2 sna: Skip over hotunplugged outputs during CRTC set
These outputs are already marked as disconnected and so should be
excluded from the CRTC set, but to be safe skip over them.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-03 08:37:39 +01:00
Chris Wilson 48a33fc379 sna/trapezoids: Use the corrected trapezoid origin for aligned boxes
The rule for the origin of the CompositeTrapezoids routine is the
upper-left corner of the first trapezoid. Care must be taken in case the
trapezoid edge is upside down to consider the upper vertex.

Reported-by: "Jasper St. Pierre" <jstpierre@mecheye.net>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-02 19:15:54 +01:00
Chris Wilson 84333f6213 sna: Leave more Pixmap breadcrumbs in DBG
Add the Pixmap id to various DBG messages to make it easier to track
rendering.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-02 19:15:49 +01:00
Chris Wilson 407817ebb9 sna: Reject invalid CopyArea based on source clipping earlier
Given a ridiculous CopyArea, say copying from (-32000,-32000), the
region extents will wrap around when translated before the final clip
and reject test. To overcome this, do source based rejection earlier
before the potential underflow.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-01 17:02:44 +01:00
Chris Wilson 92b37783eb test/README: Add missing trailing characters from cut'n'paste
When copying the command from the terminal I failed to highlight the
last character.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-01 15:05:05 +01:00
Chris Wilson ab01c1211e sna: Fallback to normal composite if the blt redisplay fails
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-01 13:37:30 +01:00
Chris Wilson 21cc987ca8 sna: Only decouple the event once
If the client and drawable destroys are racing, we may trigger the event
removal twice.

References: https://bugs.freedesktop.org/show_bug.cgi?id=83183
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-09-01 07:20:00 +01:00
Jonathan Gray 2c564c04bc configure: check for cpuid.h
Instead of checking for a particular version of GCC check for
a cpuid.h with __cpuid_count.  This allows cpuid.h to be
provided for older/different compilers.

Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
[ickle: Delete the bare and redundant config.h]
2014-08-31 11:51:46 +01:00
Chris Wilson e8ad453a0a intel: Only include sys/mount.h on Linux
We only automount debugfs for Linux, but sys/mount.h on BSD has unmet
dependencies breaking the build.

Reported-by: Jonathan Gray <jsg@jsg.id.au>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-31 11:47:18 +01:00
Chris Wilson 2086965e5c gen8: Refresh video render programs
Reported-by: Timo Aaltonen <tjaalton@ubuntu.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=83207
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-29 10:45:03 +01:00
Chris Wilson b822bc8c2c sna/gen8: Check instead of asserting for a hang whilst setting up video state
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-29 10:14:35 +01:00
Chris Wilson 8f584f83dc tests: Add a couple of gstreamer pipeline hints
Having worked out how to use gstreamer, record the pipelines for
posterity.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-29 09:55:49 +01:00
Chris Wilson 69d584c6ac sna: Prepare fr changes in dirty tracking api (Prime)
Future commit "pixmap: fix reverse optimus support with multiple heads"
will allow for tracking within pixmaps (i.e. break the presumption that
everything starts at offset 0,0 in the target pixmap).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-29 07:29:49 +01:00
Chris Wilson f95d04b75b intel-virtual-output: Use snprintf() for simplicity
Third one-line patch to fix copying from the tainted user argument into
the socket's path buffer. This time, give in and just use snprintf() as
it guarrantees that it will not write more than 'n' characters and that
the last is a NUL byte.

Suggested-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-27 10:24:35 +01:00
Chris Wilson 011f04ff8e intel-virtual-output: Fix invocation of strncpy()
Somebody (me) confused it with snprintf() and put the string length in
the wrong location. Also note that strncpy() does not NUL terminate long
strings.

Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-26 18:31:05 +01:00
Chris Wilson 016599783c intel: Limit read to always fit in the buffer
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Suggested-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-26 12:46:50 +01:00
Chris Wilson e827f80e5c intel-virtual-output: Sanity check length on user supplied socket path
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Suggested-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-26 12:46:41 +01:00
Chris Wilson 51037706b0 sna: Fix attaching to a headless configuration
ADDFB fails with a headless config (as any fb size is invalid).
Fortunately, with headless we can use any depth we like.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-26 11:43:28 +01:00
Chris Wilson 8c5229cf8f sna: Make one last gasp at submitting the execbuffer before bailing
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-24 16:25:05 +01:00
Chris Wilson d209b03915 configure: Add guards for os.h redefines
os.h redefines a few common libc functions, so check if the host
provides them first and inform os.h if that is the case.

Suggested-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-24 07:05:35 +01:00
Chris Wilson 12c051d5c6 sna/dri2: Unhook event from draw list upon client destruction
When the client goes away, we need to free its events. However, we
have to defer the freeing of any pending event (ones currently routed
through the kernel) for those we need to remember to decouple the event
from the Drawable's list before they are freed.

Reported-by: John Lindgren <john.lindgren@aol.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82979
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-23 16:28:27 +01:00
Chris Wilson 1bbacf80a9 sna/dri2: Assert event is queued when marked as next pending flip
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-23 16:28:21 +01:00
Chris Wilson 48000371c9 sna/dri2: Remove the redundant parameter passed to free event
draw is always the same as event->draw, so just use event->draw.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-23 16:28:21 +01:00
Chris Wilson fef2f4dbae sna: DBG message fix for !xvmc
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-22 18:57:32 +01:00
Chris Wilson 9b2cf5c7ab sna: Propagate failure from changing backlight value
Especially when we delete the output property halfway through and the
ChangeProperty routine then attempts to wire it back up...

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82833
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-21 08:17:41 +01:00
Chris Wilson 61ec162dc9 backlight: Move the fd out of the select range
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-21 07:56:44 +01:00
Chris Wilson 726f1a38a5 sna: Only send the bl change notification if the randr_output exists
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-21 07:56:44 +01:00
Chris Wilson f5469681b6 sna: Be defensive during FreeScreen()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-18 14:37:44 +01:00
Chris Wilson bfacb9d8dc sna: Add some DBG warnings for early PreInit failures
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-18 14:37:19 +01:00
Chris Wilson 02f184e0ef test: Make SHM tests in lowlevel-blt-bench optional
A slightly more complex patch to disable the SHM based tests of
lowlevel-blt-bench when MIT-SHM support is not available at compile
time.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-18 07:43:21 +01:00
Chris Wilson 9058dac302 test: Only compile lowlevel-blt-bench if we have shm
Since 37ac34c4e4, lowlevel-blt-bench
requires SHM support, so only compile it if we detect such during
configure.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-18 07:29:05 +01:00
Chris Wilson 16b9447c51 intel: Only dump debugfs on linux
Other platforms are not going to have the same debug infrastructure, nor
even the same mount(2).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-18 07:00:48 +01:00
Chris Wilson f8e632f396 sna: Select appropriate tiling mode for TearFree shadow buffer
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-14 21:35:34 +01:00
Chris Wilson c3b093b3c0 sna: DBG log invalid surface sizes
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-08-14 21:32:48 +01:00