sna: Include reflections when logging mode changes

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Tweak DBG messages for copying rotation

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Log mode switches on virtual outputs

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Keep @NOWARNFLAGS@ last

As the last option overrides the earlier options, make sure these
particular overrides always take effect by adding them last.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/trapezoids: trapezoids_bounds() reports not-empty, so use it

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Handle failure to disable old plane when switching CRTCs

If we fail to disable the old plane, abort the PutImage and report the
error.

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

uxa: fix order of inline Bool

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

uxa,legacy: use unsigned for comparition of unsigned

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

sna: Add missing va_end

Put va_end() into error paths

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

uxa: Avoid relying on an assert and cleanup iterator

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

Fix indentation for incorrectly shifted statements

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

uxa: rename some local variable to not shadow global ones

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

uxa: Ensure mask_picture is defined

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

Cast to use unsigned math

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

Correct type of uevent_handler

xf86AddGeneralHandler returns an opaque pointer, not a function pointer.

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Remove uneeded headers

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

config apostrophe

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

Makefile convert @var@ to $(var)

Avoid using @var@ since this could not be easily overwritten through
'make var=xxx' option which is normally available.
For Makefile.am users should avoid using @var@.

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

Revert "intel-virtual-output: Only track the most recent visibility status of the cursor"

This reverts commit abf1a16914d993cc150005879375d4bb17fdccf3.

We need to track visibility over all clones on a display, not just the
last.

Regression from
commit abf1a16914d993cc150005879375d4bb17fdccf3 [2.99.906]
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Nov 8 17:09:35 2013 +0000

    intel-virtual-output: Only track the most recent visibility status of the curso

Reported-by: Kirill Müller <mail@kirill-mueller.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71838
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

uxa,sna: Prevent bo exchange when pinned for non-DRI2 clients

With the advent of DRI3 (and previously with Prime and Glamor) we have
external clients who rely on the pixmap<->bo mapping being invariant.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Tidy up fallback from render composite to blt composite

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: XY_SETUP_* expects the dst tiling to be set on gen4+

A few paths failed to set the tiling flag when setting up the BLT
engine, leaving the engine in a potentially inconsistent state.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71260
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Fix typo in sna_blt_fill_begin()

Reported-by: intelgraphics7@gmx-topmail.de
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Set supported rotations on virtual outputs

As the virtual outputs are created later, they do not get automatically
populated with RR properties and we must do that instantiation
ourselves.

Reported-by: Kirill Müller <mail@kirill-mueller.de>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71846
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen7: Try to reduce flushes between primitive continuations

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Check for failure to create a clone

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Fix trivial and unlikely fd leak from bumblebee failure

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Fix use before assignment

mono.sna was being used the line before it was assigned.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Free composite boxes in the unlikely all-invalid path

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Correct check for overwriting last BLT fill

Typo crept in from the reloc rework.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen4+: Clear redirect bo before falling back to BLT paths

Just in case we later try to take action on the already freed
redirection.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

test: Fix compilation of render-trapezoid-image

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71768
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen7: Rework random GPU flushing

There seems to be no clear rationale for these flushes. They have been
empirically derived to pass test/render-copyarea and rendercheck,
without impacting upon a few simple benchmarks.

References: https://bugs.freedesktop.org/show_bug.cgi?id=68410
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Tell valgrind about the returned mode list

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Process Damage relative to dst->pDrawable not its pixmap->drawable

References: https://bugs.freedesktop.org/show_bug.cgi?id=32734
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

tests: Avoid dependence on undefined C

Right-shifting by a negative value is undefined.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/damage: Tidy up a tail return

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/damage: Guard against integer overflow before malloc

Check that the multiplication to compute the allocation will not
overflow.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Include valgrind leakchecks for --enable-debug=memory

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Add the missing braces around the conditional block

Fixes regression from
commit f3225fcb38686f3b9701725bf3a11ecf1c100c3f
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue Nov 5 08:38:22 2013 +0000

    sna: Be move conservative with tiling sizes for older fenced gen

Reported-by: Jay Little <jaylittle@jaylittle.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71605
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

tests: Exercise render copies under a mask

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen6+: Only substitute SRC for CLEAR if using the correct source

