xserver-xorg-video-intel: Changes to 'master'
New branch 'master' available with the following commits:
commit c451a471fbe1553c0273f3bd12f3c1a42f7ce193
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Aug 27 19:06:52 2013 +0100
sna/video: Copy the ClipRegion for the sprite
A cut'n'paste error dropped the clip region copy, resulting in the
port not being set on the window instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit feae741b38445f323cc1ae08f290192c7033f0f0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Tue Aug 27 18:57:54 2013 +0100
sna/video: Update sprite destination colorkey command
The final version that was upstreamed differed from the original version
we implemented. The final version allows for both destination/source
colorkeying, but left the ddx out of date.
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 6997c4c2bde319fdf73ead8a9c9965f6548545eb
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Aug 26 22:07:49 2013 +0100
sna: Promote no COWs assertion to a condition check before operating inplace
We can arrive there with a COW and wanting to a CPU mapping, which is
unfortunate and requires the indirect path instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 3b267e52a0892ddb7b4a73e9b06555efe9e0b778
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon Aug 26 21:58:57 2013 +0100
sna: Fix ordering of assert vs the state it checks
It helps to set the state we want to check before actually checking that
we set it!
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit e98cc0b1ce69a7ebc6b6ef4b916d05b9f73efe0b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Aug 25 23:05:32 2013 +0100
sna: Make sure we assert our Master status before copying the fbcon
Being able to read back the fbcon handle as a non-Master process is an
information leak that will be fixed. We should already be Master by
this point by virtue of the sequence in which we obtain the device fd.
However, to be pedagogically correct, call drmSetMaster() before the
fbcon copy.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit f62173af1af84e398a92fbe5ae67aa3f20f67060
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Aug 25 14:12:15 2013 +0100
sna/gen7: Combine a couple of pipe-flushes
Reduce the number of pipe-controls we emit by combining one of the
frequent flushes with a stall.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit c1dbbe69ada3323a82ebd672e9ef47a0d95911c9
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Aug 25 11:26:46 2013 +0100
sna: Make SetScreenPixmap do as it says
Make sna_set_screen_pixmap() a little more complete and remove the
assertion that the caller manages sna->front. This should make the
function easier to reuse.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 097c2567939f2063749acf0bc768df7bb002d535
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Aug 25 10:49:57 2013 +0100
sna: Add a few more checks for a hosted Xserver before walking CRTC lists
If we are hosted, we do not own the CRTC configuration, and deferencing
the private data structures believing them to be ours, only leads to
disaster.
Based on patches by Christopher James Halse Rogers.
Reported-by: Christopher James Halse Rogers <raof@ubuntu.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit d7e6e9b83ce029e81767de35124b84914ad7d54b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sun Aug 25 00:55:19 2013 +0100
sna/dri: Prefer the source ring
When copying from the DRI client onto the scanout, we return the source
buffer back to the client afterwards. Therefore if we force the source
to switch rings, we incur a double ring switch from the client to us and
back. If we force the dst to switch rings, it will likely be then
correct for all subsequent copies as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit d4ca1953189d39741bcce659da0d6adcc548ab71
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 24 15:09:06 2013 +0100
sna: Fix reversed logic and loss of trust in the host
The test for a hosted Xserver was backwards in
commit 306c72cffbd8cd88e93871ee21fa85101198c1ac
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 24 14:02:23 2013 +0100
sna: Trust the preferred-depth returned by the host
so we failed to load the driver instead.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 3716345bf45bff785d0786774400eb47e1678caa
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 24 14:04:51 2013 +0100
sna: Don't restrict the frontbuffer to be scanout capable if hosted
Since we won't be binding it to a framebuffer, we don't care if it is
incompatible.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 306c72cffbd8cd88e93871ee21fa85101198c1ac
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 24 14:02:23 2013 +0100
sna: Trust the preferred-depth returned by the host
As we are not master and will not be binding the fb, it is irrelevant as
to whether our render buffer is actually bindable.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 7690346248fd8d3460cc07f018827ff55b85d19d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat Aug 24 14:00:34 2013 +0100
sna: Don't copy fbcon if hosted
When hosted, we have no idea what the right initial contents should be
as we are independent of the CRTC and so the existing fb is irrelevant.
Plus, not actually being master will cause the attempt to read back the
bound framebuffer to fail...
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 8b0d69e76c50155ea404f0e8a97d60a3f710c8a3
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Aug 23 18:53:34 2013 +0100
intel: Add experimental rendernode support
Render nodes allow clients full access to off-screen rendering and GPU
offload, without assuming any master responsiblities (for device and
display management). As they have a more limited interface, they can be
used in a more permissive manner.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 846436c1a26b2c8a9d787ec707edb075fac57ee0
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Aug 23 16:25:08 2013 +0100
sna/dri: Make async blits async again
Fixes the regression introduced in
commit 6f5fd772c7ca656b86394a0f036d4e0cf5b33d8e [2.21.13]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu Jul 25 08:29:55 2013 +0100
sna/dri: Discard the strict checking for stale bo before performing a blit
which added the sync request flag along the explicit async blit path.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit fc4e81726d03399bfbbba79d2e76556836f03bd2
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Aug 23 02:25:34 2013 +0100
sna/video: Disable the existing sprite when switching CRTCs
After starting a new video on another CRTC, disable the old one as we
currently only track the single video port. However, showing a video
split across multiple CRTCs would be a useful extension in the future.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
commit 509e7aaf8446f568e133e1b450ea13f73e9b366b
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Aug 23 02:10:11 2013 +0100
sna/gen7: Prefer the render ring for more operations
As we get more well-endowed GPUs with ever more execution units, it
becomes advantageous to do even basic copies through the render ring.
However, the extra performance comes at a cost - higher power usage. To
mitigate this, we apply a heuristic of only allowing a switch over to
the render ring if the render ring is already active with an early
request (in addition to the usual stall avoidance and general
performance heuristics).
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reply to: