Commit Graph

9083 Commits

Author SHA1 Message Date
Chris Wilson ca71199679 sna: Harden batch allocation against resource starvation
If the batch allocation fails, retire the oldest request and try again.

References: https://bugs.freedesktop.org/show_bug.cgi?id=91577
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-08-07 10:48:20 +01:00
Chris Wilson 8c465d0fbf sna: Fallback after a bo allocation failure for the batch
If we fail to allocate the next bo to use for the next_request, we can
just fallback to the delayed allocation used by !llc.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91577
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-08-07 10:16:56 +01:00
Chris Wilson 69d8edc111 sna: Handle batch allocation failure
Whilst we currently do not try and submit a failed batch buffer
allocation, we still treat it as a valid request. This explodes much
later when we inspect the NULL rq->bo.

References: https://bugs.freedesktop.org/show_bug.cgi?id=91577
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-08-07 10:08:17 +01:00
Chris Wilson bc063c9f4a sna: Undo a CRTC flip that results in a pageflip failure
If the pageflip following the CRTC fixup fails, we can be left with the
flip-to bo being left as the CRTC scanout. If that is so, reset the
desired mode (and original scanout bo).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-31 17:17:26 +01:00
Chris Wilson 9451976a5b sna: Assert that flip handler/data exists before invoking
Just an explanatory assert in case we ever jump off into a NULL function
pointer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-31 17:14:12 +01:00
Chris Wilson 6a2dcb388e intel: Refactor i915.ko loading support
Different OS name the i915 KMS module differently, so make it convenient
for us to be able to feed in the right name, or even just try them all
and pick the first one that exists!

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-31 10:47:24 +01:00
Chris Wilson 4246c63347 sna: Fix off by one in constructing XCopyPlane on bdw
Broadwell expanded all the relocations and we needed to adjust our
command construction to match. I missed offsetting the XY_SRC_COPY_IMM
used for XCopyPlane resulting in garbage for small copies on Broadwell.

Reported-by: Omar Sandoval
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91499
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-29 09:45:50 +01:00
Chris Wilson 66e16d97ee test: Exercise copyplane
Reported-by: Omar Sandoval
References: https://bugs.freedesktop.org/show_bug.cgi?id=91499
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-29 09:45:47 +01:00
Chris Wilson 4f0a58c9db sna: Batch process hotplug events
Read all available HOTPLUG uevents and batch them into a single topology
probe. Like waiting for a bus, when one hotplug uevent arrives expect a
few more.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-28 13:51:49 +01:00
Chris Wilson 6be2bea5f0 sna: Double check for Present takeover before TearFree flips
References: https://bugs.freedesktop.org/show_bug.cgi?id=91467#c17
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 19:58:53 +01:00
Chris Wilson d11dc75fb5 sna: Only check non-NULL Pixmaps
check_pixmap() can be called very early in the Window setup proceeding,
before a pixmap is even assigned to a Window. There we expect the Window
to be NULL, so be more careful in our check_pixmap.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91467#c16
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 19:08:39 +01:00
Chris Wilson e5f8f90f68 sna: Stall for outstanding TearFree flips when taking over with Present
When juggling Present and TearFree, we have to hide the extra flips from
Present as it cannot account for them. Preferrably we want to schedule
the Present flip following completion of the TearFree flip, but for the
moment simply block and wait until TearFree completes before starting
Present.

Reported-by: Andreas Reis <andreas.reis@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91467
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 19:03:46 +01:00
Chris Wilson 7e5e006be4 sna: Add a few more DBG and assertions around Present/TearFree interactions
References: https://bugs.freedesktop.org/show_bug.cgi?id=91467#c12
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 18:41:03 +01:00
Chris Wilson 50f3e9c41c sna: Add a small pixmap sanity check
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 18:22:16 +01:00
Chris Wilson f7cb248169 sna: Add a some DBG info to Window creation/destruction
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 17:45:30 +01:00
Chris Wilson c7d0acf785 sna: Add a DBG trace to reusing pixmap headers
References: https://bugs.freedesktop.org/show_bug.cgi?id=91467#c9
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-26 16:46:22 +01:00
Chris Wilson bff0272b4f sna: Put the assert(!kgem->can_fence) back to where they were
Still need to improve the handling of set_gpu_tiling() to mark up the
unfenceable buffers better, but we can't more the asserts here as we
don't have the kgem struct available.

Fixes 2f1623daed94b98d3bae3c9ee8346e8de9afc33d with asserts enabled

