Commit Graph

5358 Commits

Author SHA1 Message Date
Chris Wilson 4f2dde1fa3 sna/gen7: Eliminate the pipeline stall after a non-pipelined operation
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 20:32:39 +01:00
Chris Wilson 3ef05a8d08 sna/gen7: Do not emit a pipeline stall after a non-pipelined command
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 20:32:39 +01:00
Chris Wilson 4501e131e6 sna/gen7: prefer using RENDER copy
Further testing and the balance of doubt swings in favour of using the
3D pipeline for copies.

For small copies the BLT unit is faster,
2.14M/sec vs 1.71M/sec for comppixwin10

And for large copies the RENDER pipeline is faster,
13000/sec vs 8000/sec for comppixwin500

I think the implication is that we are not efficiently utilising the EU
for small primitives - i.e. something that we might be able to improve.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 20:31:30 +01:00
Chris Wilson 3da56c48b7 sna/gen7: Prefer using BLT rather than redirect for copies
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 20:26:25 +01:00
Chris Wilson b1f8386db6 sna/gen7: Emit a pipeline flush after every render operation
For whatever reason, this produces a 30% improvement with the fish-demo
(500 -> 660 fps on i7-3730qm at 1024x768). However, it does cause about
a 5% regression in aa10text. We can appear to alleviate that by only
doing the flush when the composite op != PictOpSrc.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 20:25:32 +01:00
Chris Wilson d02e6d8142 Encode the third pipe using the HIGH_CRTC shift for vblanks
The original vblank interface only understood 2 pipes (primary and
secondary) and so selecting the third pipe (introduced with IvyBridge)
requires use of the HIGH_CRTC. Using the second pipe where we meant the
third pipe could result in some spurious timings when waiting on the
vblank.

Reported-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-21 16:54:35 +01:00
Chris Wilson f8b67be8d3 sna: Don't clear the needs_flush flag after emitting a flush on the busy bo
We use that flag to check whether we need to check whether the bo is
still busy upon destruction, so only clear it if the bo is marked as
idle.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-20 12:39:19 +01:00
Chris Wilson 5419bbb483 sna/gen7: Prefer BLT for copies
It's faster for where the cost of the extra batches and ring switching
do not dominate...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-20 11:45:47 +01:00
Chris Wilson 1c0bb8c4c9 sna/gen7: Keep using RENDER paths for large pixmaps
As the 3D pipeline is quite versatile and we only need to force BLT if
we cannot extract the subregion.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-20 10:57:40 +01:00
Chris Wilson b238f64e8a sna/gen[67]: Prefer to not force BLT paths for large pixmaps
The sampler can in fact handler subregions of large pixmaps quite well,
and so we prefer to keep using the 3D pipeline so long as the operation
fits in. If not, then switch to the BLT in order to avoid the temporary
surface dance.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-20 10:46:59 +01:00
Chris Wilson 38f06a351f uxa: Fix second regression in glyph fallback from 64a4bc
To complete my show of incompetence for the evening, not only do we have
to restore the original source when compositing the mask onto the
destination, we also need to restore the original dst (rather than
composite the mask onto the mask!).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 22:22:12 +01:00
Chris Wilson fda9faee75 uxa: Use the original src for fallback glyph compositing
In 64a4bcb8ce, I introduced a WHITE source for the purposes of
accumulating the glyph mask correctly. Unfortunately I neglected to
restore the original source picture for compositing the glyph mask on
the destination, resulting in a use-after-free and then corruption.

Reported-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 21:01:47 +01:00
Chris Wilson 8141e290b1 sna: Explain why we ignore the busy status result during kgem_bo_flush()
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 20:55:18 +01:00
Chris Wilson eb1d07624e sna: Ensure extents is initialised if short-circuit use-cpu-bo
As we may attempt to end up using the GPU bo is the CPU bo is busy, we
need to make sure we have initialised the damage extents first.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 16:00:13 +01:00
Chris Wilson 9f216e159b sna: Assert expected return values
Keep the semantic analyser happy by consuming the expected return value
with an assert.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 15:57:31 +01:00
Chris Wilson 2dc93b2a6c sna: Check results from syscalls
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 15:34:09 +01:00
Chris Wilson 06634604ab Initialise adaptors to 0 in case xf86XVListGenericAdaptors does not
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 15:28:43 +01:00
Chris Wilson 8bfea58dbc sna: Minor cleanups from sematic analyser in DBG
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 15:26:18 +01:00
Chris Wilson 0a43d42567 uxa: Implement glyphs-to-dst to avoid fallbacks
An earlier version was buggy and introduced corruption as it failed to
fallback gracefully with ComponentAlpha glpyhs. This is a much simpler
implementation that composites each glyph individually, leaving it to the
backend to optimise away state changes. It should still be many times
faster than incurring the fallback...

Reported-by: Oleksandr Natalenko <pfactum@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50508
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 15:21:43 +01:00
Chris Wilson 64a4bcb8ce uxa: Use (white IN glyph) ADD mask to compose the glyph mask
As pointed out by Soren Sandmann and Behdad Esfahbod, it is essential to
use white IN glyph when adding to the mask so that the channel expansion
is correctly performed when adding to an incompatible mask format.

For example, loading alpha as the source results in the value 000a being
added to the rgba glyph mask (for mixed subpixel rendering with
grayscale glyphs), whereas the desired value is aaaa.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 14:05:12 +01:00
Chris Wilson 99845dcb3b Post Damage on the Screen Pixmap after a pageflip
This issue was raised by Dave Airlie as he is trying to integrate
multiple GPUs into the xserver, and a particular setup has a slave
rendering device that copies the contents from the GPU over a
DisplayLink USB adaptor. As such the slave device is listening for
Damage on the Screen Pixmap and needs the update following pageflips.
Since we already are posting damage for all the SwapBuffers paths other
than pageflip, for consistency we should post damage along the pageflip
path as well.

