2014-07-25 00:04:10 +08:00
|
|
|
/*
|
|
|
|
* Copyright © 2014 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Ben Widawsky <ben@bwidawsk.net>
|
|
|
|
* Michel Thierry <michel.thierry@intel.com>
|
|
|
|
* Thomas Daniel <thomas.daniel@intel.com>
|
|
|
|
* Oscar Mateo <oscar.mateo@intel.com>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2014-07-25 00:04:48 +08:00
|
|
|
/**
|
|
|
|
* DOC: Logical Rings, Logical Ring Contexts and Execlists
|
|
|
|
*
|
|
|
|
* Motivation:
|
2014-07-25 00:04:10 +08:00
|
|
|
* GEN8 brings an expansion of the HW contexts: "Logical Ring Contexts".
|
|
|
|
* These expanded contexts enable a number of new abilities, especially
|
|
|
|
* "Execlists" (also implemented in this file).
|
|
|
|
*
|
2014-07-25 00:04:48 +08:00
|
|
|
* One of the main differences with the legacy HW contexts is that logical
|
|
|
|
* ring contexts incorporate many more things to the context's state, like
|
|
|
|
* PDPs or ringbuffer control registers:
|
|
|
|
*
|
|
|
|
* The reason why PDPs are included in the context is straightforward: as
|
|
|
|
* PPGTTs (per-process GTTs) are actually per-context, having the PDPs
|
|
|
|
* contained there mean you don't need to do a ppgtt->switch_mm yourself,
|
|
|
|
* instead, the GPU will do it for you on the context switch.
|
|
|
|
*
|
|
|
|
* But, what about the ringbuffer control registers (head, tail, etc..)?
|
|
|
|
* shouldn't we just need a set of those per engine command streamer? This is
|
|
|
|
* where the name "Logical Rings" starts to make sense: by virtualizing the
|
|
|
|
* rings, the engine cs shifts to a new "ring buffer" with every context
|
|
|
|
* switch. When you want to submit a workload to the GPU you: A) choose your
|
|
|
|
* context, B) find its appropriate virtualized ring, C) write commands to it
|
|
|
|
* and then, finally, D) tell the GPU to switch to that context.
|
|
|
|
*
|
|
|
|
* Instead of the legacy MI_SET_CONTEXT, the way you tell the GPU to switch
|
|
|
|
* to a contexts is via a context execution list, ergo "Execlists".
|
|
|
|
*
|
|
|
|
* LRC implementation:
|
|
|
|
* Regarding the creation of contexts, we have:
|
|
|
|
*
|
|
|
|
* - One global default context.
|
|
|
|
* - One local default context for each opened fd.
|
|
|
|
* - One local extra context for each context create ioctl call.
|
|
|
|
*
|
|
|
|
* Now that ringbuffers belong per-context (and not per-engine, like before)
|
|
|
|
* and that contexts are uniquely tied to a given engine (and not reusable,
|
|
|
|
* like before) we need:
|
|
|
|
*
|
|
|
|
* - One ringbuffer per-engine inside each context.
|
|
|
|
* - One backing object per-engine inside each context.
|
|
|
|
*
|
|
|
|
* The global default context starts its life with these new objects fully
|
|
|
|
* allocated and populated. The local default context for each opened fd is
|
|
|
|
* more complex, because we don't know at creation time which engine is going
|
|
|
|
* to use them. To handle this, we have implemented a deferred creation of LR
|
|
|
|
* contexts:
|
|
|
|
*
|
|
|
|
* The local context starts its life as a hollow or blank holder, that only
|
|
|
|
* gets populated for a given engine once we receive an execbuffer. If later
|
|
|
|
* on we receive another execbuffer ioctl for the same context but a different
|
|
|
|
* engine, we allocate/populate a new ringbuffer and context backing object and
|
|
|
|
* so on.
|
|
|
|
*
|
|
|
|
* Finally, regarding local contexts created using the ioctl call: as they are
|
|
|
|
* only allowed with the render ring, we can allocate & populate them right
|
|
|
|
* away (no need to defer anything, at least for now).
|
|
|
|
*
|
|
|
|
* Execlists implementation:
|
2014-07-25 00:04:10 +08:00
|
|
|
* Execlists are the new method by which, on gen8+ hardware, workloads are
|
|
|
|
* submitted for execution (as opposed to the legacy, ringbuffer-based, method).
|
2014-07-25 00:04:48 +08:00
|
|
|
* This method works as follows:
|
|
|
|
*
|
|
|
|
* When a request is committed, its commands (the BB start and any leading or
|
|
|
|
* trailing commands, like the seqno breadcrumbs) are placed in the ringbuffer
|
|
|
|
* for the appropriate context. The tail pointer in the hardware context is not
|
|
|
|
* updated at this time, but instead, kept by the driver in the ringbuffer
|
|
|
|
* structure. A structure representing this request is added to a request queue
|
|
|
|
* for the appropriate engine: this structure contains a copy of the context's
|
|
|
|
* tail after the request was written to the ring buffer and a pointer to the
|
|
|
|
* context itself.
|
|
|
|
*
|
|
|
|
* If the engine's request queue was empty before the request was added, the
|
|
|
|
* queue is processed immediately. Otherwise the queue will be processed during
|
|
|
|
* a context switch interrupt. In any case, elements on the queue will get sent
|
|
|
|
* (in pairs) to the GPU's ExecLists Submit Port (ELSP, for short) with a
|
|
|
|
* globally unique 20-bits submission ID.
|
|
|
|
*
|
|
|
|
* When execution of a request completes, the GPU updates the context status
|
|
|
|
* buffer with a context complete event and generates a context switch interrupt.
|
|
|
|
* During the interrupt handling, the driver examines the events in the buffer:
|
|
|
|
* for each context complete event, if the announced ID matches that on the head
|
|
|
|
* of the request queue, then that request is retired and removed from the queue.
|
|
|
|
*
|
|
|
|
* After processing, if any requests were retired and the queue is not empty
|
|
|
|
* then a new execution list can be submitted. The two requests at the front of
|
|
|
|
* the queue are next to be submitted but since a context may not occur twice in
|
|
|
|
* an execution list, if subsequent requests have the same ID as the first then
|
|
|
|
* the two requests must be combined. This is done simply by discarding requests
|
|
|
|
* at the head of the queue until either only one requests is left (in which case
|
|
|
|
* we use a NULL second context) or the first two requests have unique IDs.
|
|
|
|
*
|
|
|
|
* By always executing the first two requests in the queue the driver ensures
|
|
|
|
* that the GPU is kept as busy as possible. In the case where a single context
|
|
|
|
* completes but a second context is still executing, the request for this second
|
|
|
|
* context will be at the head of the queue when we remove the first one. This
|
|
|
|
* request will then be resubmitted along with a new request for a different context,
|
|
|
|
* which will cause the hardware to continue executing the second request and queue
|
|
|
|
* the new request (the GPU detects the condition of a context getting preempted
|
|
|
|
* with the same context and optimizes the context switch flow by not doing
|
|
|
|
* preemption, but just sampling the new tail pointer).
|
|
|
|
*
|
2014-07-25 00:04:10 +08:00
|
|
|
*/
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
#include <linux/interrupt.h>
|
2014-07-25 00:04:10 +08:00
|
|
|
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include <drm/i915_drm.h>
|
|
|
|
#include "i915_drv.h"
|
2015-07-11 01:13:11 +08:00
|
|
|
#include "intel_mocs.h"
|
2014-07-25 00:04:11 +08:00
|
|
|
|
2014-11-14 01:51:49 +08:00
|
|
|
#define GEN9_LR_CONTEXT_RENDER_SIZE (22 * PAGE_SIZE)
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
#define GEN8_LR_CONTEXT_RENDER_SIZE (20 * PAGE_SIZE)
|
|
|
|
#define GEN8_LR_CONTEXT_OTHER_SIZE (2 * PAGE_SIZE)
|
|
|
|
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
#define RING_EXECLIST_QFULL (1 << 0x2)
|
|
|
|
#define RING_EXECLIST1_VALID (1 << 0x3)
|
|
|
|
#define RING_EXECLIST0_VALID (1 << 0x4)
|
|
|
|
#define RING_EXECLIST_ACTIVE_STATUS (3 << 0xE)
|
|
|
|
#define RING_EXECLIST1_ACTIVE (1 << 0x11)
|
|
|
|
#define RING_EXECLIST0_ACTIVE (1 << 0x12)
|
|
|
|
|
|
|
|
#define GEN8_CTX_STATUS_IDLE_ACTIVE (1 << 0)
|
|
|
|
#define GEN8_CTX_STATUS_PREEMPTED (1 << 1)
|
|
|
|
#define GEN8_CTX_STATUS_ELEMENT_SWITCH (1 << 2)
|
|
|
|
#define GEN8_CTX_STATUS_ACTIVE_IDLE (1 << 3)
|
|
|
|
#define GEN8_CTX_STATUS_COMPLETE (1 << 4)
|
|
|
|
#define GEN8_CTX_STATUS_LITE_RESTORE (1 << 15)
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
|
|
|
|
#define CTX_LRI_HEADER_0 0x01
|
|
|
|
#define CTX_CONTEXT_CONTROL 0x02
|
|
|
|
#define CTX_RING_HEAD 0x04
|
|
|
|
#define CTX_RING_TAIL 0x06
|
|
|
|
#define CTX_RING_BUFFER_START 0x08
|
|
|
|
#define CTX_RING_BUFFER_CONTROL 0x0a
|
|
|
|
#define CTX_BB_HEAD_U 0x0c
|
|
|
|
#define CTX_BB_HEAD_L 0x0e
|
|
|
|
#define CTX_BB_STATE 0x10
|
|
|
|
#define CTX_SECOND_BB_HEAD_U 0x12
|
|
|
|
#define CTX_SECOND_BB_HEAD_L 0x14
|
|
|
|
#define CTX_SECOND_BB_STATE 0x16
|
|
|
|
#define CTX_BB_PER_CTX_PTR 0x18
|
|
|
|
#define CTX_RCS_INDIRECT_CTX 0x1a
|
|
|
|
#define CTX_RCS_INDIRECT_CTX_OFFSET 0x1c
|
|
|
|
#define CTX_LRI_HEADER_1 0x21
|
|
|
|
#define CTX_CTX_TIMESTAMP 0x22
|
|
|
|
#define CTX_PDP3_UDW 0x24
|
|
|
|
#define CTX_PDP3_LDW 0x26
|
|
|
|
#define CTX_PDP2_UDW 0x28
|
|
|
|
#define CTX_PDP2_LDW 0x2a
|
|
|
|
#define CTX_PDP1_UDW 0x2c
|
|
|
|
#define CTX_PDP1_LDW 0x2e
|
|
|
|
#define CTX_PDP0_UDW 0x30
|
|
|
|
#define CTX_PDP0_LDW 0x32
|
|
|
|
#define CTX_LRI_HEADER_2 0x41
|
|
|
|
#define CTX_R_PWR_CLK_STATE 0x42
|
|
|
|
#define CTX_GPGPU_CSR_BASE_ADDRESS 0x44
|
|
|
|
|
2014-07-25 00:04:36 +08:00
|
|
|
#define GEN8_CTX_VALID (1<<0)
|
|
|
|
#define GEN8_CTX_FORCE_PD_RESTORE (1<<1)
|
|
|
|
#define GEN8_CTX_FORCE_RESTORE (1<<2)
|
|
|
|
#define GEN8_CTX_L3LLC_COHERENT (1<<5)
|
|
|
|
#define GEN8_CTX_PRIVILEGE (1<<8)
|
2015-04-08 19:13:32 +08:00
|
|
|
|
2015-11-05 05:20:11 +08:00
|
|
|
#define ASSIGN_CTX_REG(reg_state, pos, reg, val) do { \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 21:33:26 +08:00
|
|
|
(reg_state)[(pos)+0] = i915_mmio_reg_offset(reg); \
|
2015-11-05 05:20:11 +08:00
|
|
|
(reg_state)[(pos)+1] = (val); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define ASSIGN_CTX_PDP(ppgtt, reg_state, n) do { \
|
2015-06-25 23:35:06 +08:00
|
|
|
const u64 _addr = i915_page_dir_dma_addr((ppgtt), (n)); \
|
2015-04-08 19:13:32 +08:00
|
|
|
reg_state[CTX_PDP ## n ## _UDW+1] = upper_32_bits(_addr); \
|
|
|
|
reg_state[CTX_PDP ## n ## _LDW+1] = lower_32_bits(_addr); \
|
2015-11-05 05:20:09 +08:00
|
|
|
} while (0)
|
2015-04-08 19:13:32 +08:00
|
|
|
|
2015-11-05 05:20:09 +08:00
|
|
|
#define ASSIGN_CTX_PML4(ppgtt, reg_state) do { \
|
2015-07-30 18:06:23 +08:00
|
|
|
reg_state[CTX_PDP0_UDW + 1] = upper_32_bits(px_dma(&ppgtt->pml4)); \
|
|
|
|
reg_state[CTX_PDP0_LDW + 1] = lower_32_bits(px_dma(&ppgtt->pml4)); \
|
2015-11-05 05:20:09 +08:00
|
|
|
} while (0)
|
2015-07-30 18:06:23 +08:00
|
|
|
|
2014-07-25 00:04:36 +08:00
|
|
|
enum {
|
|
|
|
FAULT_AND_HANG = 0,
|
|
|
|
FAULT_AND_HALT, /* Debug only */
|
|
|
|
FAULT_AND_STREAM,
|
|
|
|
FAULT_AND_CONTINUE /* Unsupported */
|
|
|
|
};
|
|
|
|
#define GEN8_CTX_ID_SHIFT 32
|
2016-04-28 16:56:52 +08:00
|
|
|
#define GEN8_CTX_ID_WIDTH 21
|
2016-02-23 18:31:49 +08:00
|
|
|
#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17
|
|
|
|
#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2016-04-29 16:07:06 +08:00
|
|
|
/* Typical size of the average request (2 pipecontrols and a MI_BB) */
|
|
|
|
#define EXECLISTS_REQUEST_SIZE 64 /* bytes */
|
|
|
|
|
2016-05-24 21:53:34 +08:00
|
|
|
static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
|
2016-04-28 16:56:54 +08:00
|
|
|
struct intel_engine_cs *engine);
|
2016-05-24 21:53:34 +08:00
|
|
|
static int intel_lr_context_pin(struct i915_gem_context *ctx,
|
2016-01-28 18:29:54 +08:00
|
|
|
struct intel_engine_cs *engine);
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2014-07-25 00:04:48 +08:00
|
|
|
/**
|
|
|
|
* intel_sanitize_enable_execlists() - sanitize i915.enable_execlists
|
2016-06-03 21:02:17 +08:00
|
|
|
* @dev_priv: i915 device private
|
2014-07-25 00:04:48 +08:00
|
|
|
* @enable_execlists: value of i915.enable_execlists module parameter.
|
|
|
|
*
|
|
|
|
* Only certain platforms support Execlists (the prerequisites being
|
2014-12-11 20:48:35 +08:00
|
|
|
* support for Logical Ring Contexts and Aliasing PPGTT or better).
|
2014-07-25 00:04:48 +08:00
|
|
|
*
|
|
|
|
* Return: 1 if Execlists is supported and has to be enabled.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv, int enable_execlists)
|
2014-07-25 00:04:11 +08:00
|
|
|
{
|
2015-08-28 15:41:16 +08:00
|
|
|
/* On platforms with execlist available, vGPU will only
|
|
|
|
* support execlist mode, no ring buffer mode.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) && intel_vgpu_active(dev_priv))
|
2015-08-28 15:41:16 +08:00
|
|
|
return 1;
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9)
|
2014-11-14 23:05:59 +08:00
|
|
|
return 1;
|
|
|
|
|
2014-07-25 00:04:11 +08:00
|
|
|
if (enable_execlists == 0)
|
|
|
|
return 0;
|
|
|
|
|
2016-05-24 23:13:53 +08:00
|
|
|
if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) &&
|
|
|
|
USES_PPGTT(dev_priv) &&
|
|
|
|
i915.use_mmio_flip >= 0)
|
2014-07-25 00:04:11 +08:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2014-07-25 00:04:12 +08:00
|
|
|
|
2016-01-15 23:10:27 +08:00
|
|
|
static void
|
2016-03-16 19:00:37 +08:00
|
|
|
logical_ring_init_platform_invariants(struct intel_engine_cs *engine)
|
2016-01-15 23:10:27 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-01-15 23:10:27 +08:00
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN8(dev_priv) || IS_GEN9(dev_priv))
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->idle_lite_restore_wa = ~0;
|
2016-02-27 00:58:32 +08:00
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
engine->disable_lite_restore_wa = (IS_SKL_REVID(dev_priv, 0, SKL_REVID_B0) ||
|
|
|
|
IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1)) &&
|
2016-03-16 19:00:37 +08:00
|
|
|
(engine->id == VCS || engine->id == VCS2);
|
2016-01-15 23:10:27 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->ctx_desc_template = GEN8_CTX_VALID;
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN8(dev_priv))
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->ctx_desc_template |= GEN8_CTX_L3LLC_COHERENT;
|
|
|
|
engine->ctx_desc_template |= GEN8_CTX_PRIVILEGE;
|
2016-01-15 23:10:27 +08:00
|
|
|
|
|
|
|
/* TODO: WaDisableLiteRestore when we start using semaphore
|
|
|
|
* signalling between Command Streamers */
|
|
|
|
/* ring->ctx_desc_template |= GEN8_CTX_FORCE_RESTORE; */
|
|
|
|
|
|
|
|
/* WaEnableForceRestoreInCtxtDescForVCS:skl */
|
|
|
|
/* WaEnableForceRestoreInCtxtDescForVCS:bxt */
|
2016-03-16 19:00:37 +08:00
|
|
|
if (engine->disable_lite_restore_wa)
|
|
|
|
engine->ctx_desc_template |= GEN8_CTX_FORCE_RESTORE;
|
2016-01-15 23:10:27 +08:00
|
|
|
}
|
|
|
|
|
2014-07-25 00:04:48 +08:00
|
|
|
/**
|
2016-01-15 23:10:27 +08:00
|
|
|
* intel_lr_context_descriptor_update() - calculate & cache the descriptor
|
|
|
|
* descriptor for a pinned context
|
|
|
|
* @ctx: Context to work on
|
2016-05-24 21:53:37 +08:00
|
|
|
* @engine: Engine the descriptor will be used with
|
2014-07-25 00:04:48 +08:00
|
|
|
*
|
2016-01-15 23:10:27 +08:00
|
|
|
* The context descriptor encodes various attributes of a context,
|
|
|
|
* including its GTT address and some flags. Because it's fairly
|
|
|
|
* expensive to calculate, we'll just do it once and cache the result,
|
|
|
|
* which remains valid until the context is unpinned.
|
|
|
|
*
|
2016-07-16 03:48:06 +08:00
|
|
|
* This is what a descriptor looks like, from LSB to MSB::
|
|
|
|
*
|
|
|
|
* bits 0-11: flags, GEN8_CTX_* (cached in ctx_desc_template)
|
|
|
|
* bits 12-31: LRCA, GTT address of (the HWSP of) this context
|
|
|
|
* bits 32-52: ctx ID, a globally unique tag
|
|
|
|
* bits 53-54: mbz, reserved for use by hardware
|
|
|
|
* bits 55-63: group ID, currently unused and set to 0
|
2014-07-25 00:04:48 +08:00
|
|
|
*/
|
2016-01-15 23:10:27 +08:00
|
|
|
static void
|
2016-05-24 21:53:34 +08:00
|
|
|
intel_lr_context_descriptor_update(struct i915_gem_context *ctx,
|
2016-03-16 19:00:37 +08:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-25 00:04:36 +08:00
|
|
|
{
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-04-28 16:56:52 +08:00
|
|
|
u64 desc;
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2016-04-28 16:56:52 +08:00
|
|
|
BUILD_BUG_ON(MAX_CONTEXT_HW_ID > (1<<GEN8_CTX_ID_WIDTH));
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2016-06-16 20:07:02 +08:00
|
|
|
desc = ctx->desc_template; /* bits 3-4 */
|
|
|
|
desc |= engine->ctx_desc_template; /* bits 0-11 */
|
2016-08-15 17:49:07 +08:00
|
|
|
desc |= i915_ggtt_offset(ce->state) + LRC_PPHWSP_PN * PAGE_SIZE;
|
2016-05-24 21:53:37 +08:00
|
|
|
/* bits 12-31 */
|
2016-04-28 16:56:52 +08:00
|
|
|
desc |= (u64)ctx->hw_id << GEN8_CTX_ID_SHIFT; /* bits 32-52 */
|
2015-09-04 19:59:15 +08:00
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
ce->lrc_desc = desc;
|
2015-09-04 19:59:15 +08:00
|
|
|
}
|
|
|
|
|
2016-05-24 21:53:34 +08:00
|
|
|
uint64_t intel_lr_context_descriptor(struct i915_gem_context *ctx,
|
2016-03-16 19:00:37 +08:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-25 00:04:36 +08:00
|
|
|
{
|
2016-03-16 19:00:37 +08:00
|
|
|
return ctx->engine[engine->id].lrc_desc;
|
2016-01-15 23:10:27 +08:00
|
|
|
}
|
2015-02-06 19:30:04 +08:00
|
|
|
|
2015-07-03 22:09:36 +08:00
|
|
|
static void execlists_elsp_write(struct drm_i915_gem_request *rq0,
|
|
|
|
struct drm_i915_gem_request *rq1)
|
2014-07-25 00:04:36 +08:00
|
|
|
{
|
2015-07-03 22:09:36 +08:00
|
|
|
|
2016-03-16 19:00:38 +08:00
|
|
|
struct intel_engine_cs *engine = rq0->engine;
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = rq0->i915;
|
2015-07-06 16:09:25 +08:00
|
|
|
uint64_t desc[2];
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2015-07-06 16:09:25 +08:00
|
|
|
if (rq1) {
|
2016-03-16 19:00:38 +08:00
|
|
|
desc[1] = intel_lr_context_descriptor(rq1->ctx, rq1->engine);
|
2015-07-06 16:09:25 +08:00
|
|
|
rq1->elsp_submitted++;
|
|
|
|
} else {
|
|
|
|
desc[1] = 0;
|
|
|
|
}
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2016-03-16 19:00:38 +08:00
|
|
|
desc[0] = intel_lr_context_descriptor(rq0->ctx, rq0->engine);
|
2015-07-06 16:09:25 +08:00
|
|
|
rq0->elsp_submitted++;
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2015-07-06 16:09:25 +08:00
|
|
|
/* You must always write both descriptors in the order below. */
|
2016-03-16 19:00:36 +08:00
|
|
|
I915_WRITE_FW(RING_ELSP(engine), upper_32_bits(desc[1]));
|
|
|
|
I915_WRITE_FW(RING_ELSP(engine), lower_32_bits(desc[1]));
|
2015-01-16 17:34:35 +08:00
|
|
|
|
2016-03-16 19:00:36 +08:00
|
|
|
I915_WRITE_FW(RING_ELSP(engine), upper_32_bits(desc[0]));
|
2014-07-25 00:04:36 +08:00
|
|
|
/* The context is automatically loaded after the following */
|
2016-03-16 19:00:36 +08:00
|
|
|
I915_WRITE_FW(RING_ELSP(engine), lower_32_bits(desc[0]));
|
2014-07-25 00:04:36 +08:00
|
|
|
|
2015-07-06 16:09:25 +08:00
|
|
|
/* ELSP is a wo register, use another nearby reg for posting */
|
2016-03-16 19:00:36 +08:00
|
|
|
POSTING_READ_FW(RING_EXECLIST_STATUS_LO(engine));
|
2014-07-25 00:04:36 +08:00
|
|
|
}
|
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
static void
|
|
|
|
execlists_update_context_pdps(struct i915_hw_ppgtt *ppgtt, u32 *reg_state)
|
|
|
|
{
|
|
|
|
ASSIGN_CTX_PDP(ppgtt, reg_state, 3);
|
|
|
|
ASSIGN_CTX_PDP(ppgtt, reg_state, 2);
|
|
|
|
ASSIGN_CTX_PDP(ppgtt, reg_state, 1);
|
|
|
|
ASSIGN_CTX_PDP(ppgtt, reg_state, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void execlists_update_context(struct drm_i915_gem_request *rq)
|
2014-07-25 00:04:37 +08:00
|
|
|
{
|
2016-03-16 19:00:38 +08:00
|
|
|
struct intel_engine_cs *engine = rq->engine;
|
2015-07-03 22:09:33 +08:00
|
|
|
struct i915_hw_ppgtt *ppgtt = rq->ctx->ppgtt;
|
2016-03-16 19:00:36 +08:00
|
|
|
uint32_t *reg_state = rq->ctx->engine[engine->id].lrc_reg_state;
|
2014-07-25 00:04:37 +08:00
|
|
|
|
2016-08-03 05:50:30 +08:00
|
|
|
reg_state[CTX_RING_TAIL+1] = intel_ring_offset(rq->ring, rq->tail);
|
2014-07-25 00:04:37 +08:00
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
/* True 32b PPGTT with dynamic page allocation: update PDP
|
|
|
|
* registers and point the unallocated PDPs to scratch page.
|
|
|
|
* PML4 is allocated during ppgtt init, so this is not needed
|
|
|
|
* in 48-bit mode.
|
|
|
|
*/
|
|
|
|
if (ppgtt && !USES_FULL_48BIT_PPGTT(ppgtt->base.dev))
|
|
|
|
execlists_update_context_pdps(ppgtt, reg_state);
|
2014-07-25 00:04:37 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:32 +08:00
|
|
|
static void execlists_elsp_submit_contexts(struct drm_i915_gem_request *rq0,
|
|
|
|
struct drm_i915_gem_request *rq1)
|
2014-07-25 00:04:36 +08:00
|
|
|
{
|
2016-03-17 20:59:46 +08:00
|
|
|
struct drm_i915_private *dev_priv = rq0->i915;
|
2016-04-12 21:37:31 +08:00
|
|
|
unsigned int fw_domains = rq0->engine->fw_domains;
|
2016-03-17 20:59:46 +08:00
|
|
|
|
2015-07-03 22:09:33 +08:00
|
|
|
execlists_update_context(rq0);
|
2015-07-03 22:09:32 +08:00
|
|
|
|
2015-07-03 22:09:36 +08:00
|
|
|
if (rq1)
|
2015-07-03 22:09:33 +08:00
|
|
|
execlists_update_context(rq1);
|
2014-07-25 00:04:36 +08:00
|
|
|
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_lock_irq(&dev_priv->uncore.lock);
|
2016-04-12 21:37:31 +08:00
|
|
|
intel_uncore_forcewake_get__locked(dev_priv, fw_domains);
|
2016-03-17 20:59:46 +08:00
|
|
|
|
2015-07-03 22:09:36 +08:00
|
|
|
execlists_elsp_write(rq0, rq1);
|
2016-03-17 20:59:46 +08:00
|
|
|
|
2016-04-12 21:37:31 +08:00
|
|
|
intel_uncore_forcewake_put__locked(dev_priv, fw_domains);
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_unlock_irq(&dev_priv->uncore.lock);
|
2014-07-25 00:04:36 +08:00
|
|
|
}
|
|
|
|
|
2016-06-16 20:07:03 +08:00
|
|
|
static inline void execlists_context_status_change(
|
|
|
|
struct drm_i915_gem_request *rq,
|
|
|
|
unsigned long status)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Only used when GVT-g is enabled now. When GVT-g is disabled,
|
|
|
|
* The compiler should eliminate this function as dead-code.
|
|
|
|
*/
|
|
|
|
if (!IS_ENABLED(CONFIG_DRM_I915_GVT))
|
|
|
|
return;
|
|
|
|
|
|
|
|
atomic_notifier_call_chain(&rq->ctx->status_notifier, status, rq);
|
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:32 +08:00
|
|
|
static void execlists_unqueue(struct intel_engine_cs *engine)
|
2014-07-25 00:04:38 +08:00
|
|
|
{
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request *req0 = NULL, *req1 = NULL;
|
2016-02-27 00:58:32 +08:00
|
|
|
struct drm_i915_gem_request *cursor, *tmp;
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
assert_spin_locked(&engine->execlist_lock);
|
2014-07-25 00:04:38 +08:00
|
|
|
|
2015-05-11 23:03:27 +08:00
|
|
|
/*
|
|
|
|
* If irqs are not active generate a warning as batches that finish
|
|
|
|
* without the irqs may get lost and a GPU Hang may occur.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
WARN_ON(!intel_irqs_enabled(engine->i915));
|
2015-05-11 23:03:27 +08:00
|
|
|
|
2014-07-25 00:04:38 +08:00
|
|
|
/* Try to read in pairs */
|
2016-03-16 19:00:37 +08:00
|
|
|
list_for_each_entry_safe(cursor, tmp, &engine->execlist_queue,
|
2014-07-25 00:04:38 +08:00
|
|
|
execlist_link) {
|
|
|
|
if (!req0) {
|
|
|
|
req0 = cursor;
|
2015-01-15 21:10:39 +08:00
|
|
|
} else if (req0->ctx == cursor->ctx) {
|
2014-07-25 00:04:38 +08:00
|
|
|
/* Same ctx: ignore first request, as second request
|
|
|
|
* will update tail past first request's workload */
|
drm/i915/bdw: Avoid non-lite-restore preemptions
In the current Execlists feeding mechanism, full preemption is not
supported yet: only lite-restores are allowed (this is: the GPU
simply samples a new tail pointer for the context currently in
execution).
But we have identified an scenario in which a full preemption occurs:
1) We submit two contexts for execution (A & B).
2) The GPU finishes with the first one (A), switches to the second one
(B) and informs us.
3) We submit B again (hoping to cause a lite restore) together with C,
but in the time we spend writing to the ELSP, the GPU finishes B.
4) The GPU start executing B again (since we told it so).
5) We receive a B finished interrupt and, mistakenly, we submit C (again)
and D, causing a full preemption of B.
The race is avoided by keeping track of how many times a context has been
submitted to the hardware and by better discriminating the received context
switch interrupts: in the example, when we have submitted B twice, we won´t
submit C and D as soon as we receive the notification that B is completed
because we were expecting to get a LITE_RESTORE and we didn´t, so we know a
second completion will be received shortly.
Without this explicit checking, somehow, the batch buffer execution order
gets messed with. This can be verified with the IGT test I sent together with
the series. I don´t know the exact mechanism by which the pre-emption messes
with the execution order but, since other people is working on the Scheduler
+ Preemption on Execlists, I didn´t try to fix it. In these series, only Lite
Restores are supported (other kind of preemptions WARN).
v2: elsp_submitted belongs in the new intel_ctx_submit_request. Several
rebase changes.
v3: Clarify how the race is avoided, as requested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Align function parameters ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:40 +08:00
|
|
|
cursor->elsp_submitted = req0->elsp_submitted;
|
2016-04-28 16:56:58 +08:00
|
|
|
list_del(&req0->execlist_link);
|
2016-07-20 20:31:49 +08:00
|
|
|
i915_gem_request_put(req0);
|
2014-07-25 00:04:38 +08:00
|
|
|
req0 = cursor;
|
|
|
|
} else {
|
2016-06-16 20:07:04 +08:00
|
|
|
if (IS_ENABLED(CONFIG_DRM_I915_GVT)) {
|
|
|
|
/*
|
|
|
|
* req0 (after merged) ctx requires single
|
|
|
|
* submission, stop picking
|
|
|
|
*/
|
|
|
|
if (req0->ctx->execlists_force_single_submission)
|
|
|
|
break;
|
|
|
|
/*
|
|
|
|
* req0 ctx doesn't require single submission,
|
|
|
|
* but next req ctx requires, stop picking
|
|
|
|
*/
|
|
|
|
if (cursor->ctx->execlists_force_single_submission)
|
|
|
|
break;
|
|
|
|
}
|
2014-07-25 00:04:38 +08:00
|
|
|
req1 = cursor;
|
2016-02-27 00:58:32 +08:00
|
|
|
WARN_ON(req1->elsp_submitted);
|
2014-07-25 00:04:38 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
if (unlikely(!req0))
|
|
|
|
return;
|
|
|
|
|
2016-06-16 20:07:03 +08:00
|
|
|
execlists_context_status_change(req0, INTEL_CONTEXT_SCHEDULE_IN);
|
|
|
|
|
|
|
|
if (req1)
|
|
|
|
execlists_context_status_change(req1,
|
|
|
|
INTEL_CONTEXT_SCHEDULE_IN);
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (req0->elsp_submitted & engine->idle_lite_restore_wa) {
|
2015-04-16 01:11:33 +08:00
|
|
|
/*
|
2016-02-27 00:58:32 +08:00
|
|
|
* WaIdleLiteRestore: make sure we never cause a lite restore
|
|
|
|
* with HEAD==TAIL.
|
|
|
|
*
|
|
|
|
* Apply the wa NOOPS to prevent ring:HEAD == req:TAIL as we
|
|
|
|
* resubmit the request. See gen8_emit_request() for where we
|
|
|
|
* prepare the padding after the end of the request.
|
2015-04-16 01:11:33 +08:00
|
|
|
*/
|
2016-02-27 00:58:32 +08:00
|
|
|
req0->tail += 8;
|
2016-08-03 05:50:20 +08:00
|
|
|
req0->tail &= req0->ring->size - 1;
|
2015-04-16 01:11:33 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:32 +08:00
|
|
|
execlists_elsp_submit_contexts(req0, req1);
|
2014-07-25 00:04:38 +08:00
|
|
|
}
|
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
static unsigned int
|
2016-04-28 16:56:58 +08:00
|
|
|
execlists_check_remove_request(struct intel_engine_cs *engine, u32 ctx_id)
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
{
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request *head_req;
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
assert_spin_locked(&engine->execlist_lock);
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
head_req = list_first_entry_or_null(&engine->execlist_queue,
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request,
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
execlist_link);
|
|
|
|
|
2016-04-28 16:56:58 +08:00
|
|
|
if (WARN_ON(!head_req || (head_req->ctx_hw_id != ctx_id)))
|
|
|
|
return 0;
|
2016-02-27 00:58:32 +08:00
|
|
|
|
|
|
|
WARN(head_req->elsp_submitted == 0, "Never submitted head request\n");
|
|
|
|
|
|
|
|
if (--head_req->elsp_submitted > 0)
|
|
|
|
return 0;
|
|
|
|
|
2016-06-16 20:07:03 +08:00
|
|
|
execlists_context_status_change(head_req, INTEL_CONTEXT_SCHEDULE_OUT);
|
|
|
|
|
2016-04-28 16:56:58 +08:00
|
|
|
list_del(&head_req->execlist_link);
|
2016-07-20 20:31:49 +08:00
|
|
|
i915_gem_request_put(head_req);
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
return 1;
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
}
|
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
static u32
|
2016-03-16 19:00:37 +08:00
|
|
|
get_context_status(struct intel_engine_cs *engine, unsigned int read_pointer,
|
2016-02-27 00:58:32 +08:00
|
|
|
u32 *context_id)
|
2016-01-06 02:30:07 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-02-27 00:58:32 +08:00
|
|
|
u32 status;
|
2016-01-06 02:30:07 +08:00
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
read_pointer %= GEN8_CSB_ENTRIES;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
status = I915_READ_FW(RING_CONTEXT_STATUS_BUF_LO(engine, read_pointer));
|
2016-02-27 00:58:32 +08:00
|
|
|
|
|
|
|
if (status & GEN8_CTX_STATUS_IDLE_ACTIVE)
|
|
|
|
return 0;
|
2016-01-06 02:30:07 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
*context_id = I915_READ_FW(RING_CONTEXT_STATUS_BUF_HI(engine,
|
2016-02-27 00:58:32 +08:00
|
|
|
read_pointer));
|
|
|
|
|
|
|
|
return status;
|
2016-01-06 02:30:07 +08:00
|
|
|
}
|
|
|
|
|
2016-07-16 03:48:06 +08:00
|
|
|
/*
|
2014-07-25 00:04:48 +08:00
|
|
|
* Check the unread Context Status Buffers and manage the submission of new
|
|
|
|
* contexts to the ELSP accordingly.
|
|
|
|
*/
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
static void intel_lrc_irq_handler(unsigned long data)
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
{
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
u32 status_pointer;
|
2016-02-27 00:58:32 +08:00
|
|
|
unsigned int read_pointer, write_pointer;
|
2016-03-17 20:59:46 +08:00
|
|
|
u32 csb[GEN8_CSB_ENTRIES][2];
|
|
|
|
unsigned int csb_read = 0, i;
|
2016-02-27 00:58:32 +08:00
|
|
|
unsigned int submit_contexts = 0;
|
|
|
|
|
2016-04-12 21:37:31 +08:00
|
|
|
intel_uncore_forcewake_get(dev_priv, engine->fw_domains);
|
2016-02-27 00:58:32 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
status_pointer = I915_READ_FW(RING_CONTEXT_STATUS_PTR(engine));
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
read_pointer = engine->next_context_status_buffer;
|
2016-01-06 02:30:05 +08:00
|
|
|
write_pointer = GEN8_CSB_WRITE_PTR(status_pointer);
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
if (read_pointer > write_pointer)
|
2015-09-28 20:25:12 +08:00
|
|
|
write_pointer += GEN8_CSB_ENTRIES;
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
|
|
|
while (read_pointer < write_pointer) {
|
2016-03-17 20:59:46 +08:00
|
|
|
if (WARN_ON_ONCE(csb_read == GEN8_CSB_ENTRIES))
|
|
|
|
break;
|
|
|
|
csb[csb_read][0] = get_context_status(engine, ++read_pointer,
|
|
|
|
&csb[csb_read][1]);
|
|
|
|
csb_read++;
|
|
|
|
}
|
2016-01-06 02:30:07 +08:00
|
|
|
|
2016-03-17 20:59:46 +08:00
|
|
|
engine->next_context_status_buffer = write_pointer % GEN8_CSB_ENTRIES;
|
|
|
|
|
|
|
|
/* Update the read pointer to the old write pointer. Manual ringbuffer
|
|
|
|
* management ftw </sarcasm> */
|
|
|
|
I915_WRITE_FW(RING_CONTEXT_STATUS_PTR(engine),
|
|
|
|
_MASKED_FIELD(GEN8_CSB_READ_PTR_MASK,
|
|
|
|
engine->next_context_status_buffer << 8));
|
|
|
|
|
2016-04-12 21:37:31 +08:00
|
|
|
intel_uncore_forcewake_put(dev_priv, engine->fw_domains);
|
2016-03-17 20:59:46 +08:00
|
|
|
|
|
|
|
spin_lock(&engine->execlist_lock);
|
|
|
|
|
|
|
|
for (i = 0; i < csb_read; i++) {
|
|
|
|
if (unlikely(csb[i][0] & GEN8_CTX_STATUS_PREEMPTED)) {
|
|
|
|
if (csb[i][0] & GEN8_CTX_STATUS_LITE_RESTORE) {
|
|
|
|
if (execlists_check_remove_request(engine, csb[i][1]))
|
drm/i915/bdw: Avoid non-lite-restore preemptions
In the current Execlists feeding mechanism, full preemption is not
supported yet: only lite-restores are allowed (this is: the GPU
simply samples a new tail pointer for the context currently in
execution).
But we have identified an scenario in which a full preemption occurs:
1) We submit two contexts for execution (A & B).
2) The GPU finishes with the first one (A), switches to the second one
(B) and informs us.
3) We submit B again (hoping to cause a lite restore) together with C,
but in the time we spend writing to the ELSP, the GPU finishes B.
4) The GPU start executing B again (since we told it so).
5) We receive a B finished interrupt and, mistakenly, we submit C (again)
and D, causing a full preemption of B.
The race is avoided by keeping track of how many times a context has been
submitted to the hardware and by better discriminating the received context
switch interrupts: in the example, when we have submitted B twice, we won´t
submit C and D as soon as we receive the notification that B is completed
because we were expecting to get a LITE_RESTORE and we didn´t, so we know a
second completion will be received shortly.
Without this explicit checking, somehow, the batch buffer execution order
gets messed with. This can be verified with the IGT test I sent together with
the series. I don´t know the exact mechanism by which the pre-emption messes
with the execution order but, since other people is working on the Scheduler
+ Preemption on Execlists, I didn´t try to fix it. In these series, only Lite
Restores are supported (other kind of preemptions WARN).
v2: elsp_submitted belongs in the new intel_ctx_submit_request. Several
rebase changes.
v3: Clarify how the race is avoided, as requested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Align function parameters ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:40 +08:00
|
|
|
WARN(1, "Lite Restored request removed from queue\n");
|
|
|
|
} else
|
|
|
|
WARN(1, "Preemption without Lite Restore\n");
|
|
|
|
}
|
|
|
|
|
2016-03-17 20:59:46 +08:00
|
|
|
if (csb[i][0] & (GEN8_CTX_STATUS_ACTIVE_IDLE |
|
2016-02-27 00:58:32 +08:00
|
|
|
GEN8_CTX_STATUS_ELEMENT_SWITCH))
|
|
|
|
submit_contexts +=
|
2016-03-17 20:59:46 +08:00
|
|
|
execlists_check_remove_request(engine, csb[i][1]);
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
}
|
|
|
|
|
2016-02-27 00:58:32 +08:00
|
|
|
if (submit_contexts) {
|
2016-03-16 19:00:37 +08:00
|
|
|
if (!engine->disable_lite_restore_wa ||
|
2016-03-17 20:59:46 +08:00
|
|
|
(csb[i][0] & GEN8_CTX_STATUS_ACTIVE_IDLE))
|
2016-08-03 05:50:32 +08:00
|
|
|
execlists_unqueue(engine);
|
2015-09-04 19:59:15 +08:00
|
|
|
}
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
spin_unlock(&engine->execlist_lock);
|
2016-02-27 00:58:32 +08:00
|
|
|
|
|
|
|
if (unlikely(submit_contexts > 2))
|
|
|
|
DRM_ERROR("More than two context complete events?\n");
|
drm/i915/bdw: Handle context switch events
Handle all context status events in the context status buffer on every
context switch interrupt. We only remove work from the execlist queue
after a context status buffer reports that it has completed and we only
attempt to schedule new contexts on interrupt when a previously submitted
context completes (unless no contexts are queued, which means the GPU is
free).
We canot call intel_runtime_pm_get() in an interrupt (or with a spinlock
grabbed, FWIW), because it might sleep, which is not a nice thing to do.
Instead, do the runtime_pm get/put together with the create/destroy request,
and handle the forcewake get/put directly.
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
v2: Unreferencing the context when we are freeing the request might free
the backing bo, which requires the struct_mutex to be grabbed, so defer
unreferencing and freeing to a bottom half.
v3:
- Ack the interrupt inmediately, before trying to handle it (fix for
missing interrupts by Bob Beckett <robert.beckett@intel.com>).
- Update the Context Status Buffer Read Pointer, just in case (spotted
by Damien Lespiau).
v4: New namespace and multiple rebase changes.
v5: Squash with "drm/i915/bdw: Do not call intel_runtime_pm_get() in an
interrupt", as suggested by Daniel.
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
[danvet: Checkpatch ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:39 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:32 +08:00
|
|
|
static void execlists_submit_request(struct drm_i915_gem_request *request)
|
2014-07-25 00:04:38 +08:00
|
|
|
{
|
2016-03-16 19:00:38 +08:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request *cursor;
|
2014-07-25 00:04:41 +08:00
|
|
|
int num_elements = 0;
|
2014-07-25 00:04:38 +08:00
|
|
|
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_lock_bh(&engine->execlist_lock);
|
2014-07-25 00:04:38 +08:00
|
|
|
|
2016-03-16 19:00:36 +08:00
|
|
|
list_for_each_entry(cursor, &engine->execlist_queue, execlist_link)
|
2014-07-25 00:04:41 +08:00
|
|
|
if (++num_elements > 2)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (num_elements > 2) {
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request *tail_req;
|
2014-07-25 00:04:41 +08:00
|
|
|
|
2016-03-16 19:00:36 +08:00
|
|
|
tail_req = list_last_entry(&engine->execlist_queue,
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request,
|
2014-07-25 00:04:41 +08:00
|
|
|
execlist_link);
|
|
|
|
|
2015-05-30 00:44:14 +08:00
|
|
|
if (request->ctx == tail_req->ctx) {
|
2014-07-25 00:04:41 +08:00
|
|
|
WARN(tail_req->elsp_submitted != 0,
|
2014-11-13 18:28:56 +08:00
|
|
|
"More than 2 already-submitted reqs queued\n");
|
2016-04-28 16:56:58 +08:00
|
|
|
list_del(&tail_req->execlist_link);
|
2016-07-20 20:31:49 +08:00
|
|
|
i915_gem_request_put(tail_req);
|
2014-07-25 00:04:41 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-20 20:31:49 +08:00
|
|
|
i915_gem_request_get(request);
|
2016-03-16 19:00:36 +08:00
|
|
|
list_add_tail(&request->execlist_link, &engine->execlist_queue);
|
2016-04-28 16:56:57 +08:00
|
|
|
request->ctx_hw_id = request->ctx->hw_id;
|
2014-07-25 00:04:41 +08:00
|
|
|
if (num_elements == 0)
|
2016-08-03 05:50:32 +08:00
|
|
|
execlists_unqueue(engine);
|
2014-07-25 00:04:38 +08:00
|
|
|
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_unlock_bh(&engine->execlist_lock);
|
2014-07-25 00:04:38 +08:00
|
|
|
}
|
|
|
|
|
2015-05-30 00:43:26 +08:00
|
|
|
int intel_logical_ring_alloc_request_extras(struct drm_i915_gem_request *request)
|
2015-03-19 20:30:07 +08:00
|
|
|
{
|
2016-04-28 16:56:53 +08:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &request->ctx->engine[engine->id];
|
2016-04-28 16:56:48 +08:00
|
|
|
int ret;
|
2015-03-19 20:30:07 +08:00
|
|
|
|
2016-04-28 16:56:49 +08:00
|
|
|
/* Flush enough space to reduce the likelihood of waiting after
|
|
|
|
* we start building the request - in which case we will just
|
|
|
|
* have to repeat work.
|
|
|
|
*/
|
2016-04-29 16:07:06 +08:00
|
|
|
request->reserved_space += EXECLISTS_REQUEST_SIZE;
|
2016-04-28 16:56:49 +08:00
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
if (!ce->state) {
|
2016-04-28 16:56:54 +08:00
|
|
|
ret = execlists_context_deferred_alloc(request->ctx, engine);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:20 +08:00
|
|
|
request->ring = ce->ring;
|
2015-07-06 16:08:30 +08:00
|
|
|
|
2015-12-17 03:45:55 +08:00
|
|
|
if (i915.enable_guc_submission) {
|
|
|
|
/*
|
|
|
|
* Check that the GuC has space for the request before
|
|
|
|
* going any further, as the i915_add_request() call
|
|
|
|
* later on mustn't fail ...
|
|
|
|
*/
|
2016-05-13 22:36:32 +08:00
|
|
|
ret = i915_guc_wq_check_space(request);
|
2015-12-17 03:45:55 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-04-28 16:56:53 +08:00
|
|
|
ret = intel_lr_context_pin(request->ctx, engine);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2016-01-20 03:02:55 +08:00
|
|
|
|
2016-04-28 16:56:48 +08:00
|
|
|
ret = intel_ring_begin(request, 0);
|
|
|
|
if (ret)
|
|
|
|
goto err_unpin;
|
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
if (!ce->initialised) {
|
2016-04-28 16:56:53 +08:00
|
|
|
ret = engine->init_context(request);
|
|
|
|
if (ret)
|
|
|
|
goto err_unpin;
|
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
ce->initialised = true;
|
2016-04-28 16:56:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that after this point, we have committed to using
|
|
|
|
* this request as it is being used to both track the
|
|
|
|
* state of engine initialisation and liveness of the
|
|
|
|
* golden renderstate above. Think twice before you try
|
|
|
|
* to cancel/unwind this request now.
|
|
|
|
*/
|
|
|
|
|
2016-04-29 16:07:06 +08:00
|
|
|
request->reserved_space -= EXECLISTS_REQUEST_SIZE;
|
2016-04-28 16:56:48 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_unpin:
|
2016-04-28 16:56:53 +08:00
|
|
|
intel_lr_context_unpin(request->ctx, engine);
|
2016-01-20 03:02:55 +08:00
|
|
|
return ret;
|
2015-03-19 20:30:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2016-08-03 05:50:31 +08:00
|
|
|
* intel_logical_ring_advance() - advance the tail and prepare for submission
|
2015-05-30 00:44:14 +08:00
|
|
|
* @request: Request to advance the logical ringbuffer of.
|
2015-03-19 20:30:07 +08:00
|
|
|
*
|
|
|
|
* The tail is updated in our logical ringbuffer struct, not in the actual context. What
|
|
|
|
* really happens during submission is that the context and current tail will be placed
|
|
|
|
* on a queue waiting for the ELSP to be ready to accept a new context submission. At that
|
|
|
|
* point, the tail *inside* the context is updated and the ELSP written to.
|
|
|
|
*/
|
2016-01-20 21:43:35 +08:00
|
|
|
static int
|
2016-08-03 05:50:31 +08:00
|
|
|
intel_logical_ring_advance(struct drm_i915_gem_request *request)
|
2015-03-19 20:30:07 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = request->ring;
|
2016-03-16 19:00:38 +08:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2015-03-19 20:30:07 +08:00
|
|
|
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_advance(ring);
|
|
|
|
request->tail = ring->tail;
|
2015-03-19 20:30:07 +08:00
|
|
|
|
2016-01-20 21:43:35 +08:00
|
|
|
/*
|
|
|
|
* Here we add two extra NOOPs as padding to avoid
|
|
|
|
* lite restore of a context with HEAD==TAIL.
|
|
|
|
*
|
|
|
|
* Caller must reserve WA_TAIL_DWORDS for us!
|
|
|
|
*/
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
|
|
|
intel_ring_advance(ring);
|
drm/i915: Integrate GuC-based command submission
GuC-based submission is mostly the same as execlist mode, up to
intel_logical_ring_advance_and_submit(), where the context being
dispatched would be added to the execlist queue; at this point
we submit the context to the GuC backend instead.
There are, however, a few other changes also required, notably:
1. Contexts must be pinned at GGTT addresses accessible by the GuC
i.e. NOT in the range [0..WOPCM_SIZE), so we have to add the
PIN_OFFSET_BIAS flag to the relevant GGTT-pinning calls.
2. The GuC's TLB must be invalidated after a context is pinned at
a new GGTT address.
3. GuC firmware uses the one page before Ring Context as shared data.
Therefore, whenever driver wants to get base address of LRC, we
will offset one page for it. LRC_PPHWSP_PN is defined as the page
number of LRCA.
4. In the work queue used to pass requests to the GuC, the GuC
firmware requires the ring-tail-offset to be represented as an
11-bit value, expressed in QWords. Therefore, the ringbuffer
size must be reduced to the representable range (4 pages).
v2:
Defer adding #defines until needed [Chris Wilson]
Rationalise type declarations [Chris Wilson]
v4:
Squashed kerneldoc patch into here [Daniel Vetter]
v5:
Update request->tail in code common to both GuC and execlist modes.
Add a private version of lr_context_update(), as sharing the
execlist version leads to race conditions when the CPU and
the GuC both update TAIL in the context image.
Conversion of error-captured HWS page to string must account
for offset from start of object to actual HWS (LRC_PPHWSP_PN).
Issue: VIZ-4884
Signed-off-by: Alex Dai <yu.dai@intel.com>
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-12 22:43:43 +08:00
|
|
|
|
2016-04-28 16:56:56 +08:00
|
|
|
/* We keep the previous context alive until we retire the following
|
|
|
|
* request. This ensures that any the context object is still pinned
|
|
|
|
* for any residual writes the HW makes into it on the context switch
|
|
|
|
* into the next object following the breadcrumb. Otherwise, we may
|
|
|
|
* retire the context too early.
|
|
|
|
*/
|
|
|
|
request->previous_context = engine->last_context;
|
|
|
|
engine->last_context = request->ctx;
|
2016-01-20 21:43:35 +08:00
|
|
|
return 0;
|
2015-03-19 20:30:07 +08:00
|
|
|
}
|
|
|
|
|
2016-04-28 16:56:58 +08:00
|
|
|
void intel_execlists_cancel_requests(struct intel_engine_cs *engine)
|
2014-11-13 18:27:05 +08:00
|
|
|
{
|
2015-01-15 21:10:39 +08:00
|
|
|
struct drm_i915_gem_request *req, *tmp;
|
2016-04-28 16:56:58 +08:00
|
|
|
LIST_HEAD(cancel_list);
|
2014-11-13 18:27:05 +08:00
|
|
|
|
2016-07-05 17:40:23 +08:00
|
|
|
WARN_ON(!mutex_is_locked(&engine->i915->drm.struct_mutex));
|
2014-11-13 18:27:05 +08:00
|
|
|
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_lock_bh(&engine->execlist_lock);
|
2016-04-28 16:56:58 +08:00
|
|
|
list_replace_init(&engine->execlist_queue, &cancel_list);
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
spin_unlock_bh(&engine->execlist_lock);
|
2014-11-13 18:27:05 +08:00
|
|
|
|
2016-04-28 16:56:58 +08:00
|
|
|
list_for_each_entry_safe(req, tmp, &cancel_list, execlist_link) {
|
2014-11-13 18:27:05 +08:00
|
|
|
list_del(&req->execlist_link);
|
2016-07-20 20:31:49 +08:00
|
|
|
i915_gem_request_put(req);
|
2014-11-13 18:27:05 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-24 21:53:34 +08:00
|
|
|
static int intel_lr_context_pin(struct i915_gem_context *ctx,
|
2016-04-28 16:56:53 +08:00
|
|
|
struct intel_engine_cs *engine)
|
drm/i915/bdw: Pin the context backing objects to GGTT on-demand
Up until now, we have pinned every logical ring context backing object
during creation, and left it pinned until destruction. This made my life
easier, but it's a harmful thing to do, because we cause fragmentation
of the GGTT (and, eventually, we would run out of space).
This patch makes the pinning on-demand: the backing objects of the two
contexts that are written to the ELSP are pinned right before submission
and unpinned once the hardware is done with them. The only context that
is still pinned regardless is the global default one, so that the HWS can
still be accessed in the same way (ring->status_page).
v2: In the early version of this patch, we were pinning the context as
we put it into the ELSP: on the one hand, this is very efficient because
only a maximum two contexts are pinned at any given time, but on the other
hand, we cannot really pin in interrupt time :(
v3: Use a mutex rather than atomic_t to protect pin count to avoid races.
Do not unpin default context in free_request.
v4: Break out pin and unpin into functions. Fix style problems reported
by checkpatch
v5: Remove unpin_lock as all pinning and unpinning is done with the struct
mutex already locked. Add WARN_ONs to make sure this is the case in future.
Issue: VIZ-4277
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Reviewed-by: Deepak S<deepak.s@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-13 18:28:10 +08:00
|
|
|
{
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-04-12 22:40:42 +08:00
|
|
|
void *vaddr;
|
|
|
|
u32 *lrc_reg_state;
|
2016-01-15 23:10:27 +08:00
|
|
|
int ret;
|
drm/i915/bdw: Pin the context backing objects to GGTT on-demand
Up until now, we have pinned every logical ring context backing object
during creation, and left it pinned until destruction. This made my life
easier, but it's a harmful thing to do, because we cause fragmentation
of the GGTT (and, eventually, we would run out of space).
This patch makes the pinning on-demand: the backing objects of the two
contexts that are written to the ELSP are pinned right before submission
and unpinned once the hardware is done with them. The only context that
is still pinned regardless is the global default one, so that the HWS can
still be accessed in the same way (ring->status_page).
v2: In the early version of this patch, we were pinning the context as
we put it into the ELSP: on the one hand, this is very efficient because
only a maximum two contexts are pinned at any given time, but on the other
hand, we cannot really pin in interrupt time :(
v3: Use a mutex rather than atomic_t to protect pin count to avoid races.
Do not unpin default context in free_request.
v4: Break out pin and unpin into functions. Fix style problems reported
by checkpatch
v5: Remove unpin_lock as all pinning and unpinning is done with the struct
mutex already locked. Add WARN_ONs to make sure this is the case in future.
Issue: VIZ-4277
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Reviewed-by: Deepak S<deepak.s@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-13 18:28:10 +08:00
|
|
|
|
2016-07-05 17:40:23 +08:00
|
|
|
lockdep_assert_held(&ctx->i915->drm.struct_mutex);
|
2016-01-15 23:10:27 +08:00
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
if (ce->pin_count++)
|
2016-04-28 16:56:53 +08:00
|
|
|
return 0;
|
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
ret = i915_vma_pin(ce->state, 0, GEN8_LR_CONTEXT_ALIGN,
|
|
|
|
PIN_OFFSET_BIAS | GUC_WOPCM_TOP | PIN_GLOBAL);
|
2015-09-11 19:53:46 +08:00
|
|
|
if (ret)
|
2016-04-28 16:56:53 +08:00
|
|
|
goto err;
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
vaddr = i915_gem_object_pin_map(ce->state->obj, I915_MAP_WB);
|
2016-04-12 22:40:42 +08:00
|
|
|
if (IS_ERR(vaddr)) {
|
|
|
|
ret = PTR_ERR(vaddr);
|
2016-08-15 17:48:54 +08:00
|
|
|
goto unpin_vma;
|
2016-01-16 01:12:45 +08:00
|
|
|
}
|
|
|
|
|
2016-04-12 22:40:42 +08:00
|
|
|
lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
|
|
|
|
|
2016-08-03 05:50:23 +08:00
|
|
|
ret = intel_ring_pin(ce->ring);
|
2015-09-11 19:53:46 +08:00
|
|
|
if (ret)
|
2016-04-12 22:40:42 +08:00
|
|
|
goto unpin_map;
|
drm/i915: Integrate GuC-based command submission
GuC-based submission is mostly the same as execlist mode, up to
intel_logical_ring_advance_and_submit(), where the context being
dispatched would be added to the execlist queue; at this point
we submit the context to the GuC backend instead.
There are, however, a few other changes also required, notably:
1. Contexts must be pinned at GGTT addresses accessible by the GuC
i.e. NOT in the range [0..WOPCM_SIZE), so we have to add the
PIN_OFFSET_BIAS flag to the relevant GGTT-pinning calls.
2. The GuC's TLB must be invalidated after a context is pinned at
a new GGTT address.
3. GuC firmware uses the one page before Ring Context as shared data.
Therefore, whenever driver wants to get base address of LRC, we
will offset one page for it. LRC_PPHWSP_PN is defined as the page
number of LRCA.
4. In the work queue used to pass requests to the GuC, the GuC
firmware requires the ring-tail-offset to be represented as an
11-bit value, expressed in QWords. Therefore, the ringbuffer
size must be reduced to the representable range (4 pages).
v2:
Defer adding #defines until needed [Chris Wilson]
Rationalise type declarations [Chris Wilson]
v4:
Squashed kerneldoc patch into here [Daniel Vetter]
v5:
Update request->tail in code common to both GuC and execlist modes.
Add a private version of lr_context_update(), as sharing the
execlist version leads to race conditions when the CPU and
the GuC both update TAIL in the context image.
Conversion of error-captured HWS page to string must account
for offset from start of object to actual HWS (LRC_PPHWSP_PN).
Issue: VIZ-4884
Signed-off-by: Alex Dai <yu.dai@intel.com>
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-12 22:43:43 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
intel_lr_context_descriptor_update(ctx, engine);
|
2016-05-24 21:53:37 +08:00
|
|
|
|
2016-08-15 17:49:07 +08:00
|
|
|
lrc_reg_state[CTX_RING_BUFFER_START+1] =
|
|
|
|
i915_ggtt_offset(ce->ring->vma);
|
2016-05-24 21:53:37 +08:00
|
|
|
ce->lrc_reg_state = lrc_reg_state;
|
2016-08-15 17:48:54 +08:00
|
|
|
ce->state->obj->dirty = true;
|
2015-09-02 20:33:42 +08:00
|
|
|
|
2015-09-11 19:53:46 +08:00
|
|
|
/* Invalidate GuC TLB. */
|
2016-08-15 17:48:54 +08:00
|
|
|
if (i915.enable_guc_submission) {
|
|
|
|
struct drm_i915_private *dev_priv = ctx->i915;
|
2015-09-11 19:53:46 +08:00
|
|
|
I915_WRITE(GEN8_GTCR, GEN8_GTCR_INVALIDATE);
|
2016-08-15 17:48:54 +08:00
|
|
|
}
|
drm/i915/bdw: Pin the context backing objects to GGTT on-demand
Up until now, we have pinned every logical ring context backing object
during creation, and left it pinned until destruction. This made my life
easier, but it's a harmful thing to do, because we cause fragmentation
of the GGTT (and, eventually, we would run out of space).
This patch makes the pinning on-demand: the backing objects of the two
contexts that are written to the ELSP are pinned right before submission
and unpinned once the hardware is done with them. The only context that
is still pinned regardless is the global default one, so that the HWS can
still be accessed in the same way (ring->status_page).
v2: In the early version of this patch, we were pinning the context as
we put it into the ELSP: on the one hand, this is very efficient because
only a maximum two contexts are pinned at any given time, but on the other
hand, we cannot really pin in interrupt time :(
v3: Use a mutex rather than atomic_t to protect pin count to avoid races.
Do not unpin default context in free_request.
v4: Break out pin and unpin into functions. Fix style problems reported
by checkpatch
v5: Remove unpin_lock as all pinning and unpinning is done with the struct
mutex already locked. Add WARN_ONs to make sure this is the case in future.
Issue: VIZ-4277
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Reviewed-by: Deepak S<deepak.s@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-13 18:28:10 +08:00
|
|
|
|
2016-07-20 20:31:50 +08:00
|
|
|
i915_gem_context_get(ctx);
|
2016-04-28 16:56:53 +08:00
|
|
|
return 0;
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2016-04-12 22:40:42 +08:00
|
|
|
unpin_map:
|
2016-08-15 17:48:54 +08:00
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
|
|
|
unpin_vma:
|
|
|
|
__i915_vma_unpin(ce->state);
|
2016-04-28 16:56:53 +08:00
|
|
|
err:
|
2016-05-24 21:53:37 +08:00
|
|
|
ce->pin_count = 0;
|
2015-09-11 19:53:46 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-05-24 21:53:34 +08:00
|
|
|
void intel_lr_context_unpin(struct i915_gem_context *ctx,
|
2016-04-28 16:56:53 +08:00
|
|
|
struct intel_engine_cs *engine)
|
2015-09-11 19:53:46 +08:00
|
|
|
{
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2015-09-11 19:53:46 +08:00
|
|
|
|
2016-07-05 17:40:23 +08:00
|
|
|
lockdep_assert_held(&ctx->i915->drm.struct_mutex);
|
2016-05-24 21:53:37 +08:00
|
|
|
GEM_BUG_ON(ce->pin_count == 0);
|
2016-01-28 18:29:55 +08:00
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
if (--ce->pin_count)
|
2016-04-28 16:56:53 +08:00
|
|
|
return;
|
2015-09-11 19:53:46 +08:00
|
|
|
|
2016-08-03 05:50:23 +08:00
|
|
|
intel_ring_unpin(ce->ring);
|
drm/i915/bdw: Pin the context backing objects to GGTT on-demand
Up until now, we have pinned every logical ring context backing object
during creation, and left it pinned until destruction. This made my life
easier, but it's a harmful thing to do, because we cause fragmentation
of the GGTT (and, eventually, we would run out of space).
This patch makes the pinning on-demand: the backing objects of the two
contexts that are written to the ELSP are pinned right before submission
and unpinned once the hardware is done with them. The only context that
is still pinned regardless is the global default one, so that the HWS can
still be accessed in the same way (ring->status_page).
v2: In the early version of this patch, we were pinning the context as
we put it into the ELSP: on the one hand, this is very efficient because
only a maximum two contexts are pinned at any given time, but on the other
hand, we cannot really pin in interrupt time :(
v3: Use a mutex rather than atomic_t to protect pin count to avoid races.
Do not unpin default context in free_request.
v4: Break out pin and unpin into functions. Fix style problems reported
by checkpatch
v5: Remove unpin_lock as all pinning and unpinning is done with the struct
mutex already locked. Add WARN_ONs to make sure this is the case in future.
Issue: VIZ-4277
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Reviewed-by: Deepak S<deepak.s@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-13 18:28:10 +08:00
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
|
|
|
i915_vma_unpin(ce->state);
|
2016-01-28 18:29:55 +08:00
|
|
|
|
2016-07-20 20:31:50 +08:00
|
|
|
i915_gem_context_put(ctx);
|
drm/i915/bdw: Pin the context backing objects to GGTT on-demand
Up until now, we have pinned every logical ring context backing object
during creation, and left it pinned until destruction. This made my life
easier, but it's a harmful thing to do, because we cause fragmentation
of the GGTT (and, eventually, we would run out of space).
This patch makes the pinning on-demand: the backing objects of the two
contexts that are written to the ELSP are pinned right before submission
and unpinned once the hardware is done with them. The only context that
is still pinned regardless is the global default one, so that the HWS can
still be accessed in the same way (ring->status_page).
v2: In the early version of this patch, we were pinning the context as
we put it into the ELSP: on the one hand, this is very efficient because
only a maximum two contexts are pinned at any given time, but on the other
hand, we cannot really pin in interrupt time :(
v3: Use a mutex rather than atomic_t to protect pin count to avoid races.
Do not unpin default context in free_request.
v4: Break out pin and unpin into functions. Fix style problems reported
by checkpatch
v5: Remove unpin_lock as all pinning and unpinning is done with the struct
mutex already locked. Add WARN_ONs to make sure this is the case in future.
Issue: VIZ-4277
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Signed-off-by: Thomas Daniel <thomas.daniel@intel.com>
Reviewed-by: Akash Goel <akash.goels@gmail.com>
Reviewed-by: Deepak S<deepak.s@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-11-13 18:28:10 +08:00
|
|
|
}
|
|
|
|
|
2015-05-30 00:43:54 +08:00
|
|
|
static int intel_logical_ring_workarounds_emit(struct drm_i915_gem_request *req)
|
2014-11-12 00:47:33 +08:00
|
|
|
{
|
|
|
|
int ret, i;
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = req->ring;
|
2016-05-06 22:40:21 +08:00
|
|
|
struct i915_workarounds *w = &req->i915->workarounds;
|
2014-11-12 00:47:33 +08:00
|
|
|
|
2016-01-07 09:15:29 +08:00
|
|
|
if (w->count == 0)
|
2014-11-12 00:47:33 +08:00
|
|
|
return 0;
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
ret = req->engine->emit_flush(req, EMIT_BARRIER);
|
2014-11-12 00:47:33 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(req, w->count * 2 + 2);
|
2014-11-12 00:47:33 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(w->count));
|
2014-11-12 00:47:33 +08:00
|
|
|
for (i = 0; i < w->count; i++) {
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_emit_reg(ring, w->reg[i].addr);
|
|
|
|
intel_ring_emit(ring, w->reg[i].value);
|
2014-11-12 00:47:33 +08:00
|
|
|
}
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
2014-11-12 00:47:33 +08:00
|
|
|
|
2016-08-03 05:50:19 +08:00
|
|
|
intel_ring_advance(ring);
|
2014-11-12 00:47:33 +08:00
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
ret = req->engine->emit_flush(req, EMIT_BARRIER);
|
2014-11-12 00:47:33 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-07-08 17:27:05 +08:00
|
|
|
#define wa_ctx_emit(batch, index, cmd) \
|
2015-06-20 02:07:01 +08:00
|
|
|
do { \
|
2015-07-08 17:27:05 +08:00
|
|
|
int __index = (index)++; \
|
|
|
|
if (WARN_ON(__index >= (PAGE_SIZE / sizeof(uint32_t)))) { \
|
2015-06-20 02:07:01 +08:00
|
|
|
return -ENOSPC; \
|
|
|
|
} \
|
2015-07-08 17:27:05 +08:00
|
|
|
batch[__index] = (cmd); \
|
2015-06-20 02:07:01 +08:00
|
|
|
} while (0)
|
|
|
|
|
2015-11-05 05:20:08 +08:00
|
|
|
#define wa_ctx_emit_reg(batch, index, reg) \
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 21:33:26 +08:00
|
|
|
wa_ctx_emit((batch), (index), i915_mmio_reg_offset(reg))
|
2015-07-03 21:27:31 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* In this WA we need to set GEN8_L3SQCREG4[21:21] and reset it after
|
|
|
|
* PIPE_CONTROL instruction. This is required for the flush to happen correctly
|
|
|
|
* but there is a slight complication as this is applied in WA batch where the
|
|
|
|
* values are only initialized once so we cannot take register value at the
|
|
|
|
* beginning and reuse it further; hence we save its value to memory, upload a
|
|
|
|
* constant value with bit21 set and then we restore it back with the saved value.
|
|
|
|
* To simplify the WA, a constant value is formed by using the default value
|
|
|
|
* of this register. This shouldn't be a problem because we are only modifying
|
|
|
|
* it for a short period and this batch in non-premptible. We can ofcourse
|
|
|
|
* use additional instructions that read the actual value of the register
|
|
|
|
* at that time and set our bit of interest but it makes the WA complicated.
|
|
|
|
*
|
|
|
|
* This WA is also required for Gen9 so extracting as a function avoids
|
|
|
|
* code duplication.
|
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
static inline int gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine,
|
2016-07-16 03:48:06 +08:00
|
|
|
uint32_t *batch,
|
2015-07-03 21:27:31 +08:00
|
|
|
uint32_t index)
|
|
|
|
{
|
2016-07-26 15:26:29 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2015-07-03 21:27:31 +08:00
|
|
|
uint32_t l3sqc4_flush = (0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES);
|
|
|
|
|
2015-07-14 22:01:29 +08:00
|
|
|
/*
|
2016-06-07 22:19:03 +08:00
|
|
|
* WaDisableLSQCROPERFforOCL:skl,kbl
|
2015-07-14 22:01:29 +08:00
|
|
|
* This WA is implemented in skl_init_clock_gating() but since
|
|
|
|
* this batch updates GEN8_L3SQCREG4 with default value we need to
|
|
|
|
* set this bit here to retain the WA during flush.
|
|
|
|
*/
|
2016-06-07 22:19:03 +08:00
|
|
|
if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_E0) ||
|
|
|
|
IS_KBL_REVID(dev_priv, 0, KBL_REVID_E0))
|
2015-07-14 22:01:29 +08:00
|
|
|
l3sqc4_flush |= GEN8_LQSC_RO_PERF_DIS;
|
|
|
|
|
2015-08-04 23:22:20 +08:00
|
|
|
wa_ctx_emit(batch, index, (MI_STORE_REGISTER_MEM_GEN8 |
|
2015-07-08 17:27:05 +08:00
|
|
|
MI_SRM_LRM_GLOBAL_GTT));
|
2015-11-05 05:20:08 +08:00
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4);
|
2016-08-15 17:49:07 +08:00
|
|
|
wa_ctx_emit(batch, index, i915_ggtt_offset(engine->scratch) + 256);
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
|
2015-11-05 05:20:08 +08:00
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4);
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, l3sqc4_flush);
|
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
wa_ctx_emit(batch, index, (PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_DC_FLUSH_ENABLE));
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
|
2015-08-04 23:22:20 +08:00
|
|
|
wa_ctx_emit(batch, index, (MI_LOAD_REGISTER_MEM_GEN8 |
|
2015-07-08 17:27:05 +08:00
|
|
|
MI_SRM_LRM_GLOBAL_GTT));
|
2015-11-05 05:20:08 +08:00
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_L3SQCREG4);
|
2016-08-15 17:49:07 +08:00
|
|
|
wa_ctx_emit(batch, index, i915_ggtt_offset(engine->scratch) + 256);
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, 0);
|
2015-07-03 21:27:31 +08:00
|
|
|
|
|
|
|
return index;
|
|
|
|
}
|
|
|
|
|
2015-06-20 02:07:01 +08:00
|
|
|
static inline uint32_t wa_ctx_start(struct i915_wa_ctx_bb *wa_ctx,
|
|
|
|
uint32_t offset,
|
|
|
|
uint32_t start_alignment)
|
|
|
|
{
|
|
|
|
return wa_ctx->offset = ALIGN(offset, start_alignment);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int wa_ctx_end(struct i915_wa_ctx_bb *wa_ctx,
|
|
|
|
uint32_t offset,
|
|
|
|
uint32_t size_alignment)
|
|
|
|
{
|
|
|
|
wa_ctx->size = offset - wa_ctx->offset;
|
|
|
|
|
|
|
|
WARN(wa_ctx->size % size_alignment,
|
|
|
|
"wa_ctx_bb failed sanity checks: size %d is not aligned to %d\n",
|
|
|
|
wa_ctx->size, size_alignment);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-16 03:48:06 +08:00
|
|
|
/*
|
|
|
|
* Typically we only have one indirect_ctx and per_ctx batch buffer which are
|
|
|
|
* initialized at the beginning and shared across all contexts but this field
|
|
|
|
* helps us to have multiple batches at different offsets and select them based
|
|
|
|
* on a criteria. At the moment this batch always start at the beginning of the page
|
|
|
|
* and at this point we don't have multiple wa_ctx batch buffers.
|
2015-06-23 22:50:43 +08:00
|
|
|
*
|
2016-07-16 03:48:06 +08:00
|
|
|
* The number of WA applied are not known at the beginning; we use this field
|
|
|
|
* to return the no of DWORDS written.
|
2015-06-20 02:07:01 +08:00
|
|
|
*
|
2016-07-16 03:48:06 +08:00
|
|
|
* It is to be noted that this batch does not contain MI_BATCH_BUFFER_END
|
|
|
|
* so it adds NOOPs as padding to make it cacheline aligned.
|
|
|
|
* MI_BATCH_BUFFER_END will be added to perctx batch and both of them together
|
|
|
|
* makes a complete batch buffer.
|
2015-06-20 02:07:01 +08:00
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen8_init_indirectctx_bb(struct intel_engine_cs *engine,
|
2015-06-20 02:07:01 +08:00
|
|
|
struct i915_wa_ctx_bb *wa_ctx,
|
2016-07-16 03:48:06 +08:00
|
|
|
uint32_t *batch,
|
2015-06-20 02:07:01 +08:00
|
|
|
uint32_t *offset)
|
|
|
|
{
|
2015-06-23 22:46:57 +08:00
|
|
|
uint32_t scratch_addr;
|
2015-06-20 02:07:01 +08:00
|
|
|
uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
|
|
|
|
|
2015-06-20 01:37:12 +08:00
|
|
|
/* WaDisableCtxRestoreArbitration:bdw,chv */
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2015-06-20 01:37:13 +08:00
|
|
|
/* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_BROADWELL(engine->i915)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
int rc = gen8_emit_flush_coherentl3_wa(engine, batch, index);
|
2015-09-21 21:33:35 +08:00
|
|
|
if (rc < 0)
|
|
|
|
return rc;
|
|
|
|
index = rc;
|
2015-06-20 01:37:13 +08:00
|
|
|
}
|
|
|
|
|
2015-06-23 22:46:57 +08:00
|
|
|
/* WaClearSlmSpaceAtContextSwitch:bdw,chv */
|
|
|
|
/* Actual scratch location is at 128 bytes offset */
|
2016-08-15 17:49:07 +08:00
|
|
|
scratch_addr = i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
2015-06-23 22:46:57 +08:00
|
|
|
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |
|
|
|
|
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE));
|
|
|
|
wa_ctx_emit(batch, index, scratch_addr);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
2015-06-23 22:46:57 +08:00
|
|
|
|
2015-06-20 02:07:01 +08:00
|
|
|
/* Pad to end of cacheline */
|
|
|
|
while (index % CACHELINE_DWORDS)
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_NOOP);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* MI_BATCH_BUFFER_END is not required in Indirect ctx BB because
|
|
|
|
* execution depends on the length specified in terms of cache lines
|
|
|
|
* in the register CTX_RCS_INDIRECT_CTX
|
|
|
|
*/
|
|
|
|
|
|
|
|
return wa_ctx_end(wa_ctx, *offset = index, CACHELINE_DWORDS);
|
|
|
|
}
|
|
|
|
|
2016-07-16 03:48:06 +08:00
|
|
|
/*
|
|
|
|
* This batch is started immediately after indirect_ctx batch. Since we ensure
|
|
|
|
* that indirect_ctx ends on a cacheline this batch is aligned automatically.
|
2015-06-20 02:07:01 +08:00
|
|
|
*
|
2016-07-16 03:48:06 +08:00
|
|
|
* The number of DWORDS written are returned using this field.
|
2015-06-20 02:07:01 +08:00
|
|
|
*
|
|
|
|
* This batch is terminated with MI_BATCH_BUFFER_END and so we need not add padding
|
|
|
|
* to align it with cacheline as padding after MI_BATCH_BUFFER_END is redundant.
|
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen8_init_perctx_bb(struct intel_engine_cs *engine,
|
2015-06-20 02:07:01 +08:00
|
|
|
struct i915_wa_ctx_bb *wa_ctx,
|
2016-07-16 03:48:06 +08:00
|
|
|
uint32_t *batch,
|
2015-06-20 02:07:01 +08:00
|
|
|
uint32_t *offset)
|
|
|
|
{
|
|
|
|
uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
|
|
|
|
|
2015-06-20 01:37:12 +08:00
|
|
|
/* WaDisableCtxRestoreArbitration:bdw,chv */
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_ENABLE);
|
2015-06-20 01:37:12 +08:00
|
|
|
|
2015-07-08 17:27:05 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_BATCH_BUFFER_END);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
|
|
|
return wa_ctx_end(wa_ctx, *offset = index, 1);
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen9_init_indirectctx_bb(struct intel_engine_cs *engine,
|
2015-07-14 22:01:27 +08:00
|
|
|
struct i915_wa_ctx_bb *wa_ctx,
|
2016-07-16 03:48:06 +08:00
|
|
|
uint32_t *batch,
|
2015-07-14 22:01:27 +08:00
|
|
|
uint32_t *offset)
|
|
|
|
{
|
2015-07-14 22:01:29 +08:00
|
|
|
int ret;
|
2016-07-26 15:26:29 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2015-07-14 22:01:27 +08:00
|
|
|
uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
|
|
|
|
|
2015-07-14 22:01:28 +08:00
|
|
|
/* WaDisableCtxRestoreArbitration:skl,bxt */
|
2016-07-26 15:26:29 +08:00
|
|
|
if (IS_SKL_REVID(dev_priv, 0, SKL_REVID_D0) ||
|
|
|
|
IS_BXT_REVID(dev_priv, 0, BXT_REVID_A1))
|
2015-07-14 22:01:28 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_DISABLE);
|
2015-07-14 22:01:27 +08:00
|
|
|
|
2015-07-14 22:01:29 +08:00
|
|
|
/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt */
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen8_emit_flush_coherentl3_wa(engine, batch, index);
|
2015-07-14 22:01:29 +08:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
index = ret;
|
|
|
|
|
2016-07-20 19:26:13 +08:00
|
|
|
/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl */
|
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
|
|
|
|
wa_ctx_emit_reg(batch, index, COMMON_SLICE_CHICKEN2);
|
|
|
|
wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(
|
|
|
|
GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE));
|
|
|
|
wa_ctx_emit(batch, index, MI_NOOP);
|
|
|
|
|
2016-06-07 22:19:15 +08:00
|
|
|
/* WaClearSlmSpaceAtContextSwitch:kbl */
|
|
|
|
/* Actual scratch location is at 128 bytes offset */
|
2016-06-07 22:19:15 +08:00
|
|
|
if (IS_KBL_REVID(dev_priv, 0, KBL_REVID_A0)) {
|
2016-08-15 17:48:58 +08:00
|
|
|
u32 scratch_addr =
|
2016-08-15 17:49:07 +08:00
|
|
|
i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
2016-06-07 22:19:15 +08:00
|
|
|
|
|
|
|
wa_ctx_emit(batch, index, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
wa_ctx_emit(batch, index, (PIPE_CONTROL_FLUSH_L3 |
|
|
|
|
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE));
|
|
|
|
wa_ctx_emit(batch, index, scratch_addr);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
}
|
2016-07-05 17:01:30 +08:00
|
|
|
|
|
|
|
/* WaMediaPoolStateCmdInWABB:bxt */
|
|
|
|
if (HAS_POOLED_EU(engine->i915)) {
|
|
|
|
/*
|
|
|
|
* EU pool configuration is setup along with golden context
|
|
|
|
* during context initialization. This value depends on
|
|
|
|
* device type (2x6 or 3x6) and needs to be updated based
|
|
|
|
* on which subslice is disabled especially for 2x6
|
|
|
|
* devices, however it is safe to load default
|
|
|
|
* configuration of 3x6 device instead of masking off
|
|
|
|
* corresponding bits because HW ignores bits of a disabled
|
|
|
|
* subslice and drops down to appropriate config. Please
|
|
|
|
* see render_state_setup() in i915_gem_render_state.c for
|
|
|
|
* possible configurations, to avoid duplication they are
|
|
|
|
* not shown here again.
|
|
|
|
*/
|
|
|
|
u32 eu_pool_config = 0x00777000;
|
|
|
|
wa_ctx_emit(batch, index, GEN9_MEDIA_POOL_STATE);
|
|
|
|
wa_ctx_emit(batch, index, GEN9_MEDIA_POOL_ENABLE);
|
|
|
|
wa_ctx_emit(batch, index, eu_pool_config);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
wa_ctx_emit(batch, index, 0);
|
|
|
|
}
|
|
|
|
|
2015-07-14 22:01:27 +08:00
|
|
|
/* Pad to end of cacheline */
|
|
|
|
while (index % CACHELINE_DWORDS)
|
|
|
|
wa_ctx_emit(batch, index, MI_NOOP);
|
|
|
|
|
|
|
|
return wa_ctx_end(wa_ctx, *offset = index, CACHELINE_DWORDS);
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
|
2015-07-14 22:01:27 +08:00
|
|
|
struct i915_wa_ctx_bb *wa_ctx,
|
2016-07-16 03:48:06 +08:00
|
|
|
uint32_t *batch,
|
2015-07-14 22:01:27 +08:00
|
|
|
uint32_t *offset)
|
|
|
|
{
|
|
|
|
uint32_t index = wa_ctx_start(wa_ctx, *offset, CACHELINE_DWORDS);
|
|
|
|
|
2015-07-14 22:01:30 +08:00
|
|
|
/* WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken:skl,bxt */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_B0) ||
|
|
|
|
IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1)) {
|
2015-07-14 22:01:30 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(1));
|
2015-11-05 05:20:08 +08:00
|
|
|
wa_ctx_emit_reg(batch, index, GEN9_SLICE_COMMON_ECO_CHICKEN0);
|
2015-07-14 22:01:30 +08:00
|
|
|
wa_ctx_emit(batch, index,
|
|
|
|
_MASKED_BIT_ENABLE(DISABLE_PIXEL_MASK_CAMMING));
|
|
|
|
wa_ctx_emit(batch, index, MI_NOOP);
|
|
|
|
}
|
|
|
|
|
2016-03-21 22:37:29 +08:00
|
|
|
/* WaClearTdlStateAckDirtyBits:bxt */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_B0)) {
|
2016-03-21 22:37:29 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_LOAD_REGISTER_IMM(4));
|
|
|
|
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN8_STATE_ACK);
|
|
|
|
wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(GEN9_SUBSLICE_TDL_ACK_BITS));
|
|
|
|
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN9_STATE_ACK_SLICE1);
|
|
|
|
wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(GEN9_SUBSLICE_TDL_ACK_BITS));
|
|
|
|
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN9_STATE_ACK_SLICE2);
|
|
|
|
wa_ctx_emit(batch, index, _MASKED_BIT_DISABLE(GEN9_SUBSLICE_TDL_ACK_BITS));
|
|
|
|
|
|
|
|
wa_ctx_emit_reg(batch, index, GEN7_ROW_CHICKEN2);
|
|
|
|
/* dummy write to CS, mask bits are 0 to ensure the register is not modified */
|
|
|
|
wa_ctx_emit(batch, index, 0x0);
|
|
|
|
wa_ctx_emit(batch, index, MI_NOOP);
|
|
|
|
}
|
|
|
|
|
2015-07-14 22:01:28 +08:00
|
|
|
/* WaDisableCtxRestoreArbitration:skl,bxt */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_SKL_REVID(engine->i915, 0, SKL_REVID_D0) ||
|
|
|
|
IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
|
2015-07-14 22:01:28 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_ARB_ON_OFF | MI_ARB_ENABLE);
|
|
|
|
|
2015-07-14 22:01:27 +08:00
|
|
|
wa_ctx_emit(batch, index, MI_BATCH_BUFFER_END);
|
|
|
|
|
|
|
|
return wa_ctx_end(wa_ctx, *offset = index, 1);
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
|
2015-06-20 02:07:01 +08:00
|
|
|
{
|
2016-08-15 17:49:04 +08:00
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
struct i915_vma *vma;
|
|
|
|
int err;
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2016-08-15 17:49:04 +08:00
|
|
|
obj = i915_gem_object_create(&engine->i915->drm, PAGE_ALIGN(size));
|
|
|
|
if (IS_ERR(obj))
|
|
|
|
return PTR_ERR(obj);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2016-08-15 17:49:04 +08:00
|
|
|
vma = i915_vma_create(obj, &engine->i915->ggtt.base, NULL);
|
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
err = PTR_ERR(vma);
|
|
|
|
goto err;
|
2015-06-20 02:07:01 +08:00
|
|
|
}
|
|
|
|
|
2016-08-15 17:49:04 +08:00
|
|
|
err = i915_vma_pin(vma, 0, PAGE_SIZE, PIN_GLOBAL | PIN_HIGH);
|
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
engine->wa_ctx.vma = vma;
|
2015-06-20 02:07:01 +08:00
|
|
|
return 0;
|
2016-08-15 17:49:04 +08:00
|
|
|
|
|
|
|
err:
|
|
|
|
i915_gem_object_put(obj);
|
|
|
|
return err;
|
2015-06-20 02:07:01 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static void lrc_destroy_wa_ctx_obj(struct intel_engine_cs *engine)
|
2015-06-20 02:07:01 +08:00
|
|
|
{
|
2016-08-15 17:49:05 +08:00
|
|
|
i915_vma_unpin_and_release(&engine->wa_ctx.vma);
|
2015-06-20 02:07:01 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int intel_init_workaround_bb(struct intel_engine_cs *engine)
|
2015-06-20 02:07:01 +08:00
|
|
|
{
|
2016-08-15 17:49:04 +08:00
|
|
|
struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
|
2015-06-20 02:07:01 +08:00
|
|
|
uint32_t *batch;
|
|
|
|
uint32_t offset;
|
|
|
|
struct page *page;
|
2016-08-15 17:49:04 +08:00
|
|
|
int ret;
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
WARN_ON(engine->id != RCS);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2015-06-23 22:50:44 +08:00
|
|
|
/* update this when WA for higher Gen are added */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(engine->i915) > 9) {
|
2015-07-14 22:01:27 +08:00
|
|
|
DRM_ERROR("WA batch buffer is not initialized for Gen%d\n",
|
2016-05-06 22:40:21 +08:00
|
|
|
INTEL_GEN(engine->i915));
|
2015-06-23 22:50:44 +08:00
|
|
|
return 0;
|
2015-07-14 22:01:27 +08:00
|
|
|
}
|
2015-06-23 22:50:44 +08:00
|
|
|
|
2015-06-20 01:37:11 +08:00
|
|
|
/* some WA perform writes to scratch page, ensure it is valid */
|
2016-08-15 17:48:58 +08:00
|
|
|
if (!engine->scratch) {
|
2016-03-16 19:00:37 +08:00
|
|
|
DRM_ERROR("scratch page not allocated for %s\n", engine->name);
|
2015-06-20 01:37:11 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = lrc_setup_wa_ctx_obj(engine, PAGE_SIZE);
|
2015-06-20 02:07:01 +08:00
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_DRIVER("Failed to setup context WA page: %d\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-08-15 17:49:04 +08:00
|
|
|
page = i915_gem_object_get_dirty_page(wa_ctx->vma->obj, 0);
|
2015-06-20 02:07:01 +08:00
|
|
|
batch = kmap_atomic(page);
|
|
|
|
offset = 0;
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN8(engine->i915)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen8_init_indirectctx_bb(engine,
|
2015-06-20 02:07:01 +08:00
|
|
|
&wa_ctx->indirect_ctx,
|
|
|
|
batch,
|
|
|
|
&offset);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen8_init_perctx_bb(engine,
|
2015-06-20 02:07:01 +08:00
|
|
|
&wa_ctx->per_ctx,
|
|
|
|
batch,
|
|
|
|
&offset);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2016-05-06 22:40:21 +08:00
|
|
|
} else if (IS_GEN9(engine->i915)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen9_init_indirectctx_bb(engine,
|
2015-07-14 22:01:27 +08:00
|
|
|
&wa_ctx->indirect_ctx,
|
|
|
|
batch,
|
|
|
|
&offset);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen9_init_perctx_bb(engine,
|
2015-07-14 22:01:27 +08:00
|
|
|
&wa_ctx->per_ctx,
|
|
|
|
batch,
|
|
|
|
&offset);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2015-06-20 02:07:01 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
kunmap_atomic(batch);
|
|
|
|
if (ret)
|
2016-03-16 19:00:37 +08:00
|
|
|
lrc_destroy_wa_ctx_obj(engine);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-04-12 22:40:41 +08:00
|
|
|
static void lrc_init_hws(struct intel_engine_cs *engine)
|
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-04-12 22:40:41 +08:00
|
|
|
|
|
|
|
I915_WRITE(RING_HWS_PGA(engine->mmio_base),
|
2016-08-15 17:48:57 +08:00
|
|
|
engine->status_page.ggtt_offset);
|
2016-04-12 22:40:41 +08:00
|
|
|
POSTING_READ(RING_HWS_PGA(engine->mmio_base));
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen8_init_common_ring(struct intel_engine_cs *engine)
|
2014-07-25 00:04:24 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-02-27 00:58:32 +08:00
|
|
|
unsigned int next_context_status_buffer_hw;
|
2014-07-25 00:04:24 +08:00
|
|
|
|
2016-04-12 22:40:41 +08:00
|
|
|
lrc_init_hws(engine);
|
2015-09-11 19:53:46 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_WRITE_IMR(engine,
|
|
|
|
~(engine->irq_enable_mask | engine->irq_keep_mask));
|
|
|
|
I915_WRITE(RING_HWSTAM(engine->mmio_base), 0xffffffff);
|
2014-07-25 00:04:31 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_WRITE(RING_MODE_GEN7(engine),
|
2014-07-25 00:04:24 +08:00
|
|
|
_MASKED_BIT_DISABLE(GFX_REPLAY_MODE) |
|
|
|
|
_MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE));
|
2016-03-16 19:00:37 +08:00
|
|
|
POSTING_READ(RING_MODE_GEN7(engine));
|
2015-09-28 20:25:12 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Instead of resetting the Context Status Buffer (CSB) read pointer to
|
|
|
|
* zero, we need to read the write pointer from hardware and use its
|
|
|
|
* value because "this register is power context save restored".
|
|
|
|
* Effectively, these states have been observed:
|
|
|
|
*
|
|
|
|
* | Suspend-to-idle (freeze) | Suspend-to-RAM (mem) |
|
|
|
|
* BDW | CSB regs not reset | CSB regs reset |
|
|
|
|
* CHT | CSB regs not reset | CSB regs not reset |
|
2016-01-06 02:30:05 +08:00
|
|
|
* SKL | ? | ? |
|
|
|
|
* BXT | ? | ? |
|
2015-09-28 20:25:12 +08:00
|
|
|
*/
|
2016-01-06 02:30:05 +08:00
|
|
|
next_context_status_buffer_hw =
|
2016-03-16 19:00:37 +08:00
|
|
|
GEN8_CSB_WRITE_PTR(I915_READ(RING_CONTEXT_STATUS_PTR(engine)));
|
2015-09-28 20:25:12 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* When the CSB registers are reset (also after power-up / gpu reset),
|
|
|
|
* CSB write pointer is set to all 1's, which is not valid, use '5' in
|
|
|
|
* this special case, so the first element read is CSB[0].
|
|
|
|
*/
|
|
|
|
if (next_context_status_buffer_hw == GEN8_CSB_PTR_MASK)
|
|
|
|
next_context_status_buffer_hw = (GEN8_CSB_ENTRIES - 1);
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->next_context_status_buffer = next_context_status_buffer_hw;
|
|
|
|
DRM_DEBUG_DRIVER("Execlists enabled for %s\n", engine->name);
|
2014-07-25 00:04:24 +08:00
|
|
|
|
2016-03-22 00:26:59 +08:00
|
|
|
intel_engine_init_hangcheck(engine);
|
2014-07-25 00:04:24 +08:00
|
|
|
|
2016-04-13 22:03:25 +08:00
|
|
|
return intel_mocs_init_engine(engine);
|
2014-07-25 00:04:24 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen8_init_render_ring(struct intel_engine_cs *engine)
|
2014-07-25 00:04:24 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-07-25 00:04:24 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen8_init_common_ring(engine);
|
2014-07-25 00:04:24 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* We need to disable the AsyncFlip performance optimisations in order
|
|
|
|
* to use MI_WAIT_FOR_EVENT within the CS. It should already be
|
|
|
|
* programmed to '1' on all products.
|
|
|
|
*
|
|
|
|
* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv,bdw,chv
|
|
|
|
*/
|
|
|
|
I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
|
|
|
|
|
|
|
|
I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
return init_workarounds_ring(engine);
|
2014-07-25 00:04:24 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int gen9_init_render_ring(struct intel_engine_cs *engine)
|
2015-02-10 03:33:08 +08:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
ret = gen8_init_common_ring(engine);
|
2015-02-10 03:33:08 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
return init_workarounds_ring(engine);
|
2015-02-10 03:33:08 +08:00
|
|
|
}
|
|
|
|
|
2015-06-26 20:46:14 +08:00
|
|
|
static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)
|
|
|
|
{
|
|
|
|
struct i915_hw_ppgtt *ppgtt = req->ctx->ppgtt;
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = req->ring;
|
2016-03-16 19:00:38 +08:00
|
|
|
struct intel_engine_cs *engine = req->engine;
|
2015-06-26 20:46:14 +08:00
|
|
|
const int num_lri_cmds = GEN8_LEGACY_PDPES * 2;
|
|
|
|
int i, ret;
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(req, num_lri_cmds * 2 + 2);
|
2015-06-26 20:46:14 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, MI_LOAD_REGISTER_IMM(num_lri_cmds));
|
2015-06-26 20:46:14 +08:00
|
|
|
for (i = GEN8_LEGACY_PDPES - 1; i >= 0; i--) {
|
|
|
|
const dma_addr_t pd_daddr = i915_page_dir_dma_addr(ppgtt, i);
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit_reg(ring, GEN8_RING_PDP_UDW(engine, i));
|
|
|
|
intel_ring_emit(ring, upper_32_bits(pd_daddr));
|
|
|
|
intel_ring_emit_reg(ring, GEN8_RING_PDP_LDW(engine, i));
|
|
|
|
intel_ring_emit(ring, lower_32_bits(pd_daddr));
|
2015-06-26 20:46:14 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
|
|
|
intel_ring_advance(ring);
|
2015-06-26 20:46:14 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-30 00:44:03 +08:00
|
|
|
static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 len,
|
|
|
|
unsigned int dispatch_flags)
|
2014-07-25 00:04:32 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = req->ring;
|
2015-02-13 19:48:10 +08:00
|
|
|
bool ppgtt = !(dispatch_flags & I915_DISPATCH_SECURE);
|
2014-07-25 00:04:32 +08:00
|
|
|
int ret;
|
|
|
|
|
2015-06-26 20:46:14 +08:00
|
|
|
/* Don't rely in hw updating PDPs, specially in lite-restore.
|
|
|
|
* Ideally, we should set Force PD Restore in ctx descriptor,
|
|
|
|
* but we can't. Force Restore would be a second option, but
|
|
|
|
* it is unsafe in case of lite-restore (because the ctx is
|
2015-07-30 18:06:23 +08:00
|
|
|
* not idle). PML4 is allocated during ppgtt init so this is
|
|
|
|
* not needed in 48-bit.*/
|
2015-06-26 20:46:14 +08:00
|
|
|
if (req->ctx->ppgtt &&
|
2016-03-16 19:00:39 +08:00
|
|
|
(intel_engine_flag(req->engine) & req->ctx->ppgtt->pd_dirty_rings)) {
|
2015-08-28 15:41:14 +08:00
|
|
|
if (!USES_FULL_48BIT_PPGTT(req->i915) &&
|
2016-05-06 22:40:21 +08:00
|
|
|
!intel_vgpu_active(req->i915)) {
|
2015-07-30 18:06:23 +08:00
|
|
|
ret = intel_logical_ring_emit_pdps(req);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
2015-06-26 20:46:14 +08:00
|
|
|
|
2016-03-16 19:00:39 +08:00
|
|
|
req->ctx->ppgtt->pd_dirty_rings &= ~intel_engine_flag(req->engine);
|
2015-06-26 20:46:14 +08:00
|
|
|
}
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(req, 4);
|
2014-07-25 00:04:32 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
/* FIXME(BDW): Address space and security selectors. */
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, MI_BATCH_BUFFER_START_GEN8 |
|
|
|
|
(ppgtt<<8) |
|
|
|
|
(dispatch_flags & I915_DISPATCH_RS ?
|
|
|
|
MI_BATCH_RESOURCE_STREAMER : 0));
|
|
|
|
intel_ring_emit(ring, lower_32_bits(offset));
|
|
|
|
intel_ring_emit(ring, upper_32_bits(offset));
|
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
|
|
|
intel_ring_advance(ring);
|
2014-07-25 00:04:32 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void gen8_logical_ring_enable_irq(struct intel_engine_cs *engine)
|
2014-07-25 00:04:31 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-07-02 00:23:27 +08:00
|
|
|
I915_WRITE_IMR(engine,
|
|
|
|
~(engine->irq_enable_mask | engine->irq_keep_mask));
|
|
|
|
POSTING_READ_FW(RING_IMR(engine->mmio_base));
|
2014-07-25 00:04:31 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void gen8_logical_ring_disable_irq(struct intel_engine_cs *engine)
|
2014-07-25 00:04:31 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-07-02 00:23:27 +08:00
|
|
|
I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
|
2014-07-25 00:04:31 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
static int gen8_emit_flush(struct drm_i915_gem_request *request, u32 mode)
|
2014-07-25 00:04:28 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = request->ring;
|
|
|
|
u32 cmd;
|
2014-07-25 00:04:28 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(request, 4);
|
2014-07-25 00:04:28 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
cmd = MI_FLUSH_DW + 1;
|
|
|
|
|
2015-01-22 21:42:00 +08:00
|
|
|
/* We always require a command barrier so that subsequent
|
|
|
|
* commands, such as breadcrumb interrupts, are strictly ordered
|
|
|
|
* wrt the contents of the write cache being flushed to memory
|
|
|
|
* (and thus being coherent from the CPU).
|
|
|
|
*/
|
|
|
|
cmd |= MI_FLUSH_DW_STORE_INDEX | MI_FLUSH_DW_OP_STOREDW;
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2015-01-22 21:42:00 +08:00
|
|
|
cmd |= MI_INVALIDATE_TLB;
|
2016-08-03 05:50:19 +08:00
|
|
|
if (request->engine->id == VCS)
|
2015-01-22 21:42:00 +08:00
|
|
|
cmd |= MI_INVALIDATE_BSD;
|
2014-07-25 00:04:28 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, cmd);
|
|
|
|
intel_ring_emit(ring,
|
|
|
|
I915_GEM_HWS_SCRATCH_ADDR |
|
|
|
|
MI_FLUSH_DW_USE_GTT);
|
|
|
|
intel_ring_emit(ring, 0); /* upper addr */
|
|
|
|
intel_ring_emit(ring, 0); /* value */
|
|
|
|
intel_ring_advance(ring);
|
2014-07-25 00:04:28 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-30 00:43:59 +08:00
|
|
|
static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
|
2016-08-03 05:50:25 +08:00
|
|
|
u32 mode)
|
2014-07-25 00:04:28 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = request->ring;
|
2016-08-03 05:50:18 +08:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2016-08-15 17:49:07 +08:00
|
|
|
u32 scratch_addr =
|
|
|
|
i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
2016-06-07 22:19:10 +08:00
|
|
|
bool vf_flush_wa = false, dc_flush_wa = false;
|
2014-07-25 00:04:28 +08:00
|
|
|
u32 flags = 0;
|
|
|
|
int ret;
|
2016-06-07 22:19:10 +08:00
|
|
|
int len;
|
2014-07-25 00:04:28 +08:00
|
|
|
|
|
|
|
flags |= PIPE_CONTROL_CS_STALL;
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_FLUSH) {
|
2014-07-25 00:04:28 +08:00
|
|
|
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
|
|
|
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
2016-01-14 10:59:39 +08:00
|
|
|
flags |= PIPE_CONTROL_DC_FLUSH_ENABLE;
|
2015-08-21 23:08:41 +08:00
|
|
|
flags |= PIPE_CONTROL_FLUSH_ENABLE;
|
2014-07-25 00:04:28 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2014-07-25 00:04:28 +08:00
|
|
|
flags |= PIPE_CONTROL_TLB_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_VF_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_CONST_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_STATE_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_QW_WRITE;
|
|
|
|
flags |= PIPE_CONTROL_GLOBAL_GTT_IVB;
|
|
|
|
|
2015-12-18 01:49:57 +08:00
|
|
|
/*
|
|
|
|
* On GEN9: before VF_CACHE_INVALIDATE we need to emit a NULL
|
|
|
|
* pipe control.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN9(request->i915))
|
2015-12-18 01:49:57 +08:00
|
|
|
vf_flush_wa = true;
|
2016-06-07 22:19:10 +08:00
|
|
|
|
|
|
|
/* WaForGAMHang:kbl */
|
|
|
|
if (IS_KBL_REVID(request->i915, 0, KBL_REVID_B0))
|
|
|
|
dc_flush_wa = true;
|
2015-12-18 01:49:57 +08:00
|
|
|
}
|
2015-01-26 05:27:11 +08:00
|
|
|
|
2016-06-07 22:19:10 +08:00
|
|
|
len = 6;
|
|
|
|
|
|
|
|
if (vf_flush_wa)
|
|
|
|
len += 6;
|
|
|
|
|
|
|
|
if (dc_flush_wa)
|
|
|
|
len += 12;
|
|
|
|
|
|
|
|
ret = intel_ring_begin(request, len);
|
2014-07-25 00:04:28 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2015-01-26 05:27:11 +08:00
|
|
|
if (vf_flush_wa) {
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
2015-01-26 05:27:11 +08:00
|
|
|
}
|
|
|
|
|
2016-06-07 22:19:10 +08:00
|
|
|
if (dc_flush_wa) {
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
intel_ring_emit(ring, PIPE_CONTROL_DC_FLUSH_ENABLE);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
2016-06-07 22:19:10 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
intel_ring_emit(ring, flags);
|
|
|
|
intel_ring_emit(ring, scratch_addr);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
2016-06-07 22:19:10 +08:00
|
|
|
|
|
|
|
if (dc_flush_wa) {
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
intel_ring_emit(ring, PIPE_CONTROL_CS_STALL);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, 0);
|
2016-06-07 22:19:10 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_advance(ring);
|
2014-07-25 00:04:28 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-04-09 17:57:54 +08:00
|
|
|
static void bxt_a_seqno_barrier(struct intel_engine_cs *engine)
|
2015-08-14 23:35:27 +08:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* On BXT A steppings there is a HW coherency issue whereby the
|
|
|
|
* MI_STORE_DATA_IMM storing the completed request's seqno
|
|
|
|
* occasionally doesn't invalidate the CPU cache. Work around this by
|
|
|
|
* clflushing the corresponding cacheline whenever the caller wants
|
|
|
|
* the coherency to be guaranteed. Note that this cacheline is known
|
|
|
|
* to be clean at this point, since we only write it in
|
|
|
|
* bxt_a_set_seqno(), where we also do a clflush after the write. So
|
|
|
|
* this clflush in practice becomes an invalidate operation.
|
|
|
|
*/
|
2016-04-09 17:57:54 +08:00
|
|
|
intel_flush_status_page(engine, I915_GEM_HWS_INDEX);
|
2015-08-14 23:35:27 +08:00
|
|
|
}
|
|
|
|
|
2016-01-20 21:43:35 +08:00
|
|
|
/*
|
|
|
|
* Reserve space for 2 NOOPs at the end of each request to be
|
|
|
|
* used as a workaround for not being allowed to do lite
|
|
|
|
* restore with HEAD==TAIL (WaIdleLiteRestore).
|
|
|
|
*/
|
|
|
|
#define WA_TAIL_DWORDS 2
|
|
|
|
|
2015-05-30 00:44:01 +08:00
|
|
|
static int gen8_emit_request(struct drm_i915_gem_request *request)
|
2014-07-25 00:04:27 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = request->ring;
|
2014-07-25 00:04:27 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(request, 6 + WA_TAIL_DWORDS);
|
2014-07-25 00:04:27 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-01-20 21:43:35 +08:00
|
|
|
/* w/a: bit 5 needs to be zero for MI_FLUSH_DW address. */
|
|
|
|
BUILD_BUG_ON(I915_GEM_HWS_INDEX_ADDR & (1 << 5));
|
2014-07-25 00:04:27 +08:00
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, (MI_FLUSH_DW + 1) | MI_FLUSH_DW_OP_STOREDW);
|
|
|
|
intel_ring_emit(ring,
|
|
|
|
intel_hws_seqno_address(request->engine) |
|
|
|
|
MI_FLUSH_DW_USE_GTT);
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, request->fence.seqno);
|
|
|
|
intel_ring_emit(ring, MI_USER_INTERRUPT);
|
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
2016-08-03 05:50:31 +08:00
|
|
|
return intel_logical_ring_advance(request);
|
2016-01-20 21:43:35 +08:00
|
|
|
}
|
2014-07-25 00:04:27 +08:00
|
|
|
|
2016-01-20 21:43:35 +08:00
|
|
|
static int gen8_emit_request_render(struct drm_i915_gem_request *request)
|
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = request->ring;
|
2016-01-20 21:43:35 +08:00
|
|
|
int ret;
|
2015-04-16 01:11:33 +08:00
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
ret = intel_ring_begin(request, 8 + WA_TAIL_DWORDS);
|
2016-01-20 21:43:35 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-04-12 21:51:55 +08:00
|
|
|
/* We're using qword write, seqno should be aligned to 8 bytes. */
|
|
|
|
BUILD_BUG_ON(I915_GEM_HWS_INDEX & 1);
|
|
|
|
|
2016-01-20 21:43:35 +08:00
|
|
|
/* w/a for post sync ops following a GPGPU operation we
|
|
|
|
* need a prior CS_STALL, which is emitted by the flush
|
|
|
|
* following the batch.
|
|
|
|
*/
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, GFX_OP_PIPE_CONTROL(6));
|
|
|
|
intel_ring_emit(ring,
|
|
|
|
(PIPE_CONTROL_GLOBAL_GTT_IVB |
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE));
|
|
|
|
intel_ring_emit(ring, intel_hws_seqno_address(request->engine));
|
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, i915_gem_request_get_seqno(request));
|
2016-04-12 21:51:55 +08:00
|
|
|
/* We're thrashing one dword of HWS. */
|
2016-08-03 05:50:18 +08:00
|
|
|
intel_ring_emit(ring, 0);
|
|
|
|
intel_ring_emit(ring, MI_USER_INTERRUPT);
|
|
|
|
intel_ring_emit(ring, MI_NOOP);
|
2016-08-03 05:50:31 +08:00
|
|
|
return intel_logical_ring_advance(request);
|
2014-07-25 00:04:27 +08:00
|
|
|
}
|
|
|
|
|
2015-05-30 00:43:44 +08:00
|
|
|
static int gen8_init_rcs_context(struct drm_i915_gem_request *req)
|
2014-12-02 20:50:48 +08:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2015-05-30 00:43:54 +08:00
|
|
|
ret = intel_logical_ring_workarounds_emit(req);
|
2014-12-02 20:50:48 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2015-07-11 01:13:11 +08:00
|
|
|
ret = intel_rcs_context_init_mocs(req);
|
|
|
|
/*
|
|
|
|
* Failing to program the MOCS is non-fatal.The system will not
|
|
|
|
* run at peak performance. So generate an error and carry on.
|
|
|
|
*/
|
|
|
|
if (ret)
|
|
|
|
DRM_ERROR("MOCS failed to program: expect performance issues.\n");
|
|
|
|
|
2016-08-03 05:50:36 +08:00
|
|
|
return i915_gem_render_state_init(req);
|
2014-12-02 20:50:48 +08:00
|
|
|
}
|
|
|
|
|
2014-07-25 00:04:48 +08:00
|
|
|
/**
|
|
|
|
* intel_logical_ring_cleanup() - deallocate the Engine Command Streamer
|
2016-06-03 21:02:17 +08:00
|
|
|
* @engine: Engine Command Streamer.
|
2014-07-25 00:04:48 +08:00
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
|
2014-07-25 00:04:22 +08:00
|
|
|
{
|
2014-10-31 20:00:26 +08:00
|
|
|
struct drm_i915_private *dev_priv;
|
2014-07-25 00:04:30 +08:00
|
|
|
|
2016-03-16 19:00:40 +08:00
|
|
|
if (!intel_engine_initialized(engine))
|
2014-07-25 00:04:23 +08:00
|
|
|
return;
|
|
|
|
|
drm/i915: Move execlists irq handler to a bottom half
Doing a lot of work in the interrupt handler introduces huge
latencies to the system as a whole.
Most dramatic effect can be seen by running an all engine
stress test like igt/gem_exec_nop/all where, when the kernel
config is lean enough, the whole system can be brought into
multi-second periods of complete non-interactivty. That can
look for example like this:
NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [kworker/u8:3:143]
Modules linked in: [redacted for brevity]
CPU: 0 PID: 143 Comm: kworker/u8:3 Tainted: G U L 4.5.0-160321+ #183
Hardware name: Intel Corporation Broadwell Client platform/WhiteTip Mountain 1
Workqueue: i915 gen6_pm_rps_work [i915]
task: ffff8800aae88000 ti: ffff8800aae90000 task.ti: ffff8800aae90000
RIP: 0010:[<ffffffff8104a3c2>] [<ffffffff8104a3c2>] __do_softirq+0x72/0x1d0
RSP: 0000:ffff88014f403f38 EFLAGS: 00000206
RAX: ffff8800aae94000 RBX: 0000000000000000 RCX: 00000000000006e0
RDX: 0000000000000020 RSI: 0000000004208060 RDI: 0000000000215d80
RBP: ffff88014f403f80 R08: 0000000b1b42c180 R09: 0000000000000022
R10: 0000000000000004 R11: 00000000ffffffff R12: 000000000000a030
R13: 0000000000000082 R14: ffff8800aa4d0080 R15: 0000000000000082
FS: 0000000000000000(0000) GS:ffff88014f400000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007fa53b90c000 CR3: 0000000001a0a000 CR4: 00000000001406f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
Stack:
042080601b33869f ffff8800aae94000 00000000fffc2678 ffff88010000000a
0000000000000000 000000000000a030 0000000000005302 ffff8800aa4d0080
0000000000000206 ffff88014f403f90 ffffffff8104a716 ffff88014f403fa8
Call Trace:
<IRQ>
[<ffffffff8104a716>] irq_exit+0x86/0x90
[<ffffffff81031e7d>] smp_apic_timer_interrupt+0x3d/0x50
[<ffffffff814f3eac>] apic_timer_interrupt+0x7c/0x90
<EOI>
[<ffffffffa01c5b40>] ? gen8_write64+0x1a0/0x1a0 [i915]
[<ffffffff814f2b39>] ? _raw_spin_unlock_irqrestore+0x9/0x20
[<ffffffffa01c5c44>] gen8_write32+0x104/0x1a0 [i915]
[<ffffffff8132c6a2>] ? n_tty_receive_buf_common+0x372/0xae0
[<ffffffffa017cc9e>] gen6_set_rps_thresholds+0x1be/0x330 [i915]
[<ffffffffa017eaf0>] gen6_set_rps+0x70/0x200 [i915]
[<ffffffffa0185375>] intel_set_rps+0x25/0x30 [i915]
[<ffffffffa01768fd>] gen6_pm_rps_work+0x10d/0x2e0 [i915]
[<ffffffff81063852>] ? finish_task_switch+0x72/0x1c0
[<ffffffff8105ab29>] process_one_work+0x139/0x350
[<ffffffff8105b186>] worker_thread+0x126/0x490
[<ffffffff8105b060>] ? rescuer_thread+0x320/0x320
[<ffffffff8105fa64>] kthread+0xc4/0xe0
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
[<ffffffff814f351f>] ret_from_fork+0x3f/0x70
[<ffffffff8105f9a0>] ? kthread_create_on_node+0x170/0x170
I could not explain, or find a code path, which would explain
a +20 second lockup, but from some instrumentation it was
apparent the interrupts off proportion of time was between
10-25% under heavy load which is quite bad.
When a interrupt "cliff" is reached, which was >~320k irq/s on
my machine, the whole system goes into a terrible state of the
above described multi-second lockups.
By moving the GT interrupt handling to a tasklet in a most
simple way, the problem above disappears completely.
Testing the effect on sytem-wide latencies using
igt/gem_syslatency shows the following before this patch:
gem_syslatency: cycles=1532739, latency mean=416531.829us max=2499237us
gem_syslatency: cycles=1839434, latency mean=1458099.157us max=4998944us
gem_syslatency: cycles=1432570, latency mean=2688.451us max=1201185us
gem_syslatency: cycles=1533543, latency mean=416520.499us max=2498886us
This shows that the unrelated process is experiencing huge
delays in its wake-up latency. After the patch the results
look like this:
gem_syslatency: cycles=808907, latency mean=53.133us max=1640us
gem_syslatency: cycles=862154, latency mean=62.778us max=2117us
gem_syslatency: cycles=856039, latency mean=58.079us max=2123us
gem_syslatency: cycles=841683, latency mean=56.914us max=1667us
Showing a huge improvement in the unrelated process wake-up
latency. It also shows an approximate halving in the number
of total empty batches submitted during the test. This may
not be worrying since the test puts the driver under
a very unrealistic load with ncpu threads doing empty batch
submission to all GPU engines each.
Another benefit compared to the hard-irq handling is that now
work on all engines can be dispatched in parallel since we can
have up to number of CPUs active tasklets. (While previously
a single hard-irq would serially dispatch on one engine after
another.)
More interesting scenario with regards to throughput is
"gem_latency -n 100" which shows 25% better throughput and
CPU usage, and 14% better dispatch latencies.
I did not find any gains or regressions with Synmark2 or
GLbench under light testing. More benchmarking is certainly
required.
v2:
* execlists_lock should be taken as spin_lock_bh when
queuing work from userspace now. (Chris Wilson)
* uncore.lock must be taken with spin_lock_irq when
submitting requests since that now runs from either
softirq or process context.
v3:
* Expanded commit message with more testing data;
* converted missed locking sites to _bh;
* added execlist_lock comment. (Chris Wilson)
v4:
* Mention dispatch parallelism in commit. (Chris Wilson)
* Do not hold uncore.lock over MMIO reads since the block
is already serialised per-engine via the tasklet itself.
(Chris Wilson)
* intel_lrc_irq_handler should be static. (Chris Wilson)
* Cancel/sync the tasklet on GPU reset. (Chris Wilson)
* Document and WARN that tasklet cannot be active/pending
on engine cleanup. (Chris Wilson/Imre Deak)
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Testcase: igt/gem_exec_nop/all
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94350
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1459768316-6670-1-git-send-email-tvrtko.ursulin@linux.intel.com
2016-04-04 19:11:56 +08:00
|
|
|
/*
|
|
|
|
* Tasklet cannot be active at this point due intel_mark_active/idle
|
|
|
|
* so this is just for documentation.
|
|
|
|
*/
|
|
|
|
if (WARN_ON(test_bit(TASKLET_STATE_SCHED, &engine->irq_tasklet.state)))
|
|
|
|
tasklet_kill(&engine->irq_tasklet);
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
dev_priv = engine->i915;
|
2014-10-31 20:00:26 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (engine->buffer) {
|
|
|
|
WARN_ON((I915_READ_MODE(engine) & MODE_IDLE) == 0);
|
2015-12-08 23:02:36 +08:00
|
|
|
}
|
2014-07-25 00:04:23 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (engine->cleanup)
|
|
|
|
engine->cleanup(engine);
|
2014-07-25 00:04:23 +08:00
|
|
|
|
2016-08-03 20:19:16 +08:00
|
|
|
intel_engine_cleanup_common(engine);
|
drm/i915: Slaughter the thundering i915_wait_request herd
One particularly stressful scenario consists of many independent tasks
all competing for GPU time and waiting upon the results (e.g. realtime
transcoding of many, many streams). One bottleneck in particular is that
each client waits on its own results, but every client is woken up after
every batchbuffer - hence the thunder of hooves as then every client must
do its heavyweight dance to read a coherent seqno to see if it is the
lucky one.
Ideally, we only want one client to wake up after the interrupt and
check its request for completion. Since the requests must retire in
order, we can select the first client on the oldest request to be woken.
Once that client has completed his wait, we can then wake up the
next client and so on. However, all clients then incur latency as every
process in the chain may be delayed for scheduling - this may also then
cause some priority inversion. To reduce the latency, when a client
is added or removed from the list, we scan the tree for completed
seqno and wake up all the completed waiters in parallel.
Using igt/benchmarks/gem_latency, we can demonstrate this effect. The
benchmark measures the number of GPU cycles between completion of a
batch and the client waking up from a call to wait-ioctl. With many
concurrent waiters, with each on a different request, we observe that
the wakeup latency before the patch scales nearly linearly with the
number of waiters (before external factors kick in making the scaling much
worse). After applying the patch, we can see that only the single waiter
for the request is being woken up, providing a constant wakeup latency
for every operation. However, the situation is not quite as rosy for
many waiters on the same request, though to the best of my knowledge this
is much less likely in practice. Here, we can observe that the
concurrent waiters incur extra latency from being woken up by the
solitary bottom-half, rather than directly by the interrupt. This
appears to be scheduler induced (having discounted adverse effects from
having a rbtree walk/erase in the wakeup path), each additional
wake_up_process() costs approximately 1us on big core. Another effect of
performing the secondary wakeups from the first bottom-half is the
incurred delay this imposes on high priority threads - rather than
immediately returning to userspace and leaving the interrupt handler to
wake the others.
To offset the delay incurred with additional waiters on a request, we
could use a hybrid scheme that did a quick read in the interrupt handler
and dequeued all the completed waiters (incurring the overhead in the
interrupt handler, not the best plan either as we then incur GPU
submission latency) but we would still have to wake up the bottom-half
every time to do the heavyweight slow read. Or we could only kick the
waiters on the seqno with the same priority as the current task (i.e. in
the realtime waiter scenario, only it is woken up immediately by the
interrupt and simply queues the next waiter before returning to userspace,
minimising its delay at the expense of the chain, and also reducing
contention on its scheduler runqueue). This is effective at avoid long
pauses in the interrupt handler and at avoiding the extra latency in
realtime/high-priority waiters.
v2: Convert from a kworker per engine into a dedicated kthread for the
bottom-half.
v3: Rename request members and tweak comments.
v4: Use a per-engine spinlock in the breadcrumbs bottom-half.
v5: Fix race in locklessly checking waiter status and kicking the task on
adding a new waiter.
v6: Fix deciding when to force the timer to hide missing interrupts.
v7: Move the bottom-half from the kthread to the first client process.
v8: Reword a few comments
v9: Break the busy loop when the interrupt is unmasked or has fired.
v10: Comments, unnecessary churn, better debugging from Tvrtko
v11: Wake all completed waiters on removing the current bottom-half to
reduce the latency of waking up a herd of clients all waiting on the
same request.
v12: Rearrange missed-interrupt fault injection so that it works with
igt/drv_missed_irq_hang
v13: Rename intel_breadcrumb and friends to intel_wait in preparation
for signal handling.
v14: RCU commentary, assert_spin_locked
v15: Hide BUG_ON behind the compiler; report on gem_latency findings.
v16: Sort seqno-groups by priority so that first-waiter has the highest
task priority (and so avoid priority inversion).
v17: Add waiters to post-mortem GPU hang state.
v18: Return early for a completed wait after acquiring the spinlock.
Avoids adding ourselves to the tree if the is already complete, and
skips the awkward question of why we don't do completion wakeups for
waits earlier than or equal to ourselves.
v19: Prepare for init_breadcrumbs to fail. Later patches may want to
allocate during init, so be prepared to propagate back the error code.
Testcase: igt/gem_concurrent_blit
Testcase: igt/benchmarks/gem_latency
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: "Rogozhkin, Dmitry V" <dmitry.v.rogozhkin@intel.com>
Cc: "Gong, Zhipeng" <zhipeng.gong@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Dave Gordon <david.s.gordon@intel.com>
Cc: "Goel, Akash" <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> #v18
Link: http://patchwork.freedesktop.org/patch/msgid/1467390209-3576-6-git-send-email-chris@chris-wilson.co.uk
2016-07-02 00:23:15 +08:00
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
if (engine->status_page.vma) {
|
|
|
|
i915_gem_object_unpin_map(engine->status_page.vma->obj);
|
|
|
|
engine->status_page.vma = NULL;
|
2014-07-25 00:04:23 +08:00
|
|
|
}
|
2016-04-28 16:56:53 +08:00
|
|
|
intel_lr_context_unpin(dev_priv->kernel_context, engine);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->idle_lite_restore_wa = 0;
|
|
|
|
engine->disable_lite_restore_wa = false;
|
|
|
|
engine->ctx_desc_template = 0;
|
2016-01-15 23:10:27 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
lrc_destroy_wa_ctx_obj(engine);
|
2016-05-06 22:40:21 +08:00
|
|
|
engine->i915 = NULL;
|
2014-07-25 00:04:22 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:31 +08:00
|
|
|
void intel_execlists_enable_submission(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
struct intel_engine_cs *engine;
|
|
|
|
|
|
|
|
for_each_engine(engine, dev_priv)
|
2016-08-03 05:50:32 +08:00
|
|
|
engine->submit_request = execlists_submit_request;
|
2016-08-03 05:50:31 +08:00
|
|
|
}
|
|
|
|
|
2016-01-13 01:32:34 +08:00
|
|
|
static void
|
2016-05-06 22:40:20 +08:00
|
|
|
logical_ring_default_vfuncs(struct intel_engine_cs *engine)
|
2016-01-13 01:32:34 +08:00
|
|
|
{
|
|
|
|
/* Default vfuncs which can be overriden by each engine. */
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->init_hw = gen8_init_common_ring;
|
|
|
|
engine->emit_flush = gen8_emit_flush;
|
2016-08-03 05:50:31 +08:00
|
|
|
engine->emit_request = gen8_emit_request;
|
2016-08-03 05:50:32 +08:00
|
|
|
engine->submit_request = execlists_submit_request;
|
2016-08-03 05:50:31 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
engine->irq_enable = gen8_logical_ring_enable_irq;
|
|
|
|
engine->irq_disable = gen8_logical_ring_disable_irq;
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->emit_bb_start = gen8_emit_bb_start;
|
2016-07-02 00:23:17 +08:00
|
|
|
if (IS_BXT_REVID(engine->i915, 0, BXT_REVID_A1))
|
2016-04-09 17:57:54 +08:00
|
|
|
engine->irq_seqno_barrier = bxt_a_seqno_barrier;
|
2016-01-13 01:32:34 +08:00
|
|
|
}
|
|
|
|
|
2016-01-13 01:32:35 +08:00
|
|
|
static inline void
|
2016-07-13 23:03:35 +08:00
|
|
|
logical_ring_default_irqs(struct intel_engine_cs *engine)
|
2016-01-13 01:32:35 +08:00
|
|
|
{
|
2016-07-13 23:03:35 +08:00
|
|
|
unsigned shift = engine->irq_shift;
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT << shift;
|
|
|
|
engine->irq_keep_mask = GT_CONTEXT_SWITCH_INTERRUPT << shift;
|
2016-01-13 01:32:35 +08:00
|
|
|
}
|
|
|
|
|
2016-04-12 22:40:42 +08:00
|
|
|
static int
|
2016-08-15 17:48:54 +08:00
|
|
|
lrc_setup_hws(struct intel_engine_cs *engine, struct i915_vma *vma)
|
2016-04-12 22:40:41 +08:00
|
|
|
{
|
2016-08-15 17:48:57 +08:00
|
|
|
const int hws_offset = LRC_PPHWSP_PN * PAGE_SIZE;
|
2016-04-12 22:40:42 +08:00
|
|
|
void *hws;
|
2016-04-12 22:40:41 +08:00
|
|
|
|
|
|
|
/* The HWSP is part of the default context object in LRC mode. */
|
2016-08-15 17:48:54 +08:00
|
|
|
hws = i915_gem_object_pin_map(vma->obj, I915_MAP_WB);
|
2016-04-12 22:40:42 +08:00
|
|
|
if (IS_ERR(hws))
|
|
|
|
return PTR_ERR(hws);
|
2016-08-15 17:48:57 +08:00
|
|
|
|
|
|
|
engine->status_page.page_addr = hws + hws_offset;
|
2016-08-15 17:49:07 +08:00
|
|
|
engine->status_page.ggtt_offset = i915_ggtt_offset(vma) + hws_offset;
|
2016-08-15 17:48:57 +08:00
|
|
|
engine->status_page.vma = vma;
|
2016-04-12 22:40:42 +08:00
|
|
|
|
|
|
|
return 0;
|
2016-04-12 22:40:41 +08:00
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:36 +08:00
|
|
|
static void
|
|
|
|
logical_ring_setup(struct intel_engine_cs *engine)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
|
|
|
enum forcewake_domains fw_domains;
|
|
|
|
|
2016-07-13 23:03:41 +08:00
|
|
|
intel_engine_setup_common(engine);
|
|
|
|
|
2016-07-13 23:03:36 +08:00
|
|
|
/* Intentionally left blank. */
|
|
|
|
engine->buffer = NULL;
|
|
|
|
|
|
|
|
fw_domains = intel_uncore_forcewake_for_reg(dev_priv,
|
|
|
|
RING_ELSP(engine),
|
|
|
|
FW_REG_WRITE);
|
|
|
|
|
|
|
|
fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
|
|
|
|
RING_CONTEXT_STATUS_PTR(engine),
|
|
|
|
FW_REG_READ | FW_REG_WRITE);
|
|
|
|
|
|
|
|
fw_domains |= intel_uncore_forcewake_for_reg(dev_priv,
|
|
|
|
RING_CONTEXT_STATUS_BUF_BASE(engine),
|
|
|
|
FW_REG_READ);
|
|
|
|
|
|
|
|
engine->fw_domains = fw_domains;
|
|
|
|
|
|
|
|
tasklet_init(&engine->irq_tasklet,
|
|
|
|
intel_lrc_irq_handler, (unsigned long)engine);
|
|
|
|
|
|
|
|
logical_ring_init_platform_invariants(engine);
|
|
|
|
logical_ring_default_vfuncs(engine);
|
|
|
|
logical_ring_default_irqs(engine);
|
|
|
|
}
|
|
|
|
|
2016-06-23 21:52:41 +08:00
|
|
|
static int
|
|
|
|
logical_ring_init(struct intel_engine_cs *engine)
|
|
|
|
{
|
|
|
|
struct i915_gem_context *dctx = engine->i915->kernel_context;
|
|
|
|
int ret;
|
|
|
|
|
2016-07-13 23:03:41 +08:00
|
|
|
ret = intel_engine_init_common(engine);
|
2016-06-23 21:52:41 +08:00
|
|
|
if (ret)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
ret = execlists_context_deferred_alloc(dctx, engine);
|
|
|
|
if (ret)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* As this is the default context, always pin it */
|
|
|
|
ret = intel_lr_context_pin(dctx, engine);
|
|
|
|
if (ret) {
|
|
|
|
DRM_ERROR("Failed to pin context for %s: %d\n",
|
|
|
|
engine->name, ret);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* And setup the hardware status page. */
|
|
|
|
ret = lrc_setup_hws(engine, dctx->engine[engine->id].state);
|
|
|
|
if (ret) {
|
|
|
|
DRM_ERROR("Failed to set up hws %s: %d\n", engine->name, ret);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error:
|
|
|
|
intel_logical_ring_cleanup(engine);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:40 +08:00
|
|
|
int logical_render_ring_init(struct intel_engine_cs *engine)
|
2016-06-23 21:52:41 +08:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
|
|
|
int ret;
|
|
|
|
|
2016-07-13 23:03:36 +08:00
|
|
|
logical_ring_setup(engine);
|
|
|
|
|
2016-06-23 21:52:41 +08:00
|
|
|
if (HAS_L3_DPF(dev_priv))
|
|
|
|
engine->irq_keep_mask |= GT_RENDER_L3_PARITY_ERROR_INTERRUPT;
|
|
|
|
|
|
|
|
/* Override some for render ring. */
|
|
|
|
if (INTEL_GEN(dev_priv) >= 9)
|
|
|
|
engine->init_hw = gen9_init_render_ring;
|
|
|
|
else
|
|
|
|
engine->init_hw = gen8_init_render_ring;
|
|
|
|
engine->init_context = gen8_init_rcs_context;
|
|
|
|
engine->emit_flush = gen8_emit_flush_render;
|
|
|
|
engine->emit_request = gen8_emit_request_render;
|
|
|
|
|
2016-08-15 17:48:58 +08:00
|
|
|
ret = intel_engine_create_scratch(engine, 4096);
|
2016-06-23 21:52:41 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
ret = intel_init_workaround_bb(engine);
|
|
|
|
if (ret) {
|
|
|
|
/*
|
|
|
|
* We continue even if we fail to initialize WA batch
|
|
|
|
* because we only expect rare glitches but nothing
|
|
|
|
* critical to prevent us from using GPU
|
|
|
|
*/
|
|
|
|
DRM_ERROR("WA batch buffer initialization failed: %d\n",
|
|
|
|
ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = logical_ring_init(engine);
|
|
|
|
if (ret) {
|
|
|
|
lrc_destroy_wa_ctx_obj(engine);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:40 +08:00
|
|
|
int logical_xcs_ring_init(struct intel_engine_cs *engine)
|
2016-07-13 23:03:36 +08:00
|
|
|
{
|
|
|
|
logical_ring_setup(engine);
|
|
|
|
|
|
|
|
return logical_ring_init(engine);
|
2014-07-25 00:04:22 +08:00
|
|
|
}
|
|
|
|
|
2015-02-14 00:27:56 +08:00
|
|
|
static u32
|
2016-05-06 22:40:21 +08:00
|
|
|
make_rpcs(struct drm_i915_private *dev_priv)
|
2015-02-14 00:27:56 +08:00
|
|
|
{
|
|
|
|
u32 rpcs = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No explicit RPCS request is needed to ensure full
|
|
|
|
* slice/subslice/EU enablement prior to Gen9.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(dev_priv) < 9)
|
2015-02-14 00:27:56 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Starting in Gen9, render power gating can leave
|
|
|
|
* slice/subslice/EU in a partially enabled state. We
|
|
|
|
* must make an explicit request through RPCS for full
|
|
|
|
* enablement.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_INFO(dev_priv)->has_slice_pg) {
|
2015-02-14 00:27:56 +08:00
|
|
|
rpcs |= GEN8_RPCS_S_CNT_ENABLE;
|
2016-05-06 22:40:21 +08:00
|
|
|
rpcs |= INTEL_INFO(dev_priv)->slice_total <<
|
2015-02-14 00:27:56 +08:00
|
|
|
GEN8_RPCS_S_CNT_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_INFO(dev_priv)->has_subslice_pg) {
|
2015-02-14 00:27:56 +08:00
|
|
|
rpcs |= GEN8_RPCS_SS_CNT_ENABLE;
|
2016-05-06 22:40:21 +08:00
|
|
|
rpcs |= INTEL_INFO(dev_priv)->subslice_per_slice <<
|
2015-02-14 00:27:56 +08:00
|
|
|
GEN8_RPCS_SS_CNT_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_INFO(dev_priv)->has_eu_pg) {
|
|
|
|
rpcs |= INTEL_INFO(dev_priv)->eu_per_subslice <<
|
2015-02-14 00:27:56 +08:00
|
|
|
GEN8_RPCS_EU_MIN_SHIFT;
|
2016-05-06 22:40:21 +08:00
|
|
|
rpcs |= INTEL_INFO(dev_priv)->eu_per_subslice <<
|
2015-02-14 00:27:56 +08:00
|
|
|
GEN8_RPCS_EU_MAX_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rpcs;
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)
|
2016-02-23 18:31:49 +08:00
|
|
|
{
|
|
|
|
u32 indirect_ctx_offset;
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
switch (INTEL_GEN(engine->i915)) {
|
2016-02-23 18:31:49 +08:00
|
|
|
default:
|
2016-05-06 22:40:21 +08:00
|
|
|
MISSING_CASE(INTEL_GEN(engine->i915));
|
2016-02-23 18:31:49 +08:00
|
|
|
/* fall through */
|
|
|
|
case 9:
|
|
|
|
indirect_ctx_offset =
|
|
|
|
GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
indirect_ctx_offset =
|
|
|
|
GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return indirect_ctx_offset;
|
|
|
|
}
|
|
|
|
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
static int
|
2016-05-24 21:53:34 +08:00
|
|
|
populate_lr_context(struct i915_gem_context *ctx,
|
2016-04-12 22:40:42 +08:00
|
|
|
struct drm_i915_gem_object *ctx_obj,
|
2016-03-16 19:00:37 +08:00
|
|
|
struct intel_engine_cs *engine,
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring)
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = ctx->i915;
|
2014-08-06 21:04:53 +08:00
|
|
|
struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
|
2016-04-12 22:40:42 +08:00
|
|
|
void *vaddr;
|
|
|
|
u32 *reg_state;
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
int ret;
|
|
|
|
|
2014-08-19 17:13:36 +08:00
|
|
|
if (!ppgtt)
|
|
|
|
ppgtt = dev_priv->mm.aliasing_ppgtt;
|
|
|
|
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
ret = i915_gem_object_set_to_cpu_domain(ctx_obj, true);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_DRIVER("Could not set to CPU domain\n");
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
drm/i915: Support for creating write combined type vmaps
vmaps has a provision for controlling the page protection bits, with which
we can use to control the mapping type, e.g. WB, WC, UC or even WT.
To allow the caller to choose their mapping type, we add a parameter to
i915_gem_object_pin_map - but we still only allow one vmap to be cached
per object. If the object is currently not pinned, then we recreate the
previous vmap with the new access type, but if it was pinned we report an
error. This effectively limits the access via i915_gem_object_pin_map to a
single mapping type for the lifetime of the object. Not usually a problem,
but something to be aware of when setting up the object's vmap.
We will want to vary the access type to enable WC mappings of ringbuffer
and context objects on !llc platforms, as well as other objects where we
need coherent access to the GPU's pages without going through the GTT
v2: Remove the redundant braces around pin count check and fix the marker
in documentation (Chris)
v3:
- Add a new enum for the vmalloc mapping type & pass that as an argument to
i915_object_pin_map. (Tvrtko)
- Use PAGE_MASK to extract or filter the mapping type info and remove a
superfluous BUG_ON.(Tvrtko)
v4:
- Rename the enums and clean up the pin_map function. (Chris)
v5: Drop the VM_NO_GUARD, minor cosmetics.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471001999-17787-1-git-send-email-chris@chris-wilson.co.uk
2016-08-12 19:39:58 +08:00
|
|
|
vaddr = i915_gem_object_pin_map(ctx_obj, I915_MAP_WB);
|
2016-04-12 22:40:42 +08:00
|
|
|
if (IS_ERR(vaddr)) {
|
|
|
|
ret = PTR_ERR(vaddr);
|
|
|
|
DRM_DEBUG_DRIVER("Could not map object pages! (%d)\n", ret);
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2016-04-12 22:40:42 +08:00
|
|
|
ctx_obj->dirty = true;
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
|
|
|
|
/* The second page of the context object contains some fields which must
|
|
|
|
* be set up prior to the first execution. */
|
2016-04-12 22:40:42 +08:00
|
|
|
reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
|
|
|
|
/* A context is actually a big batch buffer with several MI_LOAD_REGISTER_IMM
|
|
|
|
* commands followed by (reg, value) pairs. The values we are setting here are
|
|
|
|
* only for the first context restore: on a subsequent save, the GPU will
|
|
|
|
* recreate this batchbuffer with new values (including all the missing
|
|
|
|
* MI_LOAD_REGISTER_IMM commands that we are not initializing here). */
|
2015-11-05 05:20:11 +08:00
|
|
|
reg_state[CTX_LRI_HEADER_0] =
|
2016-03-16 19:00:37 +08:00
|
|
|
MI_LOAD_REGISTER_IMM(engine->id == RCS ? 14 : 11) | MI_LRI_FORCE_POSTED;
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_CONTEXT_CONTROL,
|
|
|
|
RING_CONTEXT_CONTROL(engine),
|
2015-11-05 05:20:11 +08:00
|
|
|
_MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH |
|
|
|
|
CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT |
|
2016-05-06 22:40:21 +08:00
|
|
|
(HAS_RESOURCE_STREAMER(dev_priv) ?
|
2016-02-25 17:48:58 +08:00
|
|
|
CTX_CTRL_RS_CTX_ENABLE : 0)));
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RING_HEAD, RING_HEAD(engine->mmio_base),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RING_TAIL, RING_TAIL(engine->mmio_base),
|
|
|
|
0);
|
2014-11-13 18:28:56 +08:00
|
|
|
/* Ring buffer start address is not known until the buffer is pinned.
|
|
|
|
* It is written to the context image in execlists_update_context()
|
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RING_BUFFER_START,
|
|
|
|
RING_START(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RING_BUFFER_CONTROL,
|
|
|
|
RING_CTL(engine->mmio_base),
|
2016-08-03 05:50:21 +08:00
|
|
|
((ring->size - PAGE_SIZE) & RING_NR_PAGES) | RING_VALID);
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_BB_HEAD_U,
|
|
|
|
RING_BBADDR_UDW(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_BB_HEAD_L,
|
|
|
|
RING_BBADDR(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_BB_STATE,
|
|
|
|
RING_BBSTATE(engine->mmio_base),
|
2015-11-05 05:20:11 +08:00
|
|
|
RING_BB_PPGTT);
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_SECOND_BB_HEAD_U,
|
|
|
|
RING_SBBADDR_UDW(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_SECOND_BB_HEAD_L,
|
|
|
|
RING_SBBADDR(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_SECOND_BB_STATE,
|
|
|
|
RING_SBBSTATE(engine->mmio_base), 0);
|
|
|
|
if (engine->id == RCS) {
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_BB_PER_CTX_PTR,
|
|
|
|
RING_BB_PER_CTX_PTR(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RCS_INDIRECT_CTX,
|
|
|
|
RING_INDIRECT_CTX(engine->mmio_base), 0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_RCS_INDIRECT_CTX_OFFSET,
|
|
|
|
RING_INDIRECT_CTX_OFFSET(engine->mmio_base), 0);
|
2016-08-15 17:49:04 +08:00
|
|
|
if (engine->wa_ctx.vma) {
|
2016-03-16 19:00:37 +08:00
|
|
|
struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
|
2016-08-15 17:49:07 +08:00
|
|
|
u32 ggtt_offset = i915_ggtt_offset(wa_ctx->vma);
|
2015-06-20 02:07:01 +08:00
|
|
|
|
|
|
|
reg_state[CTX_RCS_INDIRECT_CTX+1] =
|
|
|
|
(ggtt_offset + wa_ctx->indirect_ctx.offset * sizeof(uint32_t)) |
|
|
|
|
(wa_ctx->indirect_ctx.size / CACHELINE_DWORDS);
|
|
|
|
|
|
|
|
reg_state[CTX_RCS_INDIRECT_CTX_OFFSET+1] =
|
2016-03-16 19:00:37 +08:00
|
|
|
intel_lr_indirect_ctx_offset(engine) << 6;
|
2015-06-20 02:07:01 +08:00
|
|
|
|
|
|
|
reg_state[CTX_BB_PER_CTX_PTR+1] =
|
|
|
|
(ggtt_offset + wa_ctx->per_ctx.offset * sizeof(uint32_t)) |
|
|
|
|
0x01;
|
|
|
|
}
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
}
|
2015-11-05 05:20:11 +08:00
|
|
|
reg_state[CTX_LRI_HEADER_1] = MI_LOAD_REGISTER_IMM(9) | MI_LRI_FORCE_POSTED;
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_CTX_TIMESTAMP,
|
|
|
|
RING_CTX_TIMESTAMP(engine->mmio_base), 0);
|
2015-11-05 05:20:11 +08:00
|
|
|
/* PDP values well be assigned later if needed */
|
2016-03-16 19:00:37 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP3_UDW, GEN8_RING_PDP_UDW(engine, 3),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP3_LDW, GEN8_RING_PDP_LDW(engine, 3),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP2_UDW, GEN8_RING_PDP_UDW(engine, 2),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP2_LDW, GEN8_RING_PDP_LDW(engine, 2),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP1_UDW, GEN8_RING_PDP_UDW(engine, 1),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP1_LDW, GEN8_RING_PDP_LDW(engine, 1),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP0_UDW, GEN8_RING_PDP_UDW(engine, 0),
|
|
|
|
0);
|
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_PDP0_LDW, GEN8_RING_PDP_LDW(engine, 0),
|
|
|
|
0);
|
drm/i915/gen8: Dynamic page table allocations
This finishes off the dynamic page tables allocations, in the legacy 3
level style that already exists. Most everything has already been setup
to this point, the patch finishes off the enabling by setting the
appropriate function pointers.
In LRC mode, contexts need to know the PDPs when they are populated. With
dynamic page table allocations, these PDPs may not exist yet. Check if
PDPs have been allocated and use the scratch page if they do not exist yet.
Before submission, update the PDPs in the logic ring context as PDPs
have been allocated.
v2: Update aliasing/true ppgtt allocate/teardown/clear functions for
gen 6 & 7.
v3: Rebase.
v4: Remove BUG() from ppgtt_unbind_vma, but keep checking that either
teardown_va_range or clear_range functions exist (Daniel).
v5: Similar to gen6, in init, gen8_ppgtt_clear_range call is only needed
for aliasing ppgtt. Zombie tracking was originally added for teardown
function and is no longer required.
v6: Update err_out case in gen8_alloc_va_range (missed from lastest
rebase).
v7: Rebase after s/page_tables/page_table/.
v8: Updated scratch_pt check after scratch flag was removed in previous
patch.
v9: Note that lrc mode needs to be updated to support init state without
any PDP.
v10: Unmap correct page_table in gen8_alloc_va_range's error case, clean-up
gen8_aliasing_ppgtt_init (remove duplicated map), and initialize PTs
during page table allocation.
v11: Squashed LRC enabling commit, otherwise LRC mode would be left broken
until it was updated to handle the init case without any PDP.
v12: Do not overallocate new_pts bitmap, make alloc_gen8_temp_bitmaps
static and don't abuse of inline functions. (Mika)
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Michel Thierry <michel.thierry@intel.com> (v2+)
Reviewed-by: Mika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-04-08 19:13:34 +08:00
|
|
|
|
2015-07-30 18:06:23 +08:00
|
|
|
if (USES_FULL_48BIT_PPGTT(ppgtt->base.dev)) {
|
|
|
|
/* 64b PPGTT (48bit canonical)
|
|
|
|
* PDP0_DESCRIPTOR contains the base address to PML4 and
|
|
|
|
* other PDP Descriptors are ignored.
|
|
|
|
*/
|
|
|
|
ASSIGN_CTX_PML4(ppgtt, reg_state);
|
|
|
|
} else {
|
|
|
|
/* 32b PPGTT
|
|
|
|
* PDP*_DESCRIPTOR contains the base address of space supported.
|
|
|
|
* With dynamic page allocation, PDPs may not be allocated at
|
|
|
|
* this point. Point the unallocated PDPs to the scratch page
|
|
|
|
*/
|
2016-02-27 00:58:32 +08:00
|
|
|
execlists_update_context_pdps(ppgtt, reg_state);
|
2015-07-30 18:06:23 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (engine->id == RCS) {
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
reg_state[CTX_LRI_HEADER_2] = MI_LOAD_REGISTER_IMM(1);
|
2015-11-05 05:20:11 +08:00
|
|
|
ASSIGN_CTX_REG(reg_state, CTX_R_PWR_CLK_STATE, GEN8_R_PWR_CLK_STATE,
|
2016-05-06 22:40:21 +08:00
|
|
|
make_rpcs(dev_priv));
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
}
|
|
|
|
|
2016-04-12 22:40:42 +08:00
|
|
|
i915_gem_object_unpin_map(ctx_obj);
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-01-05 20:21:33 +08:00
|
|
|
/**
|
|
|
|
* intel_lr_context_size() - return the size of the context for an engine
|
2016-06-03 21:02:17 +08:00
|
|
|
* @engine: which engine to find the context size for
|
2016-01-05 20:21:33 +08:00
|
|
|
*
|
|
|
|
* Each engine may require a different amount of space for a context image,
|
|
|
|
* so when allocating (or copying) an image, this function can be used to
|
|
|
|
* find the right size for the specific engine.
|
|
|
|
*
|
|
|
|
* Return: size (in bytes) of an engine-specific context image
|
|
|
|
*
|
|
|
|
* Note: this size includes the HWSP, which is part of the context image
|
|
|
|
* in LRC mode, but does not include the "shared data page" used with
|
|
|
|
* GuC submission. The caller should account for this if using the GuC.
|
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
uint32_t intel_lr_context_size(struct intel_engine_cs *engine)
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
WARN_ON(INTEL_GEN(engine->i915) < 8);
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
switch (engine->id) {
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
case RCS:
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(engine->i915) >= 9)
|
2014-11-14 01:51:49 +08:00
|
|
|
ret = GEN9_LR_CONTEXT_RENDER_SIZE;
|
|
|
|
else
|
|
|
|
ret = GEN8_LR_CONTEXT_RENDER_SIZE;
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
break;
|
|
|
|
case VCS:
|
|
|
|
case BCS:
|
|
|
|
case VECS:
|
|
|
|
case VCS2:
|
|
|
|
ret = GEN8_LR_CONTEXT_OTHER_SIZE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2014-07-25 00:04:12 +08:00
|
|
|
}
|
|
|
|
|
2016-05-24 21:53:34 +08:00
|
|
|
static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
|
2016-04-28 16:56:54 +08:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-25 00:04:12 +08:00
|
|
|
{
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
struct drm_i915_gem_object *ctx_obj;
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-08-15 17:48:54 +08:00
|
|
|
struct i915_vma *vma;
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
uint32_t context_size;
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring;
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-05-24 21:53:37 +08:00
|
|
|
WARN_ON(ce->state);
|
2014-07-25 00:04:12 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
context_size = round_up(intel_lr_context_size(engine), 4096);
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
|
drm/i915: Integrate GuC-based command submission
GuC-based submission is mostly the same as execlist mode, up to
intel_logical_ring_advance_and_submit(), where the context being
dispatched would be added to the execlist queue; at this point
we submit the context to the GuC backend instead.
There are, however, a few other changes also required, notably:
1. Contexts must be pinned at GGTT addresses accessible by the GuC
i.e. NOT in the range [0..WOPCM_SIZE), so we have to add the
PIN_OFFSET_BIAS flag to the relevant GGTT-pinning calls.
2. The GuC's TLB must be invalidated after a context is pinned at
a new GGTT address.
3. GuC firmware uses the one page before Ring Context as shared data.
Therefore, whenever driver wants to get base address of LRC, we
will offset one page for it. LRC_PPHWSP_PN is defined as the page
number of LRCA.
4. In the work queue used to pass requests to the GuC, the GuC
firmware requires the ring-tail-offset to be represented as an
11-bit value, expressed in QWords. Therefore, the ringbuffer
size must be reduced to the representable range (4 pages).
v2:
Defer adding #defines until needed [Chris Wilson]
Rationalise type declarations [Chris Wilson]
v4:
Squashed kerneldoc patch into here [Daniel Vetter]
v5:
Update request->tail in code common to both GuC and execlist modes.
Add a private version of lr_context_update(), as sharing the
execlist version leads to race conditions when the CPU and
the GuC both update TAIL in the context image.
Conversion of error-captured HWS page to string must account
for offset from start of object to actual HWS (LRC_PPHWSP_PN).
Issue: VIZ-4884
Signed-off-by: Alex Dai <yu.dai@intel.com>
Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
Reviewed-by: Tom O'Rourke <Tom.O'Rourke@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-08-12 22:43:43 +08:00
|
|
|
/* One extra page as the sharing data between driver and GuC */
|
|
|
|
context_size += PAGE_SIZE * LRC_PPHWSP_PN;
|
|
|
|
|
2016-07-05 17:40:23 +08:00
|
|
|
ctx_obj = i915_gem_object_create(&ctx->i915->drm, context_size);
|
2016-04-25 20:32:13 +08:00
|
|
|
if (IS_ERR(ctx_obj)) {
|
2015-04-30 22:30:50 +08:00
|
|
|
DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
|
2016-04-25 20:32:13 +08:00
|
|
|
return PTR_ERR(ctx_obj);
|
drm/i915/bdw: A bit more advanced LR context alloc/free
Now that we have the ability to allocate our own context backing objects
and we have multiplexed one of them per engine inside the context structs,
we can finally allocate and free them correctly.
Regarding the context size, reading the register to calculate the sizes
can work, I think, however the docs are very clear about the actual
context sizes on GEN8, so just hardcode that and use it.
v2: Rebased on top of the Full PPGTT series. It is important to notice
that at this point we have one global default context per engine, all
of them using the aliasing PPGTT (as opposed to the single global
default context we have with legacy HW contexts).
v3:
- Go back to one single global default context, this time with multiple
backing objects inside.
- Use different context sizes for non-render engines, as suggested by
Damien (still hardcoded, since the information about the context size
registers in the BSpec is, well, *lacking*).
- Render ctx size is 20 (or 19) pages, but not 21 (caught by Damien).
- Move default context backing object creation to intel_init_ring (so
that we don't waste memory in rings that might not get initialized).
v4:
- Reuse the HW legacy context init/fini.
- Create a separate free function.
- Rename the functions with an intel_ preffix.
v5: Several rebases to account for the changes in the previous patches.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:14 +08:00
|
|
|
}
|
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
vma = i915_vma_create(ctx_obj, &ctx->i915->ggtt.base, NULL);
|
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
ret = PTR_ERR(vma);
|
|
|
|
goto error_deref_obj;
|
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:21 +08:00
|
|
|
ring = intel_engine_create_ring(engine, ctx->ring_size);
|
2016-08-03 05:50:20 +08:00
|
|
|
if (IS_ERR(ring)) {
|
|
|
|
ret = PTR_ERR(ring);
|
2015-09-11 19:53:46 +08:00
|
|
|
goto error_deref_obj;
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:20 +08:00
|
|
|
ret = populate_lr_context(ctx, ctx_obj, engine, ring);
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_DRIVER("Failed to populate LRC: %d\n", ret);
|
2016-08-03 05:50:20 +08:00
|
|
|
goto error_ring_free;
|
2014-07-25 00:04:15 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:20 +08:00
|
|
|
ce->ring = ring;
|
2016-08-15 17:48:54 +08:00
|
|
|
ce->state = vma;
|
2016-05-24 21:53:37 +08:00
|
|
|
ce->initialised = engine->init_context == NULL;
|
2014-07-25 00:04:12 +08:00
|
|
|
|
|
|
|
return 0;
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
|
2016-08-03 05:50:20 +08:00
|
|
|
error_ring_free:
|
2016-08-03 05:50:21 +08:00
|
|
|
intel_ring_free(ring);
|
2015-09-11 19:53:46 +08:00
|
|
|
error_deref_obj:
|
2016-07-20 20:31:53 +08:00
|
|
|
i915_gem_object_put(ctx_obj);
|
drm/i915/bdw: Populate LR contexts (somewhat)
For the most part, logical ring context objects are similar to hardware
contexts in that the backing object is meant to be opaque. There are
some exceptions where we need to poke certain offsets of the object for
initialization, updating the tail pointer or updating the PDPs.
For our basic execlist implementation we'll only need our PPGTT PDs,
and ringbuffer addresses in order to set up the context. With previous
patches, we have both, so start prepping the context to be load.
Before running a context for the first time you must populate some
fields in the context object. These fields begin 1 PAGE + LRCA, ie. the
first page (in 0 based counting) of the context image. These same
fields will be read and written to as contexts are saved and restored
once the system is up and running.
Many of these fields are completely reused from previous global
registers: ringbuffer head/tail/control, context control matches some
previous MI_SET_CONTEXT flags, and page directories. There are other
fields which we don't touch which we may want in the future.
v2: CTX_LRI_HEADER_0 is MI_LOAD_REGISTER_IMM(14) for render and (11)
for other engines.
v3: Several rebases and general changes to the code.
v4: Squash with "Extract LR context object populating"
Also, Damien's review comments:
- Set the Force Posted bit on the LRI header, as the BSpec suggest we do.
- Prevent warning when compiling a 32-bits kernel without HIGHMEM64.
- Add a clarifying comment to the context population code.
v5: Damien's review comments:
- The third MI_LOAD_REGISTER_IMM in the context does not set Force Posted.
- Remove dead code.
v6: Add a note about the (presumed) differences between BDW and CHV state
contexts. Also, Brad's review comments:
- Use the _MASKED_BIT_ENABLE, upper_32_bits and lower_32_bits macros.
- Be less magical about how we set the ring size in the context.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net> (v1)
Signed-off-by: Rafael Barbalho <rafael.barbalho@intel.com> (v2)
Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-07-25 00:04:17 +08:00
|
|
|
return ret;
|
2014-07-25 00:04:12 +08:00
|
|
|
}
|
2015-02-17 00:12:53 +08:00
|
|
|
|
2016-04-12 22:40:42 +08:00
|
|
|
void intel_lr_context_reset(struct drm_i915_private *dev_priv,
|
2016-05-24 21:53:34 +08:00
|
|
|
struct i915_gem_context *ctx)
|
2015-02-17 00:12:53 +08:00
|
|
|
{
|
2016-03-16 19:00:36 +08:00
|
|
|
struct intel_engine_cs *engine;
|
2015-02-17 00:12:53 +08:00
|
|
|
|
2016-03-24 19:20:38 +08:00
|
|
|
for_each_engine(engine, dev_priv) {
|
2016-05-24 21:53:37 +08:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-04-12 22:40:42 +08:00
|
|
|
void *vaddr;
|
2015-02-17 00:12:53 +08:00
|
|
|
uint32_t *reg_state;
|
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
if (!ce->state)
|
2015-02-17 00:12:53 +08:00
|
|
|
continue;
|
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
vaddr = i915_gem_object_pin_map(ce->state->obj, I915_MAP_WB);
|
2016-04-12 22:40:42 +08:00
|
|
|
if (WARN_ON(IS_ERR(vaddr)))
|
2015-02-17 00:12:53 +08:00
|
|
|
continue;
|
2016-04-12 22:40:42 +08:00
|
|
|
|
|
|
|
reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
|
2015-02-17 00:12:53 +08:00
|
|
|
|
|
|
|
reg_state[CTX_RING_HEAD+1] = 0;
|
|
|
|
reg_state[CTX_RING_TAIL+1] = 0;
|
|
|
|
|
2016-08-15 17:48:54 +08:00
|
|
|
ce->state->obj->dirty = true;
|
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
2015-02-17 00:12:53 +08:00
|
|
|
|
2016-08-03 05:50:20 +08:00
|
|
|
ce->ring->head = 0;
|
|
|
|
ce->ring->tail = 0;
|
2015-02-17 00:12:53 +08:00
|
|
|
}
|
|
|
|
}
|