Reported-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-25 11:54:04 +01:00
Chris Wilson 8090a65e2d sna: Only reset the bo->needs_flush flag if the buffer is busy-write
Since the kernel now differentiates whether the buffer is busy for
read/write, we can use that knowledge to better set our own
bo->needs_flush flag only when there are outstanding writes to the
buffer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-24 12:16:02 +01:00
Chris Wilson 4cc2fb8fbf sna: Add logging for set-tiling failure
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-24 11:39:53 +01:00
Chris Wilson f252dba9da sna: Use DBG_NO_TILING to disable all fencing
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-24 11:34:25 +01:00
Chris Wilson ad20fd401b sna: Ensure that DRI2 buffers are created with a fence
We use the fence as a backchannel to commuicated the tiling mode to the
DRI2 client, so in such cases we cannot tolerate a failure to set the
tiling mode.

References: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c114
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-24 11:30:46 +01:00
Chris Wilson 2050d03f52 Start splitting out the benchmarks from test/
First comes the swap overhead measurement for various window modes.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-23 14:51:02 +01:00
Chris Wilson a29e765ec0 sna: Fix the last character before a colon in the fake-edid paths
I chopped off one too many characters when creating the path in the
presence of a colon-delimited list.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-22 11:34:51 +01:00
Chris Wilson 8d9e496670 sna/dri2: Take over the placeholder vblank
If we are doing synchronous but immediate swaps, we may notice that we
have a vblank placeholder from the last swap. If so, we can replace it
with the swap we need to perform on the next vblank.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-22 11:27:29 +01:00
Chris Wilson 7301516b63 tools/cursor: Error on malloc failure
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-21 14:09:01 +01:00
Chris Wilson 18b947b999 sna: Abort output construction on allocation failure
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-21 14:05:40 +01:00
Chris Wilson 6742fea212 sna: Terminate the fake-edid path correctly
An off-by-one on the NUL terminator placed it after the path string.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-21 13:52:23 +01:00
Chris Wilson 2cd7cb9e93 sna: Allow user override of EDID for an output
As a slightly more convenient approach than loading the EDID on the
kernel command line, allow the user to specify the EDID path in the
Device section of xorg.conf, e.g.

Section "Device"
	Identifier "igfx"
	Option "CustomEDID" "DP1:/path/to/dp1.edid,DP2:/path/to/dp2.edid"
EndSection

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89945
2015-07-18 12:07:48 +01:00
Chris Wilson 5772556417 sna/dri2: Fix vblank keepalive signalling
When emitting the keepalive, it helps to actually request the signal
from the kernel.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-17 08:51:09 +01:00
Chris Wilson 6d38029728 sna: Block cursor signals during modeset
Modesetting can be slow, and we certainly don't want to have to keep
restarting it due to an interrupt from an invisible cursor.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-16 14:31:50 +01:00
Chris Wilson 6f4a143032 sna: Stop trying to CPU mmap a prime object after failure
If we fail to CPU mmap an object, mark it as inaccessible and never try
again. The likely scenario is that is it a PRIME object not backed by
our shmemfs storage and so unmappable.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-16 10:33:03 +01:00
Chris Wilson b549b4fd38 sna: Add a DBG option to control native rotations for testing
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-16 10:16:07 +01:00
Martin Peres 2c5063938c uxa: fix the call to PixmapSyncDirtyHelper, broken by xserver's 90db5ed
[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie]
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
2015-07-10 10:24:16 +01:00
Chris Wilson 15d8b06d54 sna: Prevent a crash from an invalid EDID read
Suppose that the kernel reported a truncated EDID, we will eventually
crash by trying to access invalid memory. Prevent the crash by fixing up
the EDID header to fit the size read from the kernel (though we don't
fixup the checksum, so strict conformance tests will still complain, but
we won't crash.)

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-07-10 10:22:02 +01:00
Chris Wilson e5c6e48cc9 sna/dri2: Discard backbuffer cache on Window resize
After the Window resizes, we should never hand back a buffer of the old
size or else we end up rendering garbage - with the possibilty of GPU
hangs or memory corruption.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91036
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-28 18:25:37 +01:00
Chris Wilson 41f401ae27 sna/dri2: Early return for empty DRI2CopyRegion
It's possible if the Window is redirected whilst the client render for
its backbuffer to no longer overlap with the visible Window. In this
case, we attempt to copy an empty region, but it debugging is enabled
this throws an assert.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91120
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-27 20:24:45 +01:00
Chris Wilson 6fc7b16b93 sna/dri2: Remove overzealous assertion
sna_dri2_xchg() is also called on the flip path to do an immediate swap
of a hidden buffer, in which case can_xchg() returns false as it
believes that the swap requires a flip.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c109
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-25 17:08:59 +01:00
Chris Wilson f97c6ba9dc sna/dri2: Track original allocated size for copies
When we record the next scanout for display after the following vblank,
note the size of the allocation as well as its name and bo et al.

References: https://bugs.freedesktop.org/show_bug.cgi?id=70461#c105
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-25 11:47:25 +01:00
Chris Wilson 990499c6d9 sna/gen3: Allow gen3 to use smaller vbo if already available in cache
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-24 14:37:53 +01:00
Chris Wilson f414ed4e40 sna: Fix misspelling of "caching"
Apply s/cacheing/caching/ because I am alone in my belief of how to
spell cacheing correctly :)