Reported-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 10:43:09 +01:00
Chris Wilson 4acf727941 sna: Initialize the color value for fallback unaligned boxes
Reported-by:Zdenek Kabelac <zkabelac@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=5047
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 10:24:24 +01:00
Chris Wilson b0b2d3c966 sna: Avoid copying unintialised data during source picture upload
If we have never written to a pixmap, then there will be neither a GPU
or shadow pointer and we would attempt to copy a NULL pointer. In this
case as the user is expecting to copy unintialised data we are at
liberty to replace those undefined values with the clear color.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 00:41:35 +01:00
Chris Wilson 38472fcc53 sna: Double check that the source is busy before performing indirect reads
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 00:40:04 +01:00
Chris Wilson 8cdfb8c24c sna: Fix up the shadow pointer on the source when copying
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-19 00:40:04 +01:00
Chris Wilson 17f3a83fdc sna: Review sna_copy_boxes
A couple of ordering issue and more assertions.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 23:50:04 +01:00
Chris Wilson a9045699b9 sna: Reset region after transferring to cpu
If we adjust the region for the pixmap offset, be sure that we reset it
before returning it back to the caller.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 23:50:03 +01:00
Chris Wilson 9f51311a7d sna: Check if the busy is truly busy before commiting to an indirect upload
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 23:50:03 +01:00
Chris Wilson 291b3c4367 sna: Align upload buffers to 128
This seems to be a restriction (observed on 965gm at least) that we
have incoherent sampler cache if we write within 128 bytes of a busy
buffer. This is either due to a restriction on neighbouring cachelines
(like the earlier BLT limitations) or an effect of sampler prefetch.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=50477
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 23:50:03 +01:00
Chris Wilson 39e5c74915 sna: Assert damage is valid after every addition
Even more paranoia than just checking upon migration.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 22:20:01 +01:00
Chris Wilson 92e1693e5f sna: Validate cpu/gpu damage never overlaps
References: https://bugs.freedesktop.org/show_bug.cgi?id=50477
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 21:29:51 +01:00
Chris Wilson d2312c8f95 sna: Fixup tracking of vmap upload buffers
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 21:30:58 +01:00
Chris Wilson 75e9eeca7e sna: Remove overlapping CPU damage when operating inplace on the GPU
Otherwise we gradually introduce garbage into the picture.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50477
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 16:39:20 +01:00
Chris Wilson a936466dd4 sna: Prefer to attempt a Composite operation rather than use pixman composite
As pixman composite performance is atrocious for anything other than
solids, prefer to upload the mask and attempt a composite operation on
the GPU unless we are forcing the fallback.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 11:36:53 +01:00
Chris Wilson 4b325d6e2b sna: Fix rendering of unaligned boxes through pixman
Not only do we need to make sure the source is available to the CPU, we
need to actually check the right conditions for clipping the box.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-18 11:29:56 +01:00
Chris Wilson caef27492b sna: convert another instance of applying the clear to the CPU pixmap
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 21:00:34 +01:00
Chris Wilson 8695c4c776 sna: Fix the blt composite op with no-ops
When returning early because the operation is a no-op, we still need to
fill in the function pointers to prevent a later NULL dereference.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 17:14:06 +01:00
Chris Wilson 7905ddae1d sna: Further refine choice of placement when uploading source data.
The goal is cheaply spot a simple copy operation that can be performed
on the CPU without having to load both parties onto the GPU.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 17:14:06 +01:00
Chris Wilson 5a675b61f2 sna: Correct typo forcing everything to be clear to 0!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 15:42:17 +01:00
Chris Wilson b55bf1abbe sna: Fix cut'n'paste errors in tiling debug
Rename for different variables

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 15:05:33 +01:00
Chris Wilson 9756c60b4a sna/gen7: Enable non-rectilinear spans
Seems we have enough GPU power to overcome the clumsy shaders. Just
imagine the possibilities when we have a true shader for spans...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 11:39:33 +01:00
Chris Wilson 41aff56a1f sna: Add tiling for spans
Semmingly only advisable when already committed to using the GPU. This
first pass is still a little naive as it makes no attempt to avoid empty
tiles, nor aims to be efficient.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 10:59:55 +01:00
Chris Wilson 222e6ff43e sna: Read inplace for fallback copies
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:30 +01:00
Chris Wilson 79d468925b sna: Decrease latency for 1x1 GetImage by using an inplace mapping
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:30 +01:00
Chris Wilson 2c2a8d3780 sna: Allow reads to be performed inplace
If we can guess that we will only readback the data once, then we can
skip the copy into the shadow.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00
Chris Wilson bc6997f6f7 sna: Cleanup damage processing after operating inplace
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00
Chris Wilson 937ca8a5d8 sna: Use memset for simple clears
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00
Chris Wilson de4572b0b5 sna: Inspect CPU damaged state when deciding upon Composite placement
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00
Chris Wilson b689cd924c sna: Composite traps inplace if the CPU is already all-damaged
One outcome is that inspecting the usage patterns afterwards indicated
that we were missing an opportunity to reduce unaligned boxes to an
inplace operation.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00
Chris Wilson ae3c096379 sna: Composite glyphs inplace if the CPU is already all-damaged
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2012-06-17 09:44:29 +01:00