Commit Graph

7217 Commits

Author SHA1 Message Date
Chris Wilson 815caa9fc6 sna/gen4+: Rebalance creation of vbo during batch flushing
We need to be careful not to copy too much data during the vertex flush
or else that becomes the rate-limiting step. The goal here is to do the
early flush to warm up the GPU, then transition to larger batches.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-11 10:20:30 +01:00
Chris Wilson 0d05a69bd7 sna/gen4: Always try the BLT composite routines first
Given how fragile the render operations are, taking the hit from
transitioning from the slow render operations to the comparatively fast
BLT (when possible) is always worth it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-11 10:20:28 +01:00
Chris Wilson 9a66d77efa sna: Disable use of Y-tiling for gen4
This problematic GPU still seems to like to fallover when faced with
Y-tiling. It was reserved only for use with glyphs, but even that
occasionally runs into trouble, so disable all selection of Y-tiling for
our own use.

Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1222203
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-10 12:29:24 +01:00
Chris Wilson 8ff8eb2b38 sna/hsw: Scanline waits require both DERRMR and forcewake
Oh my, bspec is missing a few details on how to perform a scanline wait
on Haswell. But by using the extra steps required for Ivybridge, we can
successfully send events from the scanout to the BCS ring. Sadly this
again means that to use vsync on Haswell requires preventing the GPU
from sleeping whilst it waits for the scanout to advance.

Reported-by: Dan Doel <dan.doel@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69119
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-09 16:23:04 +01:00
Chris Wilson dbe7598245 sna/hsw: Fix the event selection for scanline waits on pipe A
Hmm, this should have meant that we never actually waited for a
scan-line on pipe A. I wonder if it even works...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-09 15:42:06 +01:00
Chris Wilson 144d970461 sna/gen6+: Only apply the BLT copy w/a for self-copies
A missing check along the copy_boxes() path to bring the w/a into line
with the other paths.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-09 15:42:06 +01:00
Chris Wilson af4215dd7f sna: Call the new __offset functions in the last commit
Sigh. I added the new functions for the asserts, updated the parameters,
but forgot to change the actual function themselves.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-09 15:03:30 +01:00
Chris Wilson 6d5df67b3e sna: Remember to offset the box before asserting damage
When using sna_copy_boxes__inplace(), we need to remember that the
region is in destination space, so we need to offset the boxes when
comparing against the source. The assertion forgot to do so, and so
failed as soon as it met a little complexity.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-09 11:19:19 +01:00
Chris Wilson 634748486f sna/gen4+: Flush batch if idle on filling vbo
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-08 23:02:29 +01:00
Chris Wilson 77d74ec777 sna/gen6: Prefer the RCS on large GT systems
For SNB, the different between RCS and BCS is more marginal but it is
slightly in favour of using rendercopy on GT2.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-08 22:34:09 +01:00
Chris Wilson 287727ee22 sna/gen7: Prefer the BLT for gt1 systems
On gt1, the BCS is faster than the RCS for all equivalent operations,
unlike gt2+ where the RCS is faster (but at greater power draw).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-08 22:34:03 +01:00
Chris Wilson f25235a854 configure: Only assert DRI2 requirements not met if the DRI2 package is missing
The new error message was added in
commit ea30967245 [2.99.902]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Sep 6 22:54:48 2013 +0000

    configure: Disable UXA build without DRI2

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-08 16:38:58 +01:00
Chris Wilson 0ceba64821 intel-virtual-output: Debug option for forcing full redraws
References: https://bugs.freedesktop.org/show_bug.cgi?id=68987
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-08 13:51:14 +01:00
Chris Wilson 6a6517c748 sna: Only update the CRTCs after a resize if master
It appears possible to race the framebuffer resize with a VT switch and
so end up attempting to update the CRTCs whilst master. The code
complains, but in reality we can just ignore the requested change until
we VT switch back and then apply the updates upon restoration of master.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-07 22:07:04 +01:00
Chris Wilson 7ee7e373f2 sna: Split get_drawable_deltas()
In some cases we know we only have a window, and so may skip a
conditional.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-07 17:28:33 +01:00
Chris Wilson 218c9901e5 NEWS: Fix release dates, missed the transition to September 2013-09-07 15:16:51 +01:00
Chris Wilson 58a7611ccf 2.99.902 snapshot 2013-09-07 08:48:34 +01:00
Chris Wilson 0c697aee9b Revert "sna: Add XMir support"
This reverts commit 42d94356f6.