Suggested-by: Sedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-24 11:02:28 +01:00
Chris Wilson 2d263ff7e6 sna/gen4: Fix larger than 3D pipeline fills
If we need to handle a FillRectangles request that is larger than the 3D
pipeline can handle, we need to split that operation up into smaller
chunks. This is achieved by redirecting the rendering through a view of
the surface (offset so that coordinates are within range), or else we
have to fallback to creating temporary surfaces.

If we fail to do so, we should hit an assertion that the render target
fits within the 3D pipeline inside gen4_emit_drawing_rectangle()

Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-24 10:21:20 +01:00
Chris Wilson 293450a23d sna/dri2: Rearrange proxy tracking for single-CRTC flipping
Looks like amalgamating the per-CRTC xchg with the blit caused a few
regressions with TearFree single monitor flipping.

References: https://bugs.freedesktop.org/show_bug.cgi?id=91066
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-23 17:55:23 +01:00
Chris Wilson ac2aee9f5a sna/dri2: Rearrange assert to avoid false-positive
One assert(active_scanout) was firing when feed in an old flip bo, which
in hindsight was quite expected.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-22 14:36:35 +01:00
Chris Wilson 87b5ca2c3e sna/dri2: Stop leaking the cache entry when unable to reuse the old backbuffer
If we cannot cache the current backbuffer, due to either it not fitting
or because a reference to it still exists, delete the cache entry we
were holding for it - or else we slowly leak the cache list and
gradually get slower and slower walking along the growing chain.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-19 16:01:38 +01:00
Chris Wilson fa1b405898 sna/dri2: Add a bit of paranoia required for a wedged GPU
We can fail to submit the batch if the GPU is wedged (or the driver
upset), in which case the bo will be NULL and we should not blindly
dereference it.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-19 15:31:44 +01:00
Chris Wilson b24e7581bd backlight: Factor known names into preferred interfaces
Since the /sys/device/backlight never turned up we face an issue with
disambiguating the backlight on multi-GPU devices. Both intel_backlight
and nv_backlight are presented are raw interfaces, and on modern systems
the ACPI interface is defunct, so we need a way to distinguish them. So,
we fallback to our priority table of known interfaces and rank them
accordingly, first by class (platform, native, raw) and then by priority.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-17 17:58:28 +01:00
Chris Wilson f1f2e72028 sna/dri2: Handle intermixing of exchanges and blits
Since there were two paths performing similar tasks for swapping a
windowed buffer, they would get easily confused and queue themselves in
conflict with each other as they behaved slightly differently wrt to rapid
swaps. Almagamate the two paths such that the behaviour is the same -
with the complication being in tracking the spare active buffer.

Fixes (some at least!) flickering from
commit 72d208a7f2
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Mar 5 12:26:15 2015 +0000

    sna/dri2: Perform swap elision on windows for swap-interval==0

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-16 17:11:49 +01:00
Chris Wilson 7d9a74622e sna: Be robust in handling DPMS failures
If we fail to turn off an output via DPMS, disable the entire CRTC in
order to blank the output and save the screeen/power.

Reported-by: Lukas Hejtmanek  <xhejtman@fi.muni.cz>
References: https://bugs.freedesktop.org/show_bug.cgi?id=90179
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-15 14:16:34 +01:00
Chris Wilson 670d05f438 sna/dri2: Destroy the right bo
Fixes copy'n'paste error in

commit d46c793663
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Fri Jun 12 13:50:35 2015 +0100

    sna/dri2: Remove the active_scanout flag when deleting the event

Reported-by: Andreas Reis <andreas.reis@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90968#c8
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-13 18:43:57 +01:00
Chris Wilson ed7bcae0ab sna/dri2: SWAP_THROTTLE is also used for a delayed SWAP
If there is already a pending operation on the drawable, the swap is
queued. It is queued with SWAP_THROTTLE which classes with the
vblank_mode=0 chaining, so the choice is to either review all other uses
of SWAP_THROTTLE and duplicate the chain swap handling, or to choose when
use to the alternate copy or back buffer. This patch opts for the
latter.

Fixes regression from
commit dcb4d323ca
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Thu Jun 11 13:54:49 2015 +0100

    sna/dri2: Mark the pending backbuffer copy as active

Reported-by: Christoph Haag <haagch@frickel.club>
Reported-by: Andreas Reis <andreas.reis@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90968
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
2015-06-13 13:19:40 +01:00