If the source has not been verified to be clear, then using the SRC
operator will paint the wrong color.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen6+: Improve debug PREFER_RENDER to cover all decision points

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

tests: Add render-composite-solid-mask

Another reference test to exercise simple composite pathways clearly.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Eliminate a compiler warning for a shadowed variable

sna_driver.c: In function 'sna_load_palette':
sna_driver.c:86:12: warning: declaration of 'index' shadows a global declaration [-Wshadow]

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Eliminate a compiler warning for a shadowed variable

We don't strictly need that local structure, so do without and keep the
compiler quiet.

sna_driver.c: In function 'fb_supports_depth':
sna_driver.c:414:23: warning: declaration of 'close' shadows a global declaration [-Wshadow]

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

2.99.906 snapshot

Bump experimental ioctl command numbers

In the meantime a new ioctl has snuck in.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Discard cached upload proxy when writing to the pixmap via the CPU

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Manually adjust screen size

When we modify the outputs and end up with a different screen size, we
need to actually tell the display to resize with an explicit
XRRSetScreenSize.

Reported-by: Jethro Beekman <freedesktop-bugs@jbeekman.nl>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71441
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Add identification strings for new Atoms

All of the new Atom (Baytrail) products ship with "HD Graphics".

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Factor available memory into available aperture estimation

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Apply drawable offset to glyph bbox prior to checking for clipping

This is a correction to

commit ec0866e86d365ae3fd9790b1b263d49fc4981220
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Wed Oct 16 22:39:54 2013 +0100

    sna/glyphs: Fix computation of extents for long strings

in order for us to correctly detect when we need to clip.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71191
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

xvmc: Handle allocation failure around batch submission

If we fail to allocate a new batch, just stall and reuse the old one
rather than crashing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Fix format specifiers for Visual DBG

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Fix cut'n'paste DBG error

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Assert that gc->funcs is never set to NULL

References: https://bugs.freedesktop.org/show_bug.cgi?id=71415
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Add a couple more asserts to track a potential NULL gc->pCompositeClip

References: https://bugs.freedesktop.org/show_bug.cgi?id=71415
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Avoid the infinite loop around XPending

XPending() reports if there are any events pending and does not perform
any dequeuing itself - ergo for a remote display while (XPending()) ;
becomes an infinite loop should there be an event pending.

References: https://bugs.freedesktop.org/show_bug.cgi?id=71345
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

configure: Use proper variables set by PKG_CHECK_MODULES

$DRI_CFLAGS does not actually exist. The PKG_CHECK_MODULES call creates
a $DRI1_CFLAGS variable instead. This doesn't break often because
"recent" versions of xorg-server.pc indirectly depend on xf86driproto.pc
thus bringing in the required CFLAGS through $XORG_CFLAGS.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=490342
Signed-off-by: Rémi Cardona <remi@gentoo.org>

intel-virtual-output: Do not hide the cursor on the local/source display

Whilst we want to take over and hide the cursor on the remote displays,
on the source we need to not interfere with the host.

Reported-by: Jethro Beekman <freedesktop-bugs@jbeekman.nl>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71439
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Assert that we do setup the gc->pCompositeClip upon ValidateGC

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

Merge branch 'master' of hsw:/usr/src/xf86-video-intel

intel-virtual-output: Only track the most recent visibility status of the cursor

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Fix forced synchronisation of clones

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Tighten bad_visual() checks

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Disable event tracking after a failure

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Add DBG for the latest XSync

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Perform an explicit sync

If we fail to track rendering using ShmCompletionEvents and begin to
drop frames, insert an explicit XSync.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Check for pending events before skipping draw

Make sure we check if the destination display has caught up before
skipping a frame.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

intel-virtual-output: Add some DBG for bad_visual()

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Always schedule upload buffers for retirement after use

Even if they are multiply referenced due to cached references.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Skip an unmappable linear bo when searching through a cache for a GTT mapping

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Only assert that the bo is small enough to be mmapped

Not that is currently in a position to be mapped without eviction.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna/gen7: Request secure batches for Haswell vsync

