Commit Graph

4836 Commits

Author SHA1 Message Date
Chris Wilson b0d3c4f661 sna/gen7: Hook in the poor-man's linear gradient
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-07 10:43:24 +00:00
Chris Wilson dcc364a7b1 sna/gen6: Add poor-man's linear implementation
Still no JIT, in the meantime we can at least cache the gradient ramps.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-07 10:40:50 +00:00
Chris Wilson 232972c0e5 sna: Remove the 2-step damage flush
The idea was to reduce the number of unnecessary flushes by checking for
outgoing damage (could be refined further by inspecting the reply/event
callback for a XDamageNotifyEvent). However, it does not flush
sufficiently for the compositors' liking. As it doesn't appear to restore
performance to near uncomposited levels anyway, remove the complication.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-06 12:25:55 +00:00
Chris Wilson eb10ade0fc sna: Defer the FlushCallback removal until after the next flush
Try to reduce the amount of Add/Delete ping-pong, in particular around
the recreation of the DRI2 attachment to the scanout after pageflipping.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 23:08:25 +00:00
Chris Wilson 60dacdb127 sna: Only install the flush callback for the duration of the foriegn buffer
After we are no longer sharing the bo with foreign clients, we no longer
need to keep flushing before every X_Reply and so we can remove the
callbacks to remove the overhead of having to check every time.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 22:48:49 +00:00
Chris Wilson b39d9f9166 sna: Check for flush at the start of every WriteToClient
The goal is to simply avoid the flush before going to sleep when we have
no pending events. That is we only want to flush when we know there will
be at least on X_Reply sent to a Client. (Preferably, it would a Damage
reply!) We can safe assume that every WriteToClient marks the beginning
of a new reply added to the Client output queue and thus know that upon
the next flush event we will emitting a Reply and so need to submit our
batches.

Second attempt to fix a438e4ac.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 22:29:38 +00:00
Chris Wilson f30b0beea4 sna/trapezoids: Ellide empty cells
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 21:53:08 +00:00
Chris Wilson b69c9dfae1 sna/composite: Skip clipping the rectangle region against the singular clip
As we will already have taken it into account when constructing the
region from the rectangles.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 21:47:14 +00:00
Chris Wilson f4846168a6 sna: Flush dirty CPU damage before notifying the compositor
Fixes regression from a438e4ac (sna: Revamp vmap support)
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-05 21:35:52 +00:00
Chris Wilson d7600e4e77 sna: Add some assertions to partial buffer list tracking
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-04 19:14:24 +00:00
Chris Wilson 3b5d556a93 sna: Fix assertion for checking inactive shadow buffers
We may have an ordinary malloc with no CPU bo attached so check before
dereferencing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-04 15:48:33 +00:00
Chris Wilson aaed9e9722 sna: Encourage promotion of snooped CPU bo to real GPU bo
This fixes the regression in performance of fishietank on gen2. As
the texture atlas is too large to be tiled, one might presume that it
has the same performance characteristics as the snooped linear CPU
buffer. It does not. Therefore if we attempt to reuse a vmap bo, promote
it to a full GPU bo. This hopefully gains the benefit of avoiding the
copy for single shot sources, but still gives us the benefit of avoiding
the clflushes.

On the plus side, it does prove that gen2 handles snoopable memory from
both the blitter and the sampler!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 23:49:58 +00:00
Chris Wilson 599cd0e8ef sna: Align allocations with partial buffers to 64 bytes.
A magic number required for so many functions of the GPU. In this
particular case it is likely to be that the offset of a texture in the
GTT has to have a minimum alignment of 64 bytes.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46415
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 20:18:32 +00:00
Chris Wilson 4918e309df sna: Silence an assertion failure during shutdown
Clear the scanout flag on the front buffer during teardown to silence
the debugger.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 18:18:48 +00:00
Chris Wilson f890fc25c6 sna: And fix compilation for last commit
I skipped a GCC warning about the implicit function declaration, which
of course results in a runtime silent death. Oops.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 18:11:56 +00:00
Chris Wilson 4f853acfec sna: Prevent backing pixmaps being created later
We used to allow the backing pixmap to be created later in order to
accommodate ShmPixmaps and ShmPutImage. However, they are now correctly
handled upfront if we choose to accelerate those paths, and so all
choice over whether to attach to a pixmap are made during creation and
are invariant.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 17:45:35 +00:00
Chris Wilson 866a61a259 sna: Disable vmap on 965gm
The sampler just dies if it encounters a snoopable page, for no apparent
reason. Whilst I encountered the bug on Crestline, disable it for the
rest of gen4 just to be safe.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 16:12:09 +00:00
Chris Wilson 1c65378689 sna: Pass usage hint for creating linear buffers
As we wish to immediate map the vertices buffers, it is beneficial to
search the linear cache for an existing mapping to reuse first.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 14:34:23 +00:00
Chris Wilson 29ec36ff06 sna: Only discard the inplace flag for LLC partial buffers
KGEM_BUFFER_WRITE_INPLACE is WRITE | INPLACE and so the typo prevented
uploading of partial data through the pwrite paths.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 10:01:07 +00:00
Chris Wilson f039ccf958 sna: Be careful not to discard the clear operation for move-region-to-cpu
When moving only a region to the CPU and we detect a pending clear, we
transform the operation into a move whole pixmap. In such situations, we
only have a partial damage area and so need to or in MOVE_READ to
prevent the pending clear of the whole pixmap from being discarded.

