Commit Graph

7332 Commits

Author SHA1 Message Date
Chris Wilson 79f8ff4bbb sna/gen4+: Share a few common routines
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 13:24:46 +01:00
Chris Wilson 8bd9d63a86 sna/gen6+: Share the common routines for ring preferrence
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 13:24:46 +01:00
Chris Wilson ddcd860702 sna/gen6+: Only allow switching to BLT for fills if we have semaphores
An extra caveat to these generations for

commit 97d809c26b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Oct 10 00:15:55 2013 +0100

    sna: Pass usage hint down to render fill routines

is that we don't want to incur ring switch overheads that may overwhelm
any advantages from using the BLT.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 12:19:20 +01:00
Chris Wilson c99d44d7f0 sna: Prevent changes in tiling/pitch of existing framebuffers
Reported-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 08:32:51 +01:00
Chris Wilson 97d809c26b sna: Pass usage hint down to render fill routines
For the scanlines emitted for rendering Core drawing primitives, it is
preferable to use the BLT engine, so pass those hints down.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 00:16:58 +01:00
Chris Wilson b16999da21 sna: Upon unwinding operations, also check for exec objects to clear
If we cancel an operation after partially committing it, we may leave
the batch bookkeeping in an inconsistent state with an exec object with
a zero-length batch. Ordinarily, this would not be an issue as we could
pass the extra object to the next batch. However, if we switch rings, we
need to clear the extra objects as they are currently flagged as being
on the wrong ring, leading to hilarity.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-10 00:00:46 +01:00
Chris Wilson b9ad5b625e 2.99.904 snapshot 2013-10-09 17:18:43 +01:00
Chris Wilson d1aa2ac5dd sna: Steal the current mode name
Rather than duplicating a string, we can simply transfer ownership from
the temporary mode to the mode list.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-09 16:22:59 +01:00
Chris Wilson 6fda305e2f sna: Append the current mode to the output list if not found
If for some reason the current mode on the CRTC (inherited most likely
from fastboot) doesn't match any of the modes reported by the output, we
end up with a stray mode that the client cannot control.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70132
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-09 16:10:17 +01:00
Chris Wilson d1cb39d0a8 sna/gen3+: Flush vertex buffer after computing resize
Upon aligning the buffer, we may enlarge the vbo to accomodate the
vertex alignment and push the current index past the end of the buffer.
Move the space check from before the alignment computation to
afterwards.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=47597
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-09 11:15:24 +01:00
Chris Wilson 38333443b8 sna: Emit DBG for when we fallback to xf86InitialConfig detection
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-08 16:12:06 +01:00
Chris Wilson 082c08789c sna: Rework the num_threads refinement to avoid the division
We can replace the division by a multiplication.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-08 09:40:34 +01:00
Chris Wilson 06a8ad9690 sna/trapezoids: Recompute num_threads to match range
We need to be careful not to execute threads past the end of the alloted
buffer by making sure the clip extents correctly align.

Reported-by: Joseph Yasi <joe.yasi@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70204
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-08 00:04:54 +01:00
Chris Wilson 1fb4f60671 sna: Trim color cache allocation to a single page
Instead trying to allocate 4100 bytes, fix the logic to only require a
maximum of 4096 bytes in the cache buffer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 22:06:32 +01:00
Chris Wilson 55cd67485f sna/trapezoids: Only use a single thread to emit rectilinear spans
If the trapezoids are rectilinear, they should hit a fast path through
the span compositors and so threading them seems pointless. Expect
possibily for inplace pixman operations.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 21:39:43 +01:00
Chris Wilson 55e0f45026 sna/gen7: Rename debug option ALWAYS_FLUSH to ALWAYS_INVALIDATE
This allows us to distinguish between the texture cache invalidation
stage versus the opportunistic flushing, and test either.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 11:56:23 +01:00
Chris Wilson eda8725493 sna/gen7: Tweak flushing
We pre-emptively flush the render cache before reads as that seems to
improve performance. Now try not flushing if we don't subsequently need
to read from the render cache.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 11:54:59 +01:00
Chris Wilson 1c651848cc sna/trapezoids: Restore overflow check
The range can indeed overflow, so promote the assertion back into a
check.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 10:30:20 +01:00
Chris Wilson d462475b7e sna/trapezoids: Fix overstepping vertical edges
Regression from