Ordered-by: The Management.
2013-09-07 08:42:26 +01:00
Chris Wilson ea30967245 configure: Disable UXA build without DRI2
DRI2 is interwoven into the UXA structs, so simply disable building UXA
if DRI2 is not available.

Reported-by: Ross Burton <ross@burtonini.com>
Bugzilla:  https://bugs.freedesktop.org/show_bug.cgi?id=69056
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 23:58:17 +01:00
Chris Wilson 9fdaeec8f2 sna: Search /sys/class/power_state for the AC adapter
The adapter names are not uniform, so we need to scan the directory and
find the entry that corresponds to the Mains power supply. However, the
acpid does continue to report generic ac_adapter events.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 23:55:56 +01:00
Chris Wilson 0485cdfb6d sna/dri: Only the BackLeft merits special allocation flags
As the BackLeft is the only that couled be flipped, it is the only one
that may end up as the scanout and so is the only one that should be
allocated from the scanout cache.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 23:55:55 +01:00
Chris Wilson 489a93e4cc sna/gen6+: Switch to using the BLT more often when off AC
The BLT is more power-efficient for the operations it can handle, so use
it when possible (following the usual caveats) if we know we only have
battery power.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 16:06:06 +01:00
Chris Wilson f2ed1ac7b9 sna: Listen to ACPI events for power state notifications
When on-battery, we would prefer to use more power efficient operations.
For example, the BCS is far more economical to more data around with, but
it doesn't have quite the same throughput as the hungry RCS. (Not that
there is any reason why, the BCS is supposed to run at full memory
speed, unfortunately that is main memory speed and not the caches...)

Note: that X already listens to acpid for video switch notifications, it
would be useful if we could extend that interface to emit power
notifications as well.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 16:06:06 +01:00
Chris Wilson 56f532db2c sna: Prefer to reuse CPU bo if it was last active rather than inplace uploads
This helps short-circuit writes followed by immediate reads.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 13:06:48 +01:00
Chris Wilson 7656755c9d sna: Keep the CPU bo around if it was recently active
Rather than always switching over to using the GPU bo and immediately
discarding the CPU bo, keep it around as we may want to reuse the cached
data.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 13:06:48 +01:00
Chris Wilson 9a1f2ab84c sna: Try an inplace CopyArea fallback first
This applies the copy-from-tiled-X GetImage optimistion to the
ShmGetImage paths - when we don't have userptr available.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 13:06:48 +01:00
Chris Wilson 0b2e11ab3c sna: Rechain up SetWindowPixmap upon ScreenPixmap change
Fixes regression from
commit d2f19d5a1f [2.99.901]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Sep 3 19:05:41 2013 +0100

    sna: Tidy walking the window tree for updating our pixmaps

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 11:12:28 +01:00
Chris Wilson 1b1ac5193e sna: Include some DBG for the virtual output detection
So we can see it in the logs along with the regular outputs.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 11:11:47 +01:00
Chris Wilson ccd605c492 intel-virtual-output: Unregister our singleton on a clean shutdown
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 00:34:07 +01:00
Chris Wilson 3c5caaf0a9 intel-virtual-output: Only wake up for a change in a visible cursor
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 00:30:53 +01:00
Chris Wilson 91b1f77da5 intel-virtual-output: Make the flush for recreating Damage explicit
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-06 00:23:37 +01:00
Chris Wilson 3979d11677 intel-virtual-output: Just request Damage BBox
As we ourselves only track the BBox of damage on the virtual outputs, we
can ask X to amalgamate the damage events as well.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 23:28:16 +01:00
Chris Wilson 0baac6bba7 sna/gen6+: Don't request extra caching for use-once upload buffers
As we only use these buffers once, we should not benefit from requesting
them to be moved into L3/LLC cache - over and above the default
recommendations we make when creating the buffer. Indeed, this may even
lead to artefacts if we fail to invalidate those other caches when
reusing the buffers.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 23:08:40 +01:00
Chris Wilson 2263f8f26f intel-virtual-overlay: Reset damage across modesets
Some versions of the Xserver lose Damage tracking across the modeset,
causing a loss of damage notifications and repainting to cease on the
virtual outputs. We can workaround this by reattaching the damage every
time we receive notification that the local Screen configuration
changes.