Since commit 8ff8eb2b38dc705f5c86f524c1cd74a811a7b04c
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Sep 9 16:23:04 2013 +0100

    sna/hsw: Scanline waits require both DERRMR and forcewake

we have been emitting LRI to enable vsync on the render ring. This
requires a privileged batch buffer, and whilst we were checking for
kernel support, we forgot to actually tell the kernel to submit the
batch with the right privileges.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71328
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Always copy from the tile source

The first step when tiling with an intermediatory is to copy from the
source bo to the temporary. The alu should only be applied when copying
from the temporary to the destination.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Remove erroneous assertion from sna_tiling_blt_composite

We have to rely on the caller only calling us for a PictOpSrc equivalent
operation as they don't all set op->op.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Add a DBG breadcrumb to kgem_bo_convert_to_gpu()

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Use tiling BLT fallback for BLT composite operations

This avoid a circuituous route through the render pathways and multiple
levels of tiling fallbacks to accomplish the same copy.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Trim create flags if tiled sizes are too large

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Fences are power-of-two sizes

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Fixup unwind checks for future BLT commands

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling

Another location, but the right function this time!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Move initialisation of loop counter to common code

It was only being defined in x86-64 and left unitialized for x86-32.

Fixes regression from
commit 587c4866652e40e1e228b333028114766a6d3b08
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Nov 4 15:10:40 2013 +0000

    sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71286
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Clear the execlist if we completely unwind a batch after using 8x8 tiling

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Be more pessimistic for tiling sizes on older gen

On the older generation, we have severe alignment penalties for fenced
regions which dramatically reduce the amount of space we can effectively
use in a batch. To accommodate this, reduce the tiling step size.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Only operate inplace if no existing CPU damage for a read

With a large object, we try harder to operate inplace (to avoid creating
a second large CPU bo). This introduced an issue where we tried to read
from the GPU bo when there was already existing damage in the CPU -
triggering an assertion.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Trim the overestimate of required aperture space for fence alignment

We can optimistically only require that we waste the largest fence
region in a batch, as all other fences will then be naturally aligned as
well. So long as the kernel succeeds in defragmenting the aperture...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Mark partial move_area_to_gpu with MOVE_READ on promotion to move_to_gpu

When promoting a partial move_area_to_gpu to a full move_to_gpu, we have
to disable certain optimisations that we try to use if MOVE_READ==0.

Reported-and-tested-by: Matti Hamalainen <ccr@tnsp.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71198
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Submit execution on the bo before changing its caching status

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Clear snoop flag after converting from a CPU bo

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Use an inplace exchange for large untiled BO

On older architectures, large BO have to be untiled and so we can reuse
an existing CPU bo by adjusting its caching mode.

References: https://bugs.freedesktop.org/show_bug.cgi?id=70924
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Be move conservative with tiling sizes for older fenced gen

The older generations have stricter requirements for alignment of fenced
GPU surfaces, so accommodate this by reducing our estimate available
space for the temporary tile.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

test

sna: Check for loss of state after setting up a fill BLT op

If we install a BLT fill operation early in the drawing sequence (i.e.
before calling a mi routine), we may lose our state to delayed
initialisation of sources and so need to subsequently recheck.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: s/active/busy/ to silence compiler warning

kgem.c: In function 'kgem_check_bo':
kgem.c:4768:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]
kgem.c: In function 'kgem_check_many_bo_fenced':
kgem.c:4907:7: warning: declaration of 'active' shadows a global declaration [-Wshadow]
kgem.c:692:21: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor

Reported-by: Conley Moorhous <conleymoorhous@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70527
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Apply the BLT source offset for individual copies

Following a complex path through multiple layers of indirections and
tiling fallbacks, resulted in hitting a path where the source offset was
subsequently ignored. This leads to the operation reading from invalid
memory (or hitting the assert warning about the same).

References: https://bugs.freedesktop.org/show_bug.cgi?id=70924
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Only use the simple stipple upload path if wholly contained

If the stipple box is outside of the stipple pixmap, we need to
carefully upload the stipple using the modulus operation.

Buzilla: https://bugs.launchpad.net/bugs/1247785
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

sna: Update DBG formats for larger BO offset integers

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>