commit c98b770a87
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Oct 4 18:37:01 2013 +0100

    sna/trapezoids: Add a precise scan converter

Reported-by: Joseph Yasi <joe.yasi@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70204
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-07 10:07:40 +01:00
Chris Wilson c3fe60c157 sna/gen7: Add a always-stall debug option
References: https://bugs.freedesktop.org/show_bug.cgi?id=68410
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-06 17:27:22 +01:00
Chris Wilson 7284e7f48b intel: Filter out the control bit from the device minor
When computing the render node for the device, filter out the potential
control node.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-05 23:00:49 +01:00
Chris Wilson 524a45da56 compat-api: Map changes of DamageUnregister API in 1.14.99.2
Reported-by: Emmanuel Benisty <benisty.e@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-05 19:00:32 +01:00
Chris Wilson 43d616066f sna/trapezoids: Do not pass invalid trapezoids to pixman
Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/1197921
Link: http://lists.x.org/archives/xorg-devel/2013-October/037996.html
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-05 18:52:56 +01:00
Chris Wilson c98b770a87 sna/trapezoids: Add a precise scan converter
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-05 18:52:56 +01:00
Chris Wilson 27ad2fc1dc sna: Start splitting the trapezoids megafile into parseable blocks
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 21:57:26 +01:00
Chris Wilson 898087014c sna: Fix FillRectangles intersection with complex clip
Lesson 2: Use the right variables.

Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70137
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 16:28:29 +01:00
Chris Wilson 20afd7263f sna: Tidy up FillRectangles intersection with complex clip
Lesson 1: do not accidentally overwrite the loop count inside the loop.

Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70137
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 16:15:04 +01:00
Chris Wilson 22557b88d3 sna/dri: Only move the scanout to the flip cache if destroyed
Under certain circumstances, we can retire the pageflip before the
client has updated its back buffers. This leads us to pre-emptively
moving the scanout to the cache, when all we need to do (and will do) is
report the same back buffer back to the client.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 14:15:53 +01:00
Chris Wilson 394b2ce51d sna: Add a few more DBG to track refcnts
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 14:13:50 +01:00
Chris Wilson dbf98d8963 sna/gen5: Replace pipe-control with full MI_FLUSH for required CS stall
It appears that we need top-of-pipe synchronisation for changing of
certain state, and that the gen5 pipecontrol instruction is
insufficient. So we have to fall back on the good old MI_FLUSH in order
to make sure that the GPU invalidates its state correctly.

Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51422
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 09:36:49 +01:00
Chris Wilson aa439ffee4 sna: The device fd is marked as non-blocking so beware the busy-wait
During redisplay we wait for the pageflip result. If the fd is marked as
non-blocking this results in a busy-wait, so insert a poll first to
remove the busy-wait.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 09:07:30 +01:00
Chris Wilson be17746549 intel-virtual-overlay: Error out if no X11 SHM header is defined
Make the error explicit rather than dieing later with unknown constants.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 08:40:49 +01:00
Chris Wilson b8aed26619 configure: Disable building tools if prerequisite headers not found
After the pkg-config checks, we then probe the headers. If those probes
fail, we obviously wish to prevent building the tools as the build will
fail.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-04 08:37:48 +01:00
Chris Wilson a0476ee6d0 intel: Allow opening the device only through platform information
Only fail to open the device based on the PCI address, if and only if we
do not have sufficient platform information to find the correct system
device.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 16:15:22 +01:00
Chris Wilson a47f8683fe intel: Handle fallback probing without match_data
One extreme fallback path through the xf86PlatformProbe results in a
call without any match data. As we have a device by this point, we can
simply do a reverse match.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 16:15:22 +01:00
Chris Wilson 6c157a925f intel: Remove dependence upon having PciInfo
After some probing mechanisms, we may end up with a valid device without
knowing its PCI address a priori. Having a valid device, we can just
query it for the correct device id, and can safely abort any path that
requires PCI information that we don't have. (Those paths are not valid
under such hosting anyway - if it may be required, we could reconstruct
the address.)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 16:13:38 +01:00
Chris Wilson 4685e79d11 intel: And restore PlatformProbe to working order
In the saga of the untested WIP patches for hosted device probing, was
the failure in logic to detect a valid device during probing. Yikes.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 14:42:45 +01:00
Chris Wilson 58b26055f4 intel: Querying device attributes must be non-NULL
Check first for a NULL platform device before querying the attributes or
else suffer a segfault during PCI probing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 14:09:26 +01:00
Chris Wilson b7d5292e01 intel: Fix fallout from accident push of ODEV_ATTRIB_FD
This is WIP for passing along a hosted fd. It wasn't meant to be pushed
along with the bug fix this morning.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 13:38:06 +01:00
Chris Wilson adbf01306a sna: Restart timer evaluations if the BlockHandler takes too long
Rather than passing a negative timeout to select, if we detect that we
expired our timeout during the processing of the BlockHandler, restart.