Reported-and-tested-by: Severin Strobl <fd@severin-strobl.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68987
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 22:29:55 +01:00
Chris Wilson 5dea07c31d intel-virtual-output: Reset the damage just prior to reading it back
Slightly more efficient command packing and reduces a damage race
slightly...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 21:25:00 +01:00
Chris Wilson bae4162487 intel-virtual-output: We don't need to enable the timer for reconfigure
The timer will be enabled if a reconfiguration actually takes place and
we mark the damaged region to be redrawn.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 21:23:56 +01:00
Chris Wilson d9a48bd0a3 intel-virtual-output: Just walk the list of clones attached to the display
Rather searching the entire array of all clones, just walk the presorted
list from the display.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 20:52:11 +01:00
Chris Wilson b57dfc5331 intel-virtual-output: Defer reenabling damage events until after we draw
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 19:40:07 +01:00
Chris Wilson 12de799598 intel-virtual-output: Flush the damage received message back to the local display
After processing the Damage notification, we need to send a message back
to the Xserver to clear the pending damage before we will be sent more
events. To make sure that message is sent we need to flush the output,
as we may never flush the output queue otherwise.

Reported-by: Severin Strobl <fd@severin-strobl.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68987
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 19:36:13 +01:00
Chris Wilson 1ce52e9331 intel-virtual-output: Track active clones
For the frequent operations, such as moving the cursor or updating
damage, it is more efficient to walk the list of active outputs (as the
discrete GPUs support lots of outputs!)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 18:13:27 +01:00
Chris Wilson f01c5eae2a intel-virtual-output: Reserve space for the '\0' in the sprintf
Even though we don't use the trailing NUL byte for our comparisons,
sprintf will write it, so we need make space for it.

Reported-by: Severin Strobl <fd@severin-strobl.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=68987
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 17:48:20 +01:00
Chris Wilson e6bb553b74 sna: Add a DBG to track calls to SetScreenPixmap
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-05 14:42:18 +01:00
Chris Wilson 94bc69d5b9 2.99.901 snapshot 2013-09-04 15:18:29 +01:00
Chris Wilson 4dfd7674d8 intel: Select SNA as the default acceleration method
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 15:18:29 +01:00
Chris Wilson 42d94356f6 sna: Add XMir support
With lots of updates by Christopher James Halse Rogers as he updated the
XMir API - but now supposedly frozen!

"<RAOF> ickle: I think the xmir api should be pretty much stable now,
barring people coming up with more awesome ways of doing things."

Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 15:18:29 +01:00
Chris Wilson f906a4de62 sna: WriteThrough support is now upstream
Now that the WriteThrough ABI is upstream, we can rely on runtime
detection of the current interface.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 15:18:29 +01:00
Chris Wilson 6f49a413aa configure: Check for required UMS headers before enabling
Prevents the build failing with i810 if we can not find vgaHW.h

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 15:18:28 +01:00
Chris Wilson ecb3c303f8 sna: Fix sna_pixmap_move_area_to_gpu() to return the sna_pixmap
Like it's sibling sna_pixmap_move_to_gpu(), it helps to know the private
sna_pixmap after the operation rather than just a boolean success/fail
result, and make it more robust in the process.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 12:25:47 +01:00
Chris Wilson ad774cf3a2 sna/dri: Refine proposed async swap interface
The latest proposal for passing swap_interval==0 is through the normal
ScheduleSwap() call, so we can remove the specialised function.

Link: http://lists.x.org/archives/xorg-devel/2013-September/037661.html
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-04 11:39:08 +01:00
Chris Wilson d2f19d5a1f sna: Tidy walking the window tree for updating our pixmaps
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2013-09-03 19:37:29 +01:00