References: https://bugs.freedesktop.org/show_bug.cgi?id=46792
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-02 09:53:27 +00:00
Chris Wilson 392593e61d sna/gen5: Help the compiler avoid an uncached read
Debug builds are excruitatingly slow as the compiler doesn't store the
temporary in a register but uses an uncached readback instead. Maybe
this will help...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-01 21:19:22 +00:00
Chris Wilson 9c0c04cac2 sna: Split storage of inactive partials
As we now attempt to keep retain partial buffers after execution, we can
end up will lots of inactive buffers sitting on the partial buffer list.
In any one batch, we wish to minimise the number of buffers used, so
keep all the inactive buffers on a seperate list and only pull from them
as required.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-01 21:19:22 +00:00
Chris Wilson a438e4ac9b sna: Revamp vmap support
Dust off the kernel patches and update to reflect the changes made to
support LLC CPU bo, in particular to support the unsynchronized shadow
buffers.

However, due to the forced synchronisation required for strict client
coherency we prefer not to use the vmap for shared pixmaps unless we are
already busy (i.e. sync afterwards rather than before in the hope that
we can squash a few operations into one). Being able to block the reply
to the client until the request is actually complete and so avoid the
sync remains a dream.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-01 21:19:22 +00:00
Chris Wilson 272f5d9f84 sna: Discard use of inplace GTT uploads on LLC architectures
As the buffer is cache-coherent, we can read as well as write to any
partial buffer so the distinction is irrelevant.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-03-01 15:17:49 +00:00
Chris Wilson 43b1a717ba sna: Sort the partial buffers after stealing a write buffer
It will be decoupled and not used again, but this keeps the sanity
checks happy.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-28 13:37:14 +00:00
Chris Wilson 8198e5872c sna/gen3: Tweak glyph rendering fast paths
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-28 10:51:49 +00:00
Chris Wilson 3c4f29820b uxa/gen3: Remove special casing of solid pictures
Fixes use of alpha-groups and opacity masks in cairo.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-27 16:28:41 +00:00
Chris Wilson 8f3066f0c7 sna/gen2; Initialise channel.is-opaque for fills
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-27 15:32:09 +00:00
Chris Wilson 3640a0d4cb Revert "meh"
This reverts commit 4adb6967a8.