More worrying is that something in the BlockHandler took longer than 3ms
to process.

Reported-by: Felipe Contreras <felipe.contreras@gmail.com>
Link: http://article.gmane.org/gmane.comp.freedesktop.xorg.devel/37388
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-03 08:30:48 +01:00
Chris Wilson 3b3a5ca603 intel: Query platform fd
Under a compositor, we wish to use the pre-authorized fd passed to us by
the host, stashed away in the platform device.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-02 18:29:38 +01:00
Chris Wilson 7978592048 intel: Pass the platform device along to the open routines
This allows us to pass along more metadata along with the platform
device in future. Currently we pass the device path, but in a hosted
environment we should be passing along the authorized fd from the host.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-02 18:24:47 +01:00
Chris Wilson db1edf0e10 configure: Error out if glamor request but UXA is disabled
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-02 16:18:43 +01:00
Chris Wilson a048f436a0 sna: Only delete unused io buffers
Before deleting the io buffer, we need to check that it is not active.
Currently we check that it is not pending use in the current batch, but
we also need to double check that it does not have outstanding use by
the GPU. Failing to do so could mean overwriting the data prior to it
being read by the GPU, a very small race but often hit!

Reported-by: Vedran Rodic <vrodic@gmail.com> # and many others
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66990
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-02 15:04:20 +01:00
Chris Wilson 660e9e14bd sna: Add a few more asserts around handling of buffers
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-02 15:04:19 +01:00
Chris Wilson c724098f22 sna/trapezoids: Fix clipping on the far left
Edges that extend past the left hand side of the clip box cannot simply
be ignored (since they contribute to the scanline to their right, our
region of interest) but they need to calculated separately rather than
merged into the first cell.

Reported-by: Pavel Ondračka <pavel.ondracka@email.cz>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69469
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-10-01 10:56:31 +01:00
Chris Wilson 1cf8d5134d sna: Honour Option "AccelMethod" "none"
If the user requests that acceleration be disabled either through
AccelMethod or NoAccel, do so.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-30 15:40:35 +01:00
Chris Wilson 1d6a9d4a42 sna: Only reduce Over to Src if the rects do not overlap
Similar to the previous commit, we have to allow overlapping OVER
rectangles to be drawn one after another.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-30 13:27:19 +01:00
Chris Wilson b9bce2303e sna: Do not reduce overdrawn rectangles for XRenderCompositeRects
The specification is that each is drawn in sequence (so over top of
earlier rectangles), so do not cheat by using the computed region.

Reported-by: Clemens Eisserer <linuxhippy@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66313
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-30 12:39:51 +01:00
Chris Wilson 0532b3cc3c sna: Unmap cow bo when recreating the source bo
When we destroy the original source and copy it to a new bo, we also
need to make sure that any mappings of the original bo in the clones are
undone.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-30 12:38:39 +01:00