summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-15destroygc whitespaceHEADmasterEric Anholt1-4/+4
With this squashed in, it's: Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-15uxa: use glamor_destroy_gc when availableKeith Packard1-7/+20
Signed-off-by: Keith Packard <keithp@keithp.com>
2014-06-15uxa: Move non-glamor code past the glamor check in uxa_get_imageKeith Packard1-7/+7
Having these statements above the glamor check makes it hard to tell that glamor is being called with unmodified parameters. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-15fix up style for copywindow.Eric Anholt1-9/+9
With this squashed in, it's: Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-15uxa: use glamor_copy_window when running glamorKeith Packard1-1/+13
Don't use the uxa code in this case; it's slower. Signed-off-by: Keith Packard <keithp@keithp.com>
2014-06-15uxa: Clean up compiler warningsKeith Packard2-2/+2
These are some pretty simple compiler warning fixes. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-15Fix up style for the text changes.Eric Anholt1-22/+22
With this squashed in, Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-15uxa: Use glamor text when availableKeith Packard1-0/+69
Newer glamor offers core text routes as well as glyphblt ones. Use the text functions when available. Signed-off-by: Keith Packard <keithp@keithp.com>
2014-06-15Update for glamor in the 1.16 server.Eric Anholt1-0/+8
v2: Rebase on master, add missing return value.
2014-06-15legacy/i810: Eliminate a shadow declaration warningKeith Packard1-2/+2
Rename 'dp' as '_dp' to avoid a warning from the compiler. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Eric Anholt <eric@anholt.net>
2014-06-14sna: Fix assertions for discarding upload cachesChris Wilson1-7/+7
The upload caches are special, along with having a bo->proxy, they also claim to be completely damaged on both the GPU and CPU. Allow that to pass through when discarding the proxy. Reported-by: Nick Bowler <nbowler@draconx.ca> Bugzilla; https://bugs.freedesktop.org/show_bug.cgi?id=79992 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Use the right is-clipped hintChris Wilson1-9/+8
The region here has yet to be clipped, and so the only valid is-clipped hint is from the flags computed from the PolyRect extents. Make sure we use those when determining whether it is valid to discard damage. Fixes regression from commit ad0390068832ad4727371902fe41a85a53de1894 [2.99.903] Author: Chris Wilson <chris@chris-wilson.co.uk> Date: Tue Sep 24 10:00:03 2013 +0100 sna: Separate out copy preferrence from operating in place decision Reported-by: Nick Bowler <nbowler@draconx.ca> Tested-by: Nick Bowler <nbowler@draconx.ca> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79992 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Only discard the CPU bo if we have a GPU bo to transfer the damage toChris Wilson1-1/+2
References: https://bugs.freedesktop.org/show_bug.cgi?id=79992 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel-virtual-output: Compile fixesChris Wilson1-2/+3
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel-virtual-output: Disable outputs on remote displays upon shutdownChris Wilson1-1/+21
References: https://bugs.freedesktop.org/show_bug.cgi?id=79994 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel-virtual-output: Initialise image after cloneChris Wilson1-2/+2
As the image inherits its width/height from the clone, we need to set those first on the clone. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79994 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel-virtual-output: Only call XShmDetach on a valid SHM segmentChris Wilson1-5/+5
Saves a couple of extraneous XErrors. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel-virtual-output: Check for an error creating the DRI3 fdChris Wilson1-0/+19
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79994 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Refine decision whether to use the GPU or render inplaceChris Wilson3-9/+28
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Track the pageflip bo's busynessChris Wilson4-5/+25
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13intel: Check that the fd points to i915 after authorisingChris Wilson1-2/+2
The call to GETPARAM requires either a rendernode or authorisation. Therefore we can only assert that the fd is a valid i915 handle after authorise() and not before. Reported-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna/gen6+: Prefer the BLT for large overlapping copiesChris Wilson3-9/+15
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Try to reuse the current cursor if we fail to updateChris Wilson1-2/+4
As a last resort, continue to display the old cursor if we tried and failed to create a new cursor. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13xvmc: Refactor mutex lockingChris Wilson2-44/+18
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13xvmc: Sanitize compile and library flagsChris Wilson2-6/+3
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13configure: Fix DRI2 buildChris Wilson1-1/+1
One s/DRI2/have_dri2/ too far. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna: Reorder ignore_cpu_damage() to avoid assertsChris Wilson2-9/+16
Tricksy asserts making sure that the correct arguments are passed around! Reported-by: Arkadiusz Miskiewicz <arekm@maven.pl Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna/gen8: Allow reads from scanout to be cachedChris Wilson1-1/+1
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13sna/gen8: Check for WT support before attempting to use the WT mocsChris Wilson2-2/+2
It appears the kernel has a better idea when WT is supported on which gen8 parts. I assumed it was always supported, but experience suggests otherwise, so only use WT support when advertised. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79967 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-13configure: Allow manual disabling of each DRI levelChris Wilson1-31/+52
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-12sna: Try to use CPU uploads before BLT uploadsChris Wilson1-153/+253
As the BLT upload implies a sync (and a likely GPU boost), only do so if we cannot do an immediate upload with the CPU, either directly to backing memory or through the GTT. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-12sna: Refactor USE_INPLACE debug macroChris Wilson1-4/+5
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna/gen8: Clear a couple more push constantsChris Wilson1-7/+21
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Remove bogus assertionChris Wilson1-1/+0
The sna_pixmap is cleared afterwards, it does not need to be clear on free. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Fix direction flags for memmoveChris Wilson1-9/+8
Under a compositor, the current deltas may invert the sense of the copy direction, causing scrolling corruption. Simplify handling those flags by making them invariant for the function. Reported-by: Bruno Prémont <bonbons@linux-vserver.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79843 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Use the pixmap header creation routineChris Wilson1-21/+11
A few more places could use the common pixmap creator, just remember to handle the SHMPixmap complication! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna/gen6+: On small GT avoid the intermediate copy for overlapsChris Wilson1-0/+3
If the memory bw is constrained on the GPU avoid doing the 2-pass copy for overlaps on the render ring, and do the single pass slower BLT copy instead - as since it has to transfer less data it will be faster. Reported-by: Ildar Nurislamov <absorbb@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77436 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna/gen6+: Overlapping bo by definition have compatible depthsChris Wilson3-3/+0
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: First copy to overlap temporary must be using GXcopyChris Wilson1-1/+1
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Remove debugging hunkChris Wilson1-1/+0
Stray hunk in self-copy boxes. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Update damage pointer after the implicit reductionChris Wilson4-36/+45
sna_damage_contains_box() routine implicitly reduces the damage before performing its check. This may alter and even destroy the damage entry, so pass in the handle so that it can be updated correctly. References: https://bugs.freedesktop.org/show_bug.cgi?id=77436 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Fix scanout creation routine for old kernels <= 3.11Chris Wilson1-11/+16
With an old kernel, we would fail to actually mark the display as part of the scanout domain, but proceed to assign it a fb id. This caused our asserts to report our bookkeeping error. Reported-by: Pavel Ondračka <pavel.ondracka@email.cz> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79909 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Add some DBG to the memmove pathChris Wilson1-5/+10
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Tweak self-copy boxes to hit the GPU more oftenChris Wilson1-3/+6
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Recheck source bo after migrating dst (in case of src == dst)Chris Wilson1-2/+7
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Skip redundant clearsChris Wilson1-0/+20
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna/glyphs: Always print some DBG when performing fallbackChris Wilson1-4/+4
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Add some asserts to track redundant damage operationsChris Wilson2-0/+12
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna/gen8: Check offset alignment before using a userptr for RENDERChris Wilson1-11/+64
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79053 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2014-06-11sna: Support efficient cursor updates for old machinesChris Wilson1-1/+14
Given a kernel patch to fix coherency of physical objects, we can use a more efficient method for updating cursors. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>