Oops, this debugging commit was not intended to be pushed along with the
bugfix. :(

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-27 12:29:15 +00:00
Chris Wilson 6fd8d74a6a sna: Upload the ordinary partial buffers!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-27 12:21:59 +00:00
Chris Wilson 4adb6967a8 meh 2012-02-27 11:36:35 +00:00
Chris Wilson 4fbb0baff5 sna: Avoid reusing mmapped partial write buffers for readback
An artefact of retaining the mmapped partial buffers is that it
magnified the effect of stealing those for readback, causing extra
writes on non-llc platforms.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-27 09:15:05 +00:00
Chris Wilson a3c398a673 sna: Retain unfinished partial buffers between batches
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-25 12:50:19 +00:00
Chris Wilson 8d773b88f4 sna/gen3+: Keep the vertex buffer resident between batches
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-25 12:50:19 +00:00
Chris Wilson 8cb773e7c8 sna: Ensure we trigger a retire for search_linear_cache
Bo used for batch buffers are handled differently and not tracked
through the active cache, so we failed to notice when we might be able
to run retire and recover a suitable buffer for reuse. So simply always
run retire when we might need to create a new linear buffer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-25 11:42:16 +00:00
Chris Wilson b1b4db8942 sna: Skip a tiled bo when searching the cache for a linear mmap
If we change tiling on a bo, we are effectively discarding the cached
mmap so it is preferable to look for another.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-25 00:43:30 +00:00
Chris Wilson 85e48d2e5e legacy: Rename XF86DRI to HAVE_DRI1 to avoid conflicts with xorg-server.h
We use the XF86DRI as a user configurable option to control whether to
build DRI support for i810, but it is also used internally within xorg
and there exists a public define in xorg-server.h which overrides our
configure option. So rename our define to HAVE_DRI1 to avoid the
conflict.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46590
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-24 21:40:44 +00:00
Chris Wilson 96db90e819 legacy: Delete unused XF86DRI_DEVEL #define
References: https://bugs.freedesktop.org/show_bug.cgi?id=46590
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-24 21:36:30 +00:00
Chris Wilson b870a3e5cd configure, NEWS: Bump version to 2.18.0 for release
Another quarter, a bit late as I was debugging a few regressions,
another release.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-24 11:27:01 +00:00
Chris Wilson 5b5cd6780e uxa: Add a option to disable the bo cache
If you are suffering from regular X crashes and rendering corruption
with a flood of ENOSPC or even EFILE reported in the Xorg.log, try
adding this snippet to your xorg.conf:

Section "Driver"
  Option "BufferCache" "False"
EndSection

References: https://bugs.freedesktop.org/show_bug.cgi?id=39552
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-24 11:19:58 +00:00
Gaetan Nadon f8ca50818c Revert "Update autotools configuration"
This reverts commit 9184af921b.

All X.Org modules must be able to be configured with autoconf 2.60.
In addition, version 2.63 has GPL licensing issues which prevents
some vendor to release software based on it.

The AM_SILENT_RULES are already handled by XORG_DEFAULT_OPTIONS.

All X.Org modules must be able to be configured with libtool 1.5.

AM_MAINTAINER_MODE default value is "enabled" already.

We use the same autogen script for all x.org modules.
There are proposals for changes which should be reviewed and eventually
applied to all modules together.

The lt*.m4 patterns are already included in the root .gitignore file.
This can be proposed as a change to all modules, but it invloves
changing the topvel .gitignore, the m4/.gitignore, the ACLOCAL_AMFLAGS
and the AC_CONFIG_MACRO_DIR together.

For more information on project wide configuration guidelines,
consult http://www.x.org/wiki/ModularDevelopersGuide
and http://www.x.org/wiki/NewModuleGuidelines.

Acked-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-23 14:43:34 -05:00
Chris Wilson a647aff512 sna/gen3: Silence the compiler complaining with DBG enabled
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 12:04:09 +00:00
Chris Wilson cd3a618f58 sna/gen4 Refactor get_rectangles() to re-emit state after a flush
Condense the work performed by each caller into the callee.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 11:40:44 +00:00
Chris Wilson 6a3fa4d1b6 sna/gen7 Refactor get_rectangles() to re-emit state after a flush
Condense the work performed by each caller into the callee.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 11:36:48 +00:00
Chris Wilson fe914eaca4 sna/gen5 Refactor get_rectangles() to re-emit state after a flush
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 10:51:25 +00:00
Chris Wilson 4ecf882c83 sna/gen6: Refactor get_rectangles() to re-emit state after a flush
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 10:51:22 +00:00
Chris Wilson dfa21713c2 sna/gen3: Refactor get_rectangles() to emit composite state and retry
As gen3 only uses the single state emission block, and uniformly calls
get_rectangles(), we can move that caller protocol into the callee.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 10:28:47 +00:00
Chris Wilson a48e6e0db9 sna/gen3+: Force a batch flush when run out of CA vbo
As we prematurely end the batch if we bail on extending the vbo for CA
glyphs, we need to force the flush.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 10:28:47 +00:00
Chris Wilson 57c19b10db sna: Use a CPU mapping if the bo is already in the CPU domain
The heuristic of using the mapping only before the first use in an
execbuffer was suboptimal and broken by the change in bo initialisation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-23 09:49:49 +00:00
Chris Wilson 510767e213 sna/gen4: Fix vertex flushing across batch flushing
Due to the w/a for its buggy shaders, gen4 is significantly different
that backporting the simple patch from gen5 was prone to failure. We
need to check that the vertices have not already been flushed prior to
flushing again.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-02-22 21:02:43 +00:00