2014-07-24 16:04:10 +00: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-24 16:04:48 +00:00
|
|
|
/**
|
|
|
|
* DOC: Logical Rings, Logical Ring Contexts and Execlists
|
|
|
|
*
|
|
|
|
* Motivation:
|
2014-07-24 16:04:10 +00: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-24 16:04:48 +00: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-24 16:04:10 +00: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-24 16:04:48 +00: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-24 16:04:10 +00: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 11:11:56 +00:00
|
|
|
#include <linux/interrupt.h>
|
2014-07-24 16:04:10 +00:00
|
|
|
|
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include <drm/i915_drm.h>
|
|
|
|
#include "i915_drv.h"
|
2015-07-10 17:13:11 +00:00
|
|
|
#include "intel_mocs.h"
|
2014-07-24 16:04:11 +00: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-24 16:04:39 +00: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-24 16:04:17 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
#define GEN8_CTX_STATUS_COMPLETED_MASK \
|
|
|
|
(GEN8_CTX_STATUS_ACTIVE_IDLE | \
|
|
|
|
GEN8_CTX_STATUS_PREEMPTED | \
|
|
|
|
GEN8_CTX_STATUS_ELEMENT_SWITCH)
|
|
|
|
|
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-24 16:04:17 +00: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
|
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
#define 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 13:33:26 +00:00
|
|
|
(reg_state)[(pos)+0] = i915_mmio_reg_offset(reg); \
|
2015-11-04 21:20:11 +00:00
|
|
|
(reg_state)[(pos)+1] = (val); \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
#define ASSIGN_CTX_PDP(ppgtt, reg_state, n) do { \
|
2015-06-25 15:35:06 +00:00
|
|
|
const u64 _addr = i915_page_dir_dma_addr((ppgtt), (n)); \
|
2015-04-08 11:13:32 +00: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-04 21:20:09 +00:00
|
|
|
} while (0)
|
2015-04-08 11:13:32 +00:00
|
|
|
|
2015-11-04 21:20:09 +00:00
|
|
|
#define ASSIGN_CTX_PML4(ppgtt, reg_state) do { \
|
2015-07-30 10:06:23 +00: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-04 21:20:09 +00:00
|
|
|
} while (0)
|
2015-07-30 10:06:23 +00:00
|
|
|
|
2016-02-23 10:31:49 +00:00
|
|
|
#define GEN8_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x17
|
|
|
|
#define GEN9_CTX_RCS_INDIRECT_CTX_OFFSET_DEFAULT 0x26
|
2014-07-24 16:04:36 +00:00
|
|
|
|
2016-04-29 08:07:06 +00:00
|
|
|
/* Typical size of the average request (2 pipecontrols and a MI_BB) */
|
|
|
|
#define EXECLISTS_REQUEST_SIZE 64 /* bytes */
|
|
|
|
|
2016-10-04 20:11:26 +00:00
|
|
|
#define WA_TAIL_DWORDS 2
|
|
|
|
|
2016-05-24 13:53:34 +00:00
|
|
|
static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
|
2016-04-28 08:56:54 +00:00
|
|
|
struct intel_engine_cs *engine);
|
2016-10-04 20:11:26 +00:00
|
|
|
static void execlists_init_reg_state(u32 *reg_state,
|
|
|
|
struct i915_gem_context *ctx,
|
|
|
|
struct intel_engine_cs *engine,
|
|
|
|
struct intel_ring *ring);
|
2014-11-13 10:28:56 +00:00
|
|
|
|
2014-07-24 16:04:48 +00:00
|
|
|
/**
|
|
|
|
* intel_sanitize_enable_execlists() - sanitize i915.enable_execlists
|
2016-06-03 13:02:17 +00:00
|
|
|
* @dev_priv: i915 device private
|
2014-07-24 16:04:48 +00:00
|
|
|
* @enable_execlists: value of i915.enable_execlists module parameter.
|
|
|
|
*
|
|
|
|
* Only certain platforms support Execlists (the prerequisites being
|
2014-12-11 12:48:35 +00:00
|
|
|
* support for Logical Ring Contexts and Aliasing PPGTT or better).
|
2014-07-24 16:04:48 +00:00
|
|
|
*
|
|
|
|
* Return: 1 if Execlists is supported and has to be enabled.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv, int enable_execlists)
|
2014-07-24 16:04:11 +00:00
|
|
|
{
|
2015-08-28 07:41:16 +00:00
|
|
|
/* On platforms with execlist available, vGPU will only
|
|
|
|
* support execlist mode, no ring buffer mode.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) && intel_vgpu_active(dev_priv))
|
2015-08-28 07:41:16 +00:00
|
|
|
return 1;
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9)
|
2014-11-14 15:05:59 +00:00
|
|
|
return 1;
|
|
|
|
|
2014-07-24 16:04:11 +00:00
|
|
|
if (enable_execlists == 0)
|
|
|
|
return 0;
|
|
|
|
|
2016-05-24 15:13:53 +00:00
|
|
|
if (HAS_LOGICAL_RING_CONTEXTS(dev_priv) &&
|
|
|
|
USES_PPGTT(dev_priv) &&
|
|
|
|
i915.use_mmio_flip >= 0)
|
2014-07-24 16:04:11 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2014-07-24 16:04:12 +00:00
|
|
|
|
2014-07-24 16:04:48 +00:00
|
|
|
/**
|
2016-01-15 15:10:27 +00:00
|
|
|
* intel_lr_context_descriptor_update() - calculate & cache the descriptor
|
|
|
|
* descriptor for a pinned context
|
|
|
|
* @ctx: Context to work on
|
2016-05-24 13:53:37 +00:00
|
|
|
* @engine: Engine the descriptor will be used with
|
2014-07-24 16:04:48 +00:00
|
|
|
*
|
2016-01-15 15:10:27 +00: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-15 19:48:06 +00:00
|
|
|
* This is what a descriptor looks like, from LSB to MSB::
|
|
|
|
*
|
2017-01-27 13:03:09 +00:00
|
|
|
* bits 0-11: flags, GEN8_CTX_* (cached in ctx->desc_template)
|
2016-07-15 19:48:06 +00:00
|
|
|
* 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-24 16:04:48 +00:00
|
|
|
*/
|
2016-01-15 15:10:27 +00:00
|
|
|
static void
|
2016-05-24 13:53:34 +00:00
|
|
|
intel_lr_context_descriptor_update(struct i915_gem_context *ctx,
|
2016-03-16 11:00:37 +00:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-24 16:04:36 +00:00
|
|
|
{
|
2016-05-24 13:53:37 +00:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-04-28 08:56:52 +00:00
|
|
|
u64 desc;
|
2014-07-24 16:04:36 +00:00
|
|
|
|
2016-04-28 08:56:52 +00:00
|
|
|
BUILD_BUG_ON(MAX_CONTEXT_HW_ID > (1<<GEN8_CTX_ID_WIDTH));
|
2014-07-24 16:04:36 +00:00
|
|
|
|
2017-01-27 13:03:09 +00:00
|
|
|
desc = ctx->desc_template; /* bits 0-11 */
|
2016-08-15 09:49:07 +00:00
|
|
|
desc |= i915_ggtt_offset(ce->state) + LRC_PPHWSP_PN * PAGE_SIZE;
|
2016-05-24 13:53:37 +00:00
|
|
|
/* bits 12-31 */
|
2016-04-28 08:56:52 +00:00
|
|
|
desc |= (u64)ctx->hw_id << GEN8_CTX_ID_SHIFT; /* bits 32-52 */
|
2015-09-04 11:59:15 +00:00
|
|
|
|
2016-05-24 13:53:37 +00:00
|
|
|
ce->lrc_desc = desc;
|
2015-09-04 11:59:15 +00:00
|
|
|
}
|
|
|
|
|
2016-05-24 13:53:34 +00:00
|
|
|
uint64_t intel_lr_context_descriptor(struct i915_gem_context *ctx,
|
2016-03-16 11:00:37 +00:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-24 16:04:36 +00:00
|
|
|
{
|
2016-03-16 11:00:37 +00:00
|
|
|
return ctx->engine[engine->id].lrc_desc;
|
2016-01-15 15:10:27 +00:00
|
|
|
}
|
2015-02-06 11:30:04 +00:00
|
|
|
|
2016-09-09 13:11:45 +00:00
|
|
|
static inline void
|
|
|
|
execlists_context_status_change(struct drm_i915_gem_request *rq,
|
|
|
|
unsigned long status)
|
2014-07-24 16:04:36 +00:00
|
|
|
{
|
2016-09-09 13:11:45 +00:00
|
|
|
/*
|
|
|
|
* 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;
|
2015-01-16 09:34:35 +00:00
|
|
|
|
2017-03-13 02:47:11 +00:00
|
|
|
atomic_notifier_call_chain(&rq->engine->context_status_notifier,
|
|
|
|
status, rq);
|
2014-07-24 16:04:36 +00:00
|
|
|
}
|
|
|
|
|
2016-02-26 16:58:32 +00: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);
|
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
static u64 execlists_update_context(struct drm_i915_gem_request *rq)
|
2014-07-24 16:04:37 +00:00
|
|
|
{
|
2016-09-09 13:11:46 +00:00
|
|
|
struct intel_context *ce = &rq->ctx->engine[rq->engine->id];
|
2017-02-06 10:37:16 +00:00
|
|
|
struct i915_hw_ppgtt *ppgtt =
|
|
|
|
rq->ctx->ppgtt ?: rq->i915->mm.aliasing_ppgtt;
|
2016-09-09 13:11:46 +00:00
|
|
|
u32 *reg_state = ce->lrc_reg_state;
|
2014-07-24 16:04:37 +00:00
|
|
|
|
2017-04-25 13:00:49 +00:00
|
|
|
reg_state[CTX_RING_TAIL+1] = intel_ring_set_tail(rq->ring, rq->tail);
|
2014-07-24 16:04:37 +00:00
|
|
|
|
2016-02-26 16:58:32 +00: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.
|
|
|
|
*/
|
2017-02-09 14:40:36 +00:00
|
|
|
if (ppgtt && !i915_vm_is_48bit(&ppgtt->base))
|
2016-02-26 16:58:32 +00:00
|
|
|
execlists_update_context_pdps(ppgtt, reg_state);
|
2016-09-09 13:11:46 +00:00
|
|
|
|
|
|
|
return ce->lrc_desc;
|
2014-07-24 16:04:37 +00:00
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
static void execlists_submit_ports(struct intel_engine_cs *engine)
|
2016-09-09 13:11:45 +00:00
|
|
|
{
|
2016-09-09 13:11:46 +00:00
|
|
|
struct execlist_port *port = engine->execlist_port;
|
2016-09-09 13:11:45 +00:00
|
|
|
u32 __iomem *elsp =
|
2017-05-17 12:10:00 +00:00
|
|
|
engine->i915->regs + i915_mmio_reg_offset(RING_ELSP(engine));
|
|
|
|
unsigned int n;
|
2016-09-09 13:11:45 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
for (n = ARRAY_SIZE(engine->execlist_port); n--; ) {
|
|
|
|
struct drm_i915_gem_request *rq;
|
|
|
|
unsigned int count;
|
|
|
|
u64 desc;
|
|
|
|
|
|
|
|
rq = port_unpack(&port[n], &count);
|
|
|
|
if (rq) {
|
|
|
|
GEM_BUG_ON(count > !n);
|
|
|
|
if (!count++)
|
|
|
|
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
|
|
|
|
port_set(&port[n], port_pack(rq, count));
|
|
|
|
desc = execlists_update_context(rq);
|
|
|
|
GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc));
|
|
|
|
} else {
|
|
|
|
GEM_BUG_ON(!n);
|
|
|
|
desc = 0;
|
|
|
|
}
|
2016-09-09 13:11:45 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
writel(upper_32_bits(desc), elsp);
|
|
|
|
writel(lower_32_bits(desc), elsp);
|
|
|
|
}
|
2016-09-09 13:11:45 +00:00
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
static bool ctx_single_port_submission(const struct i915_gem_context *ctx)
|
2014-07-24 16:04:36 +00:00
|
|
|
{
|
2016-09-09 13:11:46 +00:00
|
|
|
return (IS_ENABLED(CONFIG_DRM_I915_GVT) &&
|
2016-12-31 11:20:11 +00:00
|
|
|
i915_gem_context_force_single_submission(ctx));
|
2016-09-09 13:11:46 +00:00
|
|
|
}
|
2014-07-24 16:04:36 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
static bool can_merge_ctx(const struct i915_gem_context *prev,
|
|
|
|
const struct i915_gem_context *next)
|
|
|
|
{
|
|
|
|
if (prev != next)
|
|
|
|
return false;
|
2016-03-17 12:59:46 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
if (ctx_single_port_submission(prev))
|
|
|
|
return false;
|
2016-03-17 12:59:46 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
return true;
|
2014-07-24 16:04:36 +00:00
|
|
|
}
|
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
static void port_assign(struct execlist_port *port,
|
|
|
|
struct drm_i915_gem_request *rq)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(rq == port_request(port));
|
|
|
|
|
|
|
|
if (port_isset(port))
|
|
|
|
i915_gem_request_put(port_request(port));
|
|
|
|
|
|
|
|
port_set(port, port_pack(i915_gem_request_get(rq), port_count(port)));
|
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
static void execlists_dequeue(struct intel_engine_cs *engine)
|
2014-07-24 16:04:38 +00:00
|
|
|
{
|
2016-11-14 20:41:03 +00:00
|
|
|
struct drm_i915_gem_request *last;
|
2016-09-09 13:11:46 +00:00
|
|
|
struct execlist_port *port = engine->execlist_port;
|
2016-11-14 20:41:03 +00:00
|
|
|
struct rb_node *rb;
|
2016-09-09 13:11:46 +00:00
|
|
|
bool submit = false;
|
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
last = port_request(port);
|
2016-09-09 13:11:46 +00:00
|
|
|
if (last)
|
|
|
|
/* WaIdleLiteRestore:bdw,skl
|
|
|
|
* Apply the wa NOOPs to prevent ring:HEAD == req:TAIL
|
2016-10-28 12:58:50 +00:00
|
|
|
* as we resubmit the request. See gen8_emit_breadcrumb()
|
2016-09-09 13:11:46 +00:00
|
|
|
* for where we prepare the padding after the end of the
|
|
|
|
* request.
|
|
|
|
*/
|
|
|
|
last->tail = last->wa_tail;
|
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-24 16:04:39 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
GEM_BUG_ON(port_isset(&port[1]));
|
2014-07-24 16:04:38 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
/* Hardware submission is through 2 ports. Conceptually each port
|
|
|
|
* has a (RING_START, RING_HEAD, RING_TAIL) tuple. RING_START is
|
|
|
|
* static for a context, and unique to each, so we only execute
|
|
|
|
* requests belonging to a single context from each ring. RING_HEAD
|
|
|
|
* is maintained by the CS in the context image, it marks the place
|
|
|
|
* where it got up to last time, and through RING_TAIL we tell the CS
|
|
|
|
* where we want to execute up to this time.
|
|
|
|
*
|
|
|
|
* In this list the requests are in order of execution. Consecutive
|
|
|
|
* requests from the same context are adjacent in the ringbuffer. We
|
|
|
|
* can combine these requests into a single RING_TAIL update:
|
|
|
|
*
|
|
|
|
* RING_HEAD...req1...req2
|
|
|
|
* ^- RING_TAIL
|
|
|
|
* since to execute req2 the CS must first execute req1.
|
|
|
|
*
|
|
|
|
* Our goal then is to point each port to the end of a consecutive
|
|
|
|
* sequence of requests as being the most optimal (fewest wake ups
|
|
|
|
* and context switches) submission.
|
2015-05-11 15:03:27 +00:00
|
|
|
*/
|
2014-07-24 16:04:38 +00:00
|
|
|
|
2017-03-21 10:55:11 +00:00
|
|
|
spin_lock_irq(&engine->timeline->lock);
|
2016-11-14 20:41:03 +00:00
|
|
|
rb = engine->execlist_first;
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
GEM_BUG_ON(rb_first(&engine->execlist_queue) != rb);
|
2016-11-14 20:41:03 +00:00
|
|
|
while (rb) {
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
struct i915_priolist *p = rb_entry(rb, typeof(*p), node);
|
|
|
|
struct drm_i915_gem_request *rq, *rn;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(rq, rn, &p->requests, priotree.link) {
|
|
|
|
/*
|
|
|
|
* Can we combine this request with the current port?
|
|
|
|
* It has to be the same context/ringbuffer and not
|
|
|
|
* have any exceptions (e.g. GVT saying never to
|
|
|
|
* combine contexts).
|
|
|
|
*
|
|
|
|
* If we can combine the requests, we can execute both
|
|
|
|
* by updating the RING_TAIL to point to the end of the
|
|
|
|
* second request, and so we never need to tell the
|
|
|
|
* hardware about the first.
|
2016-09-09 13:11:46 +00:00
|
|
|
*/
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
if (last && !can_merge_ctx(rq->ctx, last->ctx)) {
|
|
|
|
/*
|
|
|
|
* If we are on the second port and cannot
|
|
|
|
* combine this request with the last, then we
|
|
|
|
* are done.
|
|
|
|
*/
|
|
|
|
if (port != engine->execlist_port) {
|
|
|
|
__list_del_many(&p->requests,
|
|
|
|
&rq->priotree.link);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If GVT overrides us we only ever submit
|
|
|
|
* port[0], leaving port[1] empty. Note that we
|
|
|
|
* also have to be careful that we don't queue
|
|
|
|
* the same context (even though a different
|
|
|
|
* request) to the second port.
|
|
|
|
*/
|
|
|
|
if (ctx_single_port_submission(last->ctx) ||
|
|
|
|
ctx_single_port_submission(rq->ctx)) {
|
|
|
|
__list_del_many(&p->requests,
|
|
|
|
&rq->priotree.link);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
GEM_BUG_ON(last->ctx == rq->ctx);
|
|
|
|
|
|
|
|
if (submit)
|
|
|
|
port_assign(port, last);
|
|
|
|
port++;
|
|
|
|
}
|
2016-09-09 13:11:46 +00:00
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
INIT_LIST_HEAD(&rq->priotree.link);
|
|
|
|
rq->priotree.priority = INT_MAX;
|
2016-09-09 13:11:46 +00:00
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
__i915_gem_request_submit(rq);
|
|
|
|
trace_i915_gem_request_in(rq, port_index(port, engine));
|
|
|
|
last = rq;
|
|
|
|
submit = true;
|
2016-09-09 13:11:46 +00:00
|
|
|
}
|
2016-11-14 20:40:59 +00:00
|
|
|
|
2016-11-14 20:41:03 +00:00
|
|
|
rb = rb_next(rb);
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
rb_erase(&p->node, &engine->execlist_queue);
|
|
|
|
INIT_LIST_HEAD(&p->requests);
|
|
|
|
if (p->priority != I915_PRIORITY_NORMAL)
|
2017-05-17 12:10:04 +00:00
|
|
|
kmem_cache_free(engine->i915->priorities, p);
|
2016-09-09 13:11:46 +00:00
|
|
|
}
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
done:
|
|
|
|
engine->execlist_first = rb;
|
|
|
|
if (submit)
|
2017-05-17 12:10:00 +00:00
|
|
|
port_assign(port, last);
|
2017-03-21 10:55:11 +00:00
|
|
|
spin_unlock_irq(&engine->timeline->lock);
|
2015-04-15 17:11:33 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
if (submit)
|
|
|
|
execlists_submit_ports(engine);
|
2014-07-24 16:04:38 +00:00
|
|
|
}
|
|
|
|
|
2017-01-24 11:00:03 +00:00
|
|
|
static bool execlists_elsp_ready(const struct intel_engine_cs *engine)
|
2016-01-05 18:30:07 +00:00
|
|
|
{
|
2017-01-24 11:00:03 +00:00
|
|
|
const struct execlist_port *port = engine->execlist_port;
|
2016-01-05 18:30:07 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
return port_count(&port[0]) + port_count(&port[1]) < 2;
|
2016-01-05 18:30:07 +00:00
|
|
|
}
|
|
|
|
|
2016-07-15 19:48:06 +00:00
|
|
|
/*
|
2014-07-24 16:04:48 +00: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 11:11:56 +00: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-24 16:04:39 +00: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 11:11:56 +00:00
|
|
|
struct intel_engine_cs *engine = (struct intel_engine_cs *)data;
|
2016-09-09 13:11:46 +00:00
|
|
|
struct execlist_port *port = engine->execlist_port;
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-02-26 16:58:32 +00:00
|
|
|
|
2017-04-11 17:58:50 +00:00
|
|
|
/* We can skip acquiring intel_runtime_pm_get() here as it was taken
|
|
|
|
* on our behalf by the request (see i915_gem_mark_busy()) and it will
|
|
|
|
* not be relinquished until the device is idle (see
|
|
|
|
* i915_gem_idle_work_handler()). As a precaution, we make sure
|
|
|
|
* that all ELSP are drained i.e. we have processed the CSB,
|
|
|
|
* before allowing ourselves to idle and calling intel_runtime_pm_put().
|
|
|
|
*/
|
|
|
|
GEM_BUG_ON(!dev_priv->gt.awake);
|
|
|
|
|
2016-04-12 13:37:31 +00:00
|
|
|
intel_uncore_forcewake_get(dev_priv, engine->fw_domains);
|
2016-02-26 16:58:32 +00:00
|
|
|
|
2017-03-21 11:33:20 +00:00
|
|
|
/* Prefer doing test_and_clear_bit() as a two stage operation to avoid
|
|
|
|
* imposing the cost of a locked atomic transaction when submitting a
|
|
|
|
* new request (outside of the context-switch interrupt).
|
|
|
|
*/
|
|
|
|
while (test_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted)) {
|
2016-09-09 13:11:46 +00:00
|
|
|
u32 __iomem *csb_mmio =
|
|
|
|
dev_priv->regs + i915_mmio_reg_offset(RING_CONTEXT_STATUS_PTR(engine));
|
|
|
|
u32 __iomem *buf =
|
|
|
|
dev_priv->regs + i915_mmio_reg_offset(RING_CONTEXT_STATUS_BUF_LO(engine, 0));
|
2017-03-25 20:10:53 +00:00
|
|
|
unsigned int head, tail;
|
2016-09-09 13:11:46 +00:00
|
|
|
|
2017-03-23 13:48:03 +00:00
|
|
|
/* The write will be ordered by the uncached read (itself
|
|
|
|
* a memory barrier), so we do not need another in the form
|
|
|
|
* of a locked instruction. The race between the interrupt
|
|
|
|
* handler and the split test/clear is harmless as we order
|
|
|
|
* our clear before the CSB read. If the interrupt arrived
|
|
|
|
* first between the test and the clear, we read the updated
|
|
|
|
* CSB and clear the bit. If the interrupt arrives as we read
|
|
|
|
* the CSB or later (i.e. after we had cleared the bit) the bit
|
|
|
|
* is set and we do a new loop.
|
|
|
|
*/
|
|
|
|
__clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
|
2017-03-25 20:10:53 +00:00
|
|
|
head = readl(csb_mmio);
|
|
|
|
tail = GEN8_CSB_WRITE_PTR(head);
|
|
|
|
head = GEN8_CSB_READ_PTR(head);
|
|
|
|
while (head != tail) {
|
2017-05-17 12:10:00 +00:00
|
|
|
struct drm_i915_gem_request *rq;
|
2017-03-25 20:10:53 +00:00
|
|
|
unsigned int status;
|
2017-05-17 12:10:00 +00:00
|
|
|
unsigned int count;
|
2017-03-25 20:10:53 +00:00
|
|
|
|
|
|
|
if (++head == GEN8_CSB_ENTRIES)
|
|
|
|
head = 0;
|
2016-09-09 13:11:46 +00:00
|
|
|
|
2017-02-06 17:05:02 +00:00
|
|
|
/* We are flying near dragons again.
|
|
|
|
*
|
|
|
|
* We hold a reference to the request in execlist_port[]
|
|
|
|
* but no more than that. We are operating in softirq
|
|
|
|
* context and so cannot hold any mutex or sleep. That
|
|
|
|
* prevents us stopping the requests we are processing
|
|
|
|
* in port[] from being retired simultaneously (the
|
|
|
|
* breadcrumb will be complete before we see the
|
|
|
|
* context-switch). As we only hold the reference to the
|
|
|
|
* request, any pointer chasing underneath the request
|
|
|
|
* is subject to a potential use-after-free. Thus we
|
|
|
|
* store all of the bookkeeping within port[] as
|
|
|
|
* required, and avoid using unguarded pointers beneath
|
|
|
|
* request itself. The same applies to the atomic
|
|
|
|
* status notifier.
|
|
|
|
*/
|
|
|
|
|
2017-03-25 20:10:53 +00:00
|
|
|
status = readl(buf + 2 * head);
|
2016-09-09 13:11:46 +00:00
|
|
|
if (!(status & GEN8_CTX_STATUS_COMPLETED_MASK))
|
|
|
|
continue;
|
|
|
|
|
2017-01-23 11:31:32 +00:00
|
|
|
/* Check the context/desc id for this event matches */
|
2017-03-25 20:10:53 +00:00
|
|
|
GEM_DEBUG_BUG_ON(readl(buf + 2 * head + 1) !=
|
2017-05-17 12:10:00 +00:00
|
|
|
port->context_id);
|
2017-01-23 11:31:32 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
rq = port_unpack(port, &count);
|
|
|
|
GEM_BUG_ON(count == 0);
|
|
|
|
if (--count == 0) {
|
2016-09-09 13:11:46 +00:00
|
|
|
GEM_BUG_ON(status & GEN8_CTX_STATUS_PREEMPTED);
|
2017-05-17 12:10:00 +00:00
|
|
|
GEM_BUG_ON(!i915_gem_request_completed(rq));
|
|
|
|
execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_OUT);
|
|
|
|
|
|
|
|
trace_i915_gem_request_out(rq);
|
|
|
|
i915_gem_request_put(rq);
|
2016-09-09 13:11:46 +00:00
|
|
|
|
|
|
|
port[0] = port[1];
|
|
|
|
memset(&port[1], 0, sizeof(port[1]));
|
2017-05-17 12:10:00 +00:00
|
|
|
} else {
|
|
|
|
port_set(port, port_pack(rq, count));
|
2016-09-09 13:11:46 +00:00
|
|
|
}
|
2016-03-17 12:59:46 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
/* After the final element, the hw should be idle */
|
|
|
|
GEM_BUG_ON(port_count(port) == 0 &&
|
2016-09-09 13:11:46 +00:00
|
|
|
!(status & GEN8_CTX_STATUS_ACTIVE_IDLE));
|
2017-03-25 20:10:53 +00:00
|
|
|
}
|
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-24 16:04:40 +00:00
|
|
|
|
2017-03-25 20:10:53 +00:00
|
|
|
writel(_MASKED_FIELD(GEN8_CSB_READ_PTR_MASK, head << 8),
|
2016-09-09 13:11:46 +00:00
|
|
|
csb_mmio);
|
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-24 16:04:39 +00:00
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
if (execlists_elsp_ready(engine))
|
|
|
|
execlists_dequeue(engine);
|
2016-02-26 16:58:32 +00:00
|
|
|
|
2016-09-09 13:11:46 +00:00
|
|
|
intel_uncore_forcewake_put(dev_priv, engine->fw_domains);
|
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-24 16:04:39 +00:00
|
|
|
}
|
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
static bool
|
|
|
|
insert_request(struct intel_engine_cs *engine,
|
|
|
|
struct i915_priotree *pt,
|
|
|
|
int prio)
|
2016-11-14 20:41:03 +00:00
|
|
|
{
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
struct i915_priolist *p;
|
|
|
|
struct rb_node **parent, *rb;
|
2016-11-14 20:41:03 +00:00
|
|
|
bool first = true;
|
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
if (unlikely(engine->no_priolist))
|
|
|
|
prio = I915_PRIORITY_NORMAL;
|
|
|
|
|
|
|
|
find_priolist:
|
2016-11-14 20:41:03 +00:00
|
|
|
/* most positive priority is scheduled first, equal priorities fifo */
|
|
|
|
rb = NULL;
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
parent = &engine->execlist_queue.rb_node;
|
|
|
|
while (*parent) {
|
|
|
|
rb = *parent;
|
|
|
|
p = rb_entry(rb, typeof(*p), node);
|
|
|
|
if (prio > p->priority) {
|
|
|
|
parent = &rb->rb_left;
|
|
|
|
} else if (prio < p->priority) {
|
|
|
|
parent = &rb->rb_right;
|
2016-11-14 20:41:03 +00:00
|
|
|
first = false;
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
} else {
|
|
|
|
list_add_tail(&pt->link, &p->requests);
|
|
|
|
return false;
|
2016-11-14 20:41:03 +00:00
|
|
|
}
|
|
|
|
}
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
|
|
|
|
if (prio == I915_PRIORITY_NORMAL) {
|
|
|
|
p = &engine->default_priolist;
|
|
|
|
} else {
|
2017-05-17 12:10:04 +00:00
|
|
|
p = kmem_cache_alloc(engine->i915->priorities, GFP_ATOMIC);
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
/* Convert an allocation failure to a priority bump */
|
|
|
|
if (unlikely(!p)) {
|
|
|
|
prio = I915_PRIORITY_NORMAL; /* recurses just once */
|
|
|
|
|
|
|
|
/* To maintain ordering with all rendering, after an
|
|
|
|
* allocation failure we have to disable all scheduling.
|
|
|
|
* Requests will then be executed in fifo, and schedule
|
|
|
|
* will ensure that dependencies are emitted in fifo.
|
|
|
|
* There will be still some reordering with existing
|
|
|
|
* requests, so if userspace lied about their
|
|
|
|
* dependencies that reordering may be visible.
|
|
|
|
*/
|
|
|
|
engine->no_priolist = true;
|
|
|
|
goto find_priolist;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
p->priority = prio;
|
|
|
|
rb_link_node(&p->node, rb, parent);
|
|
|
|
rb_insert_color(&p->node, &engine->execlist_queue);
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&p->requests);
|
|
|
|
list_add_tail(&pt->link, &p->requests);
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
engine->execlist_first = &p->node;
|
2016-11-14 20:41:03 +00:00
|
|
|
|
|
|
|
return first;
|
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:32 +00:00
|
|
|
static void execlists_submit_request(struct drm_i915_gem_request *request)
|
2014-07-24 16:04:38 +00:00
|
|
|
{
|
2016-03-16 11:00:38 +00:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2016-09-09 13:11:54 +00:00
|
|
|
unsigned long flags;
|
2014-07-24 16:04:38 +00:00
|
|
|
|
2016-11-14 20:41:00 +00:00
|
|
|
/* Will be called from irq-context when using foreign fences. */
|
|
|
|
spin_lock_irqsave(&engine->timeline->lock, flags);
|
2014-07-24 16:04:38 +00:00
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
if (insert_request(engine,
|
|
|
|
&request->priotree,
|
|
|
|
request->priotree.priority)) {
|
2017-01-24 11:00:08 +00:00
|
|
|
if (execlists_elsp_ready(engine))
|
2017-01-24 11:00:07 +00:00
|
|
|
tasklet_hi_schedule(&engine->irq_tasklet);
|
|
|
|
}
|
2014-07-24 16:04:38 +00:00
|
|
|
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
GEM_BUG_ON(!engine->execlist_first);
|
|
|
|
GEM_BUG_ON(list_empty(&request->priotree.link));
|
|
|
|
|
2016-11-14 20:41:00 +00:00
|
|
|
spin_unlock_irqrestore(&engine->timeline->lock, flags);
|
2014-07-24 16:04:38 +00:00
|
|
|
}
|
|
|
|
|
2016-11-14 20:41:03 +00:00
|
|
|
static struct intel_engine_cs *
|
|
|
|
pt_lock_engine(struct i915_priotree *pt, struct intel_engine_cs *locked)
|
|
|
|
{
|
2017-03-27 20:21:43 +00:00
|
|
|
struct intel_engine_cs *engine =
|
|
|
|
container_of(pt, struct drm_i915_gem_request, priotree)->engine;
|
|
|
|
|
|
|
|
GEM_BUG_ON(!locked);
|
2016-11-14 20:41:03 +00:00
|
|
|
|
|
|
|
if (engine != locked) {
|
2017-03-27 20:21:43 +00:00
|
|
|
spin_unlock(&locked->timeline->lock);
|
|
|
|
spin_lock(&engine->timeline->lock);
|
2016-11-14 20:41:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return engine;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void execlists_schedule(struct drm_i915_gem_request *request, int prio)
|
|
|
|
{
|
2017-03-27 20:21:43 +00:00
|
|
|
struct intel_engine_cs *engine;
|
2016-11-14 20:41:03 +00:00
|
|
|
struct i915_dependency *dep, *p;
|
|
|
|
struct i915_dependency stack;
|
|
|
|
LIST_HEAD(dfs);
|
|
|
|
|
|
|
|
if (prio <= READ_ONCE(request->priotree.priority))
|
|
|
|
return;
|
|
|
|
|
2016-11-28 14:36:49 +00:00
|
|
|
/* Need BKL in order to use the temporary link inside i915_dependency */
|
|
|
|
lockdep_assert_held(&request->i915->drm.struct_mutex);
|
2016-11-14 20:41:03 +00:00
|
|
|
|
|
|
|
stack.signaler = &request->priotree;
|
|
|
|
list_add(&stack.dfs_link, &dfs);
|
|
|
|
|
|
|
|
/* Recursively bump all dependent priorities to match the new request.
|
|
|
|
*
|
|
|
|
* A naive approach would be to use recursion:
|
|
|
|
* static void update_priorities(struct i915_priotree *pt, prio) {
|
|
|
|
* list_for_each_entry(dep, &pt->signalers_list, signal_link)
|
|
|
|
* update_priorities(dep->signal, prio)
|
|
|
|
* insert_request(pt);
|
|
|
|
* }
|
|
|
|
* but that may have unlimited recursion depth and so runs a very
|
|
|
|
* real risk of overunning the kernel stack. Instead, we build
|
|
|
|
* a flat list of all dependencies starting with the current request.
|
|
|
|
* As we walk the list of dependencies, we add all of its dependencies
|
|
|
|
* to the end of the list (this may include an already visited
|
|
|
|
* request) and continue to walk onwards onto the new dependencies. The
|
|
|
|
* end result is a topological list of requests in reverse order, the
|
|
|
|
* last element in the list is the request we must execute first.
|
|
|
|
*/
|
|
|
|
list_for_each_entry_safe(dep, p, &dfs, dfs_link) {
|
|
|
|
struct i915_priotree *pt = dep->signaler;
|
|
|
|
|
2017-03-27 20:21:43 +00:00
|
|
|
/* Within an engine, there can be no cycle, but we may
|
|
|
|
* refer to the same dependency chain multiple times
|
|
|
|
* (redundant dependencies are not eliminated) and across
|
|
|
|
* engines.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(p, &pt->signalers_list, signal_link) {
|
|
|
|
GEM_BUG_ON(p->signaler->priority < pt->priority);
|
2016-11-14 20:41:03 +00:00
|
|
|
if (prio > READ_ONCE(p->signaler->priority))
|
|
|
|
list_move_tail(&p->dfs_link, &dfs);
|
2017-03-27 20:21:43 +00:00
|
|
|
}
|
2016-11-14 20:41:03 +00:00
|
|
|
|
2016-12-05 14:29:41 +00:00
|
|
|
list_safe_reset_next(dep, p, dfs_link);
|
2016-11-14 20:41:03 +00:00
|
|
|
}
|
|
|
|
|
2017-05-17 12:10:05 +00:00
|
|
|
/* If we didn't need to bump any existing priorities, and we haven't
|
|
|
|
* yet submitted this request (i.e. there is no potential race with
|
|
|
|
* execlists_submit_request()), we can set our own priority and skip
|
|
|
|
* acquiring the engine locks.
|
|
|
|
*/
|
|
|
|
if (request->priotree.priority == INT_MIN) {
|
|
|
|
GEM_BUG_ON(!list_empty(&request->priotree.link));
|
|
|
|
request->priotree.priority = prio;
|
|
|
|
if (stack.dfs_link.next == stack.dfs_link.prev)
|
|
|
|
return;
|
|
|
|
__list_del_entry(&stack.dfs_link);
|
|
|
|
}
|
|
|
|
|
2017-03-27 20:21:43 +00:00
|
|
|
engine = request->engine;
|
|
|
|
spin_lock_irq(&engine->timeline->lock);
|
|
|
|
|
2016-11-14 20:41:03 +00:00
|
|
|
/* Fifo and depth-first replacement ensure our deps execute before us */
|
|
|
|
list_for_each_entry_safe_reverse(dep, p, &dfs, dfs_link) {
|
|
|
|
struct i915_priotree *pt = dep->signaler;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&dep->dfs_link);
|
|
|
|
|
|
|
|
engine = pt_lock_engine(pt, engine);
|
|
|
|
|
|
|
|
if (prio <= pt->priority)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
pt->priority = prio;
|
drm/i915: Split execlist priority queue into rbtree + linked list
All the requests at the same priority are executed in FIFO order. They
do not need to be stored in the rbtree themselves, as they are a simple
list within a level. If we move the requests at one priority into a list,
we can then reduce the rbtree to the set of priorities. This should keep
the height of the rbtree small, as the number of active priorities can not
exceed the number of active requests and should be typically only a few.
Currently, we have ~2k possible different priority levels, that may
increase to allow even more fine grained selection. Allocating those in
advance seems a waste (and may be impossible), so we opt for allocating
upon first use, and freeing after its requests are depleted. To avoid
the possibility of an allocation failure causing us to lose a request,
we preallocate the default priority (0) and bump any request to that
priority if we fail to allocate it the appropriate plist. Having a
request (that is ready to run, so not leading to corruption) execute
out-of-order is better than leaking the request (and its dependency
tree) entirely.
There should be a benefit to reducing execlists_dequeue() to principally
using a simple list (and reducing the frequency of both rbtree iteration
and balancing on erase) but for typical workloads, request coalescing
should be small enough that we don't notice any change. The main gain is
from improving PI calls to schedule, and the explicit list within a
level should make request unwinding simpler (we just need to insert at
the head of the list rather than the tail and not have to make the
rbtree search more complicated).
v2: Avoid use-after-free when deleting a depleted priolist
v3: Michał found the solution to handling the allocation failure
gracefully. If we disable all priority scheduling following the
allocation failure, those requests will be executed in fifo and we will
ensure that this request and its dependencies are in strict fifo (even
when it doesn't realise it is only a single list). Normal scheduling is
restored once we know the device is idle, until the next failure!
Suggested-by: Michał Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170517121007.27224-8-chris@chris-wilson.co.uk
2017-05-17 12:10:03 +00:00
|
|
|
if (!list_empty(&pt->link)) {
|
|
|
|
__list_del_entry(&pt->link);
|
|
|
|
insert_request(engine, pt, prio);
|
2017-03-27 20:21:43 +00:00
|
|
|
}
|
2016-11-14 20:41:03 +00:00
|
|
|
}
|
|
|
|
|
2017-03-27 20:21:43 +00:00
|
|
|
spin_unlock_irq(&engine->timeline->lock);
|
2016-11-14 20:41:03 +00:00
|
|
|
|
|
|
|
/* XXX Do we need to preempt to make room for us and our deps? */
|
|
|
|
}
|
|
|
|
|
2017-05-04 09:33:08 +00:00
|
|
|
static struct intel_ring *
|
|
|
|
execlists_context_pin(struct intel_engine_cs *engine,
|
|
|
|
struct i915_gem_context *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 10:28:10 +00:00
|
|
|
{
|
2016-05-24 13:53:37 +00:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-12-18 15:37:23 +00:00
|
|
|
unsigned int flags;
|
2016-04-12 14:40:42 +00:00
|
|
|
void *vaddr;
|
2016-01-15 15:10:27 +00: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 10:28:10 +00:00
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
lockdep_assert_held(&ctx->i915->drm.struct_mutex);
|
2016-01-15 15:10:27 +00:00
|
|
|
|
2017-05-04 09:33:08 +00:00
|
|
|
if (likely(ce->pin_count++))
|
|
|
|
goto out;
|
2017-03-16 17:16:28 +00:00
|
|
|
GEM_BUG_ON(!ce->pin_count); /* no overflow please! */
|
2016-04-28 08:56:53 +00:00
|
|
|
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
if (!ce->state) {
|
|
|
|
ret = execlists_context_deferred_alloc(ctx, engine);
|
|
|
|
if (ret)
|
|
|
|
goto err;
|
|
|
|
}
|
2017-01-05 15:30:20 +00:00
|
|
|
GEM_BUG_ON(!ce->state);
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
|
2017-02-10 10:14:22 +00:00
|
|
|
flags = PIN_GLOBAL | PIN_HIGH;
|
2016-12-23 23:56:22 +00:00
|
|
|
if (ctx->ggtt_offset_bias)
|
|
|
|
flags |= PIN_OFFSET_BIAS | ctx->ggtt_offset_bias;
|
2016-12-18 15:37:23 +00:00
|
|
|
|
|
|
|
ret = i915_vma_pin(ce->state, 0, GEN8_LR_CONTEXT_ALIGN, flags);
|
2015-09-11 11:53:46 +00:00
|
|
|
if (ret)
|
2016-04-28 08:56:53 +00:00
|
|
|
goto err;
|
2014-11-13 10:28:56 +00:00
|
|
|
|
2016-08-15 09:48:54 +00:00
|
|
|
vaddr = i915_gem_object_pin_map(ce->state->obj, I915_MAP_WB);
|
2016-04-12 14:40:42 +00:00
|
|
|
if (IS_ERR(vaddr)) {
|
|
|
|
ret = PTR_ERR(vaddr);
|
2016-08-15 09:48:54 +00:00
|
|
|
goto unpin_vma;
|
2016-01-15 17:12:45 +00:00
|
|
|
}
|
|
|
|
|
2017-04-03 11:34:25 +00:00
|
|
|
ret = intel_ring_pin(ce->ring, ctx->i915, ctx->ggtt_offset_bias);
|
2015-09-11 11:53:46 +00:00
|
|
|
if (ret)
|
2016-04-12 14:40:42 +00: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 14:43:43 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
intel_lr_context_descriptor_update(ctx, engine);
|
2016-05-24 13:53:37 +00:00
|
|
|
|
2016-10-04 20:11:26 +00:00
|
|
|
ce->lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
|
|
|
|
ce->lrc_reg_state[CTX_RING_BUFFER_START+1] =
|
2016-08-15 09:49:07 +00:00
|
|
|
i915_ggtt_offset(ce->ring->vma);
|
2016-10-04 20:11:26 +00:00
|
|
|
|
2016-10-28 12:58:35 +00:00
|
|
|
ce->state->obj->mm.dirty = true;
|
2015-09-02 12:33:42 +00:00
|
|
|
|
2016-07-20 12:31:50 +00:00
|
|
|
i915_gem_context_get(ctx);
|
2017-05-04 09:33:08 +00:00
|
|
|
out:
|
|
|
|
return ce->ring;
|
2014-11-13 10:28:56 +00:00
|
|
|
|
2016-04-12 14:40:42 +00:00
|
|
|
unpin_map:
|
2016-08-15 09:48:54 +00:00
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
|
|
|
unpin_vma:
|
|
|
|
__i915_vma_unpin(ce->state);
|
2016-04-28 08:56:53 +00:00
|
|
|
err:
|
2016-05-24 13:53:37 +00:00
|
|
|
ce->pin_count = 0;
|
2017-05-04 09:33:08 +00:00
|
|
|
return ERR_PTR(ret);
|
2015-09-11 11:53:46 +00:00
|
|
|
}
|
|
|
|
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
static void execlists_context_unpin(struct intel_engine_cs *engine,
|
|
|
|
struct i915_gem_context *ctx)
|
2015-09-11 11:53:46 +00:00
|
|
|
{
|
2016-05-24 13:53:37 +00:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2015-09-11 11:53:46 +00:00
|
|
|
|
2016-07-05 09:40:23 +00:00
|
|
|
lockdep_assert_held(&ctx->i915->drm.struct_mutex);
|
2016-05-24 13:53:37 +00:00
|
|
|
GEM_BUG_ON(ce->pin_count == 0);
|
2016-01-28 10:29:55 +00:00
|
|
|
|
2016-05-24 13:53:37 +00:00
|
|
|
if (--ce->pin_count)
|
2016-04-28 08:56:53 +00:00
|
|
|
return;
|
2015-09-11 11:53:46 +00:00
|
|
|
|
2016-08-02 21:50:23 +00: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 10:28:10 +00:00
|
|
|
|
2016-08-15 09:48:54 +00:00
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
|
|
|
i915_vma_unpin(ce->state);
|
2016-01-28 10:29:55 +00:00
|
|
|
|
2016-07-20 12:31:50 +00: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 10:28:10 +00:00
|
|
|
}
|
|
|
|
|
2016-12-18 15:37:24 +00:00
|
|
|
static int execlists_request_alloc(struct drm_i915_gem_request *request)
|
2016-12-18 15:37:19 +00:00
|
|
|
{
|
|
|
|
struct intel_engine_cs *engine = request->engine;
|
|
|
|
struct intel_context *ce = &request->ctx->engine[engine->id];
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 *cs;
|
2016-12-18 15:37:19 +00:00
|
|
|
int ret;
|
|
|
|
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
GEM_BUG_ON(!ce->pin_count);
|
|
|
|
|
2016-12-18 15:37:19 +00: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.
|
|
|
|
*/
|
|
|
|
request->reserved_space += EXECLISTS_REQUEST_SIZE;
|
|
|
|
|
|
|
|
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 ...
|
|
|
|
*/
|
|
|
|
ret = i915_guc_wq_reserve(request);
|
|
|
|
if (ret)
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
goto err;
|
2016-12-18 15:37:19 +00:00
|
|
|
}
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
cs = intel_ring_begin(request, 0);
|
|
|
|
if (IS_ERR(cs)) {
|
|
|
|
ret = PTR_ERR(cs);
|
2016-12-18 15:37:19 +00:00
|
|
|
goto err_unreserve;
|
2017-02-14 11:32:42 +00:00
|
|
|
}
|
2016-12-18 15:37:19 +00:00
|
|
|
|
|
|
|
if (!ce->initialised) {
|
|
|
|
ret = engine->init_context(request);
|
|
|
|
if (ret)
|
|
|
|
goto err_unreserve;
|
|
|
|
|
|
|
|
ce->initialised = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
request->reserved_space -= EXECLISTS_REQUEST_SIZE;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_unreserve:
|
|
|
|
if (i915.enable_guc_submission)
|
|
|
|
i915_guc_wq_unreserve(request);
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
err:
|
2016-12-18 15:37:19 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-07-03 13:27:31 +00: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.
|
|
|
|
*/
|
2017-02-17 07:58:59 +00:00
|
|
|
static u32 *
|
|
|
|
gen8_emit_flush_coherentl3_wa(struct intel_engine_cs *engine, u32 *batch)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = MI_STORE_REGISTER_MEM_GEN8 | MI_SRM_LRM_GLOBAL_GTT;
|
|
|
|
*batch++ = i915_mmio_reg_offset(GEN8_L3SQCREG4);
|
|
|
|
*batch++ = i915_ggtt_offset(engine->scratch) + 256;
|
|
|
|
*batch++ = 0;
|
|
|
|
|
|
|
|
*batch++ = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
*batch++ = i915_mmio_reg_offset(GEN8_L3SQCREG4);
|
|
|
|
*batch++ = 0x40400000 | GEN8_LQSC_FLUSH_COHERENT_LINES;
|
|
|
|
|
2017-02-16 12:23:25 +00:00
|
|
|
batch = gen8_emit_pipe_control(batch,
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_DC_FLUSH_ENABLE,
|
|
|
|
0);
|
2017-02-17 07:58:59 +00:00
|
|
|
|
|
|
|
*batch++ = MI_LOAD_REGISTER_MEM_GEN8 | MI_SRM_LRM_GLOBAL_GTT;
|
|
|
|
*batch++ = i915_mmio_reg_offset(GEN8_L3SQCREG4);
|
|
|
|
*batch++ = i915_ggtt_offset(engine->scratch) + 256;
|
|
|
|
*batch++ = 0;
|
|
|
|
|
|
|
|
return batch;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-15 19:48:06 +00: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 14:50:43 +00:00
|
|
|
*
|
2016-07-15 19:48:06 +00: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-19 18:07:01 +00:00
|
|
|
*
|
2016-07-15 19:48:06 +00: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-19 18:07:01 +00:00
|
|
|
*/
|
2017-02-17 07:58:59 +00:00
|
|
|
static u32 *gen8_init_indirectctx_bb(struct intel_engine_cs *engine, u32 *batch)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2015-06-19 17:37:12 +00:00
|
|
|
/* WaDisableCtxRestoreArbitration:bdw,chv */
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = MI_ARB_ON_OFF | MI_ARB_DISABLE;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2015-06-19 17:37:13 +00:00
|
|
|
/* WaFlushCoherentL3CacheLinesAtContextSwitch:bdw */
|
2017-02-17 07:58:59 +00:00
|
|
|
if (IS_BROADWELL(engine->i915))
|
|
|
|
batch = gen8_emit_flush_coherentl3_wa(engine, batch);
|
2015-06-19 17:37:13 +00:00
|
|
|
|
2015-06-23 14:46:57 +00:00
|
|
|
/* WaClearSlmSpaceAtContextSwitch:bdw,chv */
|
|
|
|
/* Actual scratch location is at 128 bytes offset */
|
2017-02-16 12:23:25 +00:00
|
|
|
batch = gen8_emit_pipe_control(batch,
|
|
|
|
PIPE_CONTROL_FLUSH_L3 |
|
|
|
|
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE,
|
|
|
|
i915_ggtt_offset(engine->scratch) +
|
|
|
|
2 * CACHELINE_BYTES);
|
2015-06-23 14:46:57 +00:00
|
|
|
|
2015-06-19 18:07:01 +00:00
|
|
|
/* Pad to end of cacheline */
|
2017-02-17 07:58:59 +00:00
|
|
|
while ((unsigned long)batch % CACHELINE_BYTES)
|
|
|
|
*batch++ = MI_NOOP;
|
2015-06-19 18:07:01 +00: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
|
|
|
|
*/
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
return batch;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2016-07-15 19:48:06 +00: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-19 18:07:01 +00:00
|
|
|
*
|
2016-07-15 19:48:06 +00:00
|
|
|
* The number of DWORDS written are returned using this field.
|
2015-06-19 18:07:01 +00: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.
|
|
|
|
*/
|
2017-02-17 07:58:59 +00:00
|
|
|
static u32 *gen8_init_perctx_bb(struct intel_engine_cs *engine, u32 *batch)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2015-06-19 17:37:12 +00:00
|
|
|
/* WaDisableCtxRestoreArbitration:bdw,chv */
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = MI_ARB_ON_OFF | MI_ARB_ENABLE;
|
|
|
|
*batch++ = MI_BATCH_BUFFER_END;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
return batch;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
static u32 *gen9_init_indirectctx_bb(struct intel_engine_cs *engine, u32 *batch)
|
2015-07-14 14:01:27 +00:00
|
|
|
{
|
2017-01-26 09:16:58 +00:00
|
|
|
/* WaFlushCoherentL3CacheLinesAtContextSwitch:skl,bxt,glk */
|
2017-02-17 07:58:59 +00:00
|
|
|
batch = gen8_emit_flush_coherentl3_wa(engine, batch);
|
2015-07-14 14:01:29 +00:00
|
|
|
|
2017-01-26 09:16:58 +00:00
|
|
|
/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl,glk */
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
*batch++ = i915_mmio_reg_offset(COMMON_SLICE_CHICKEN2);
|
|
|
|
*batch++ = _MASKED_BIT_DISABLE(
|
|
|
|
GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE);
|
|
|
|
*batch++ = MI_NOOP;
|
2016-07-20 11:26:13 +00:00
|
|
|
|
2016-06-07 14:19:15 +00:00
|
|
|
/* WaClearSlmSpaceAtContextSwitch:kbl */
|
|
|
|
/* Actual scratch location is at 128 bytes offset */
|
2017-02-17 07:58:59 +00:00
|
|
|
if (IS_KBL_REVID(engine->i915, 0, KBL_REVID_A0)) {
|
2017-02-16 12:23:25 +00:00
|
|
|
batch = gen8_emit_pipe_control(batch,
|
|
|
|
PIPE_CONTROL_FLUSH_L3 |
|
|
|
|
PIPE_CONTROL_GLOBAL_GTT_IVB |
|
|
|
|
PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE,
|
|
|
|
i915_ggtt_offset(engine->scratch)
|
|
|
|
+ 2 * CACHELINE_BYTES);
|
2016-06-07 14:19:15 +00:00
|
|
|
}
|
2016-07-05 09:01:30 +00:00
|
|
|
|
2017-01-26 09:16:58 +00:00
|
|
|
/* WaMediaPoolStateCmdInWABB:bxt,glk */
|
2016-07-05 09:01:30 +00:00
|
|
|
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.
|
|
|
|
*/
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = GEN9_MEDIA_POOL_STATE;
|
|
|
|
*batch++ = GEN9_MEDIA_POOL_ENABLE;
|
|
|
|
*batch++ = 0x00777000;
|
|
|
|
*batch++ = 0;
|
|
|
|
*batch++ = 0;
|
|
|
|
*batch++ = 0;
|
2016-07-05 09:01:30 +00:00
|
|
|
}
|
|
|
|
|
2015-07-14 14:01:27 +00:00
|
|
|
/* Pad to end of cacheline */
|
2017-02-17 07:58:59 +00:00
|
|
|
while ((unsigned long)batch % CACHELINE_BYTES)
|
|
|
|
*batch++ = MI_NOOP;
|
2015-07-14 14:01:27 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
return batch;
|
2015-07-14 14:01:27 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
static u32 *gen9_init_perctx_bb(struct intel_engine_cs *engine, u32 *batch)
|
2015-07-14 14:01:27 +00:00
|
|
|
{
|
2017-02-17 07:58:59 +00:00
|
|
|
*batch++ = MI_BATCH_BUFFER_END;
|
2015-07-14 14:01:27 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
return batch;
|
2015-07-14 14:01:27 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
#define CTX_WA_BB_OBJ_SIZE (PAGE_SIZE)
|
|
|
|
|
|
|
|
static int lrc_setup_wa_ctx(struct intel_engine_cs *engine)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2016-08-15 09:49:04 +00:00
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
struct i915_vma *vma;
|
|
|
|
int err;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
obj = i915_gem_object_create(engine->i915, CTX_WA_BB_OBJ_SIZE);
|
2016-08-15 09:49:04 +00:00
|
|
|
if (IS_ERR(obj))
|
|
|
|
return PTR_ERR(obj);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-01-16 15:21:30 +00:00
|
|
|
vma = i915_vma_instance(obj, &engine->i915->ggtt.base, NULL);
|
2016-08-15 09:49:04 +00:00
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
err = PTR_ERR(vma);
|
|
|
|
goto err;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2016-08-15 09:49:04 +00:00
|
|
|
err = i915_vma_pin(vma, 0, PAGE_SIZE, PIN_GLOBAL | PIN_HIGH);
|
|
|
|
if (err)
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
engine->wa_ctx.vma = vma;
|
2015-06-19 18:07:01 +00:00
|
|
|
return 0;
|
2016-08-15 09:49:04 +00:00
|
|
|
|
|
|
|
err:
|
|
|
|
i915_gem_object_put(obj);
|
|
|
|
return err;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
static void lrc_destroy_wa_ctx(struct intel_engine_cs *engine)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2016-08-15 09:49:05 +00:00
|
|
|
i915_vma_unpin_and_release(&engine->wa_ctx.vma);
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
typedef u32 *(*wa_bb_func_t)(struct intel_engine_cs *engine, u32 *batch);
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static int intel_init_workaround_bb(struct intel_engine_cs *engine)
|
2015-06-19 18:07:01 +00:00
|
|
|
{
|
2016-08-15 09:49:04 +00:00
|
|
|
struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
|
2017-02-17 07:58:59 +00:00
|
|
|
struct i915_wa_ctx_bb *wa_bb[2] = { &wa_ctx->indirect_ctx,
|
|
|
|
&wa_ctx->per_ctx };
|
|
|
|
wa_bb_func_t wa_bb_fn[2];
|
2015-06-19 18:07:01 +00:00
|
|
|
struct page *page;
|
2017-02-17 07:58:59 +00:00
|
|
|
void *batch, *batch_ptr;
|
|
|
|
unsigned int i;
|
2016-08-15 09:49:04 +00:00
|
|
|
int ret;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
if (WARN_ON(engine->id != RCS || !engine->scratch))
|
|
|
|
return -EINVAL;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
switch (INTEL_GEN(engine->i915)) {
|
|
|
|
case 9:
|
|
|
|
wa_bb_fn[0] = gen9_init_indirectctx_bb;
|
|
|
|
wa_bb_fn[1] = gen9_init_perctx_bb;
|
|
|
|
break;
|
|
|
|
case 8:
|
|
|
|
wa_bb_fn[0] = gen8_init_indirectctx_bb;
|
|
|
|
wa_bb_fn[1] = gen8_init_perctx_bb;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(INTEL_GEN(engine->i915));
|
2015-06-23 14:50:44 +00:00
|
|
|
return 0;
|
2015-07-14 14:01:27 +00:00
|
|
|
}
|
2015-06-23 14:50:44 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
ret = lrc_setup_wa_ctx(engine);
|
2015-06-19 18:07:01 +00:00
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_DRIVER("Failed to setup context WA page: %d\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-08-15 09:49:04 +00:00
|
|
|
page = i915_gem_object_get_dirty_page(wa_ctx->vma->obj, 0);
|
2017-02-17 07:58:59 +00:00
|
|
|
batch = batch_ptr = kmap_atomic(page);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
/*
|
|
|
|
* Emit the two workaround batch buffers, recording the offset from the
|
|
|
|
* start of the workaround batch buffer object for each and their
|
|
|
|
* respective sizes.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < ARRAY_SIZE(wa_bb_fn); i++) {
|
|
|
|
wa_bb[i]->offset = batch_ptr - batch;
|
|
|
|
if (WARN_ON(!IS_ALIGNED(wa_bb[i]->offset, CACHELINE_BYTES))) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
batch_ptr = wa_bb_fn[i](engine, batch_ptr);
|
|
|
|
wa_bb[i]->size = batch_ptr - (batch + wa_bb[i]->offset);
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
BUG_ON(batch_ptr - batch > CTX_WA_BB_OBJ_SIZE);
|
|
|
|
|
2015-06-19 18:07:01 +00:00
|
|
|
kunmap_atomic(batch);
|
|
|
|
if (ret)
|
2017-02-17 07:58:59 +00:00
|
|
|
lrc_destroy_wa_ctx(engine);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static int gen8_init_common_ring(struct intel_engine_cs *engine)
|
2014-07-24 16:04:24 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2017-04-25 10:38:35 +00:00
|
|
|
struct execlist_port *port = engine->execlist_port;
|
|
|
|
unsigned int n;
|
2017-05-17 12:10:00 +00:00
|
|
|
bool submit;
|
2016-09-09 13:11:53 +00:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = intel_mocs_init_engine(engine);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2014-07-24 16:04:24 +00:00
|
|
|
|
2016-10-07 06:53:26 +00:00
|
|
|
intel_engine_reset_breadcrumbs(engine);
|
2017-01-05 15:30:21 +00:00
|
|
|
intel_engine_init_hangcheck(engine);
|
2016-09-09 13:11:53 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
I915_WRITE(RING_HWSTAM(engine->mmio_base), 0xffffffff);
|
|
|
|
I915_WRITE(RING_MODE_GEN7(engine),
|
2014-07-24 16:04:24 +00:00
|
|
|
_MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE));
|
2017-01-05 15:30:21 +00:00
|
|
|
I915_WRITE(RING_HWS_PGA(engine->mmio_base),
|
|
|
|
engine->status_page.ggtt_offset);
|
|
|
|
POSTING_READ(RING_HWS_PGA(engine->mmio_base));
|
2015-09-28 12:25:12 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
DRM_DEBUG_DRIVER("Execlists enabled for %s\n", engine->name);
|
2014-07-24 16:04:24 +00:00
|
|
|
|
2016-10-04 20:11:27 +00:00
|
|
|
/* After a GPU reset, we may have requests to replay */
|
2017-01-24 15:20:21 +00:00
|
|
|
clear_bit(ENGINE_IRQ_EXECLIST, &engine->irq_posted);
|
2017-04-25 10:38:35 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
submit = false;
|
2017-04-25 10:38:35 +00:00
|
|
|
for (n = 0; n < ARRAY_SIZE(engine->execlist_port); n++) {
|
2017-05-17 12:10:00 +00:00
|
|
|
if (!port_isset(&port[n]))
|
2017-04-25 10:38:35 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("Restarting %s:%d from 0x%x\n",
|
|
|
|
engine->name, n,
|
2017-05-17 12:10:00 +00:00
|
|
|
port_request(&port[n])->global_seqno);
|
2017-04-25 10:38:35 +00:00
|
|
|
|
|
|
|
/* Discard the current inflight count */
|
2017-05-17 12:10:00 +00:00
|
|
|
port_set(&port[n], port_request(&port[n]));
|
|
|
|
submit = true;
|
2016-10-04 20:11:27 +00:00
|
|
|
}
|
2016-09-09 13:11:53 +00:00
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
if (submit && !i915.enable_guc_submission)
|
2017-04-25 10:38:35 +00:00
|
|
|
execlists_submit_ports(engine);
|
|
|
|
|
2016-09-09 13:11:53 +00:00
|
|
|
return 0;
|
2014-07-24 16:04:24 +00:00
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static int gen8_init_render_ring(struct intel_engine_cs *engine)
|
2014-07-24 16:04:24 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-07-24 16:04:24 +00:00
|
|
|
int ret;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
ret = gen8_init_common_ring(engine);
|
2014-07-24 16:04:24 +00: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 11:00:37 +00:00
|
|
|
return init_workarounds_ring(engine);
|
2014-07-24 16:04:24 +00:00
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static int gen9_init_render_ring(struct intel_engine_cs *engine)
|
2015-02-09 19:33:08 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
ret = gen8_init_common_ring(engine);
|
2015-02-09 19:33:08 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
return init_workarounds_ring(engine);
|
2015-02-09 19:33:08 +00:00
|
|
|
}
|
|
|
|
|
2016-09-09 13:11:53 +00:00
|
|
|
static void reset_common_ring(struct intel_engine_cs *engine,
|
|
|
|
struct drm_i915_gem_request *request)
|
|
|
|
{
|
|
|
|
struct execlist_port *port = engine->execlist_port;
|
2017-02-07 15:24:37 +00:00
|
|
|
struct intel_context *ce;
|
|
|
|
|
|
|
|
/* If the request was innocent, we leave the request in the ELSP
|
|
|
|
* and will try to replay it on restarting. The context image may
|
|
|
|
* have been corrupted by the reset, in which case we may have
|
|
|
|
* to service a new GPU hang, but more likely we can continue on
|
|
|
|
* without impact.
|
|
|
|
*
|
|
|
|
* If the request was guilty, we presume the context is corrupt
|
|
|
|
* and have to at least restore the RING register in the context
|
|
|
|
* image back to the expected values to skip over the guilty request.
|
|
|
|
*/
|
|
|
|
if (!request || request->fence.error != -EIO)
|
|
|
|
return;
|
2016-09-09 13:11:53 +00:00
|
|
|
|
2016-10-04 20:11:26 +00:00
|
|
|
/* We want a simple context + ring to execute the breadcrumb update.
|
|
|
|
* We cannot rely on the context being intact across the GPU hang,
|
|
|
|
* so clear it and rebuild just what we need for the breadcrumb.
|
|
|
|
* All pending requests for this context will be zapped, and any
|
|
|
|
* future request will be after userspace has had the opportunity
|
|
|
|
* to recreate its own state.
|
|
|
|
*/
|
2017-02-07 15:24:37 +00:00
|
|
|
ce = &request->ctx->engine[engine->id];
|
2016-10-04 20:11:26 +00:00
|
|
|
execlists_init_reg_state(ce->lrc_reg_state,
|
|
|
|
request->ctx, engine, ce->ring);
|
|
|
|
|
2016-09-09 13:11:53 +00:00
|
|
|
/* Move the RING_HEAD onto the breadcrumb, past the hanging batch */
|
2016-10-04 20:11:26 +00:00
|
|
|
ce->lrc_reg_state[CTX_RING_BUFFER_START+1] =
|
|
|
|
i915_ggtt_offset(ce->ring->vma);
|
2016-09-09 13:11:53 +00:00
|
|
|
ce->lrc_reg_state[CTX_RING_HEAD+1] = request->postfix;
|
2016-10-04 20:11:26 +00:00
|
|
|
|
2016-09-09 13:11:53 +00:00
|
|
|
request->ring->head = request->postfix;
|
|
|
|
intel_ring_update_space(request->ring);
|
|
|
|
|
|
|
|
/* Catch up with any missed context-switch interrupts */
|
2017-05-17 12:10:00 +00:00
|
|
|
if (request->ctx != port_request(port)->ctx) {
|
|
|
|
i915_gem_request_put(port_request(port));
|
2016-09-09 13:11:53 +00:00
|
|
|
port[0] = port[1];
|
|
|
|
memset(&port[1], 0, sizeof(port[1]));
|
|
|
|
}
|
|
|
|
|
2017-05-17 12:10:00 +00:00
|
|
|
GEM_BUG_ON(request->ctx != port_request(port)->ctx);
|
2016-10-04 20:11:26 +00:00
|
|
|
|
|
|
|
/* Reset WaIdleLiteRestore:bdw,skl as well */
|
2017-03-27 13:00:07 +00:00
|
|
|
request->tail =
|
|
|
|
intel_ring_wrap(request->ring,
|
|
|
|
request->wa_tail - WA_TAIL_DWORDS*sizeof(u32));
|
2017-03-27 13:14:12 +00:00
|
|
|
assert_ring_tail_valid(request->ring, request->tail);
|
2016-09-09 13:11:53 +00:00
|
|
|
}
|
|
|
|
|
2015-06-26 12:46:14 +00:00
|
|
|
static int intel_logical_ring_emit_pdps(struct drm_i915_gem_request *req)
|
|
|
|
{
|
|
|
|
struct i915_hw_ppgtt *ppgtt = req->ctx->ppgtt;
|
2016-03-16 11:00:38 +00:00
|
|
|
struct intel_engine_cs *engine = req->engine;
|
2017-02-28 15:28:10 +00:00
|
|
|
const int num_lri_cmds = GEN8_3LVL_PDPES * 2;
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 *cs;
|
|
|
|
int i;
|
2015-06-26 12:46:14 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
cs = intel_ring_begin(req, num_lri_cmds * 2 + 2);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2015-06-26 12:46:14 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(num_lri_cmds);
|
2017-02-28 15:28:10 +00:00
|
|
|
for (i = GEN8_3LVL_PDPES - 1; i >= 0; i--) {
|
2015-06-26 12:46:14 +00:00
|
|
|
const dma_addr_t pd_daddr = i915_page_dir_dma_addr(ppgtt, i);
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = i915_mmio_reg_offset(GEN8_RING_PDP_UDW(engine, i));
|
|
|
|
*cs++ = upper_32_bits(pd_daddr);
|
|
|
|
*cs++ = i915_mmio_reg_offset(GEN8_RING_PDP_LDW(engine, i));
|
|
|
|
*cs++ = lower_32_bits(pd_daddr);
|
2015-06-26 12:46:14 +00:00
|
|
|
}
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
intel_ring_advance(req, cs);
|
2015-06-26 12:46:14 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-29 16:44:03 +00:00
|
|
|
static int gen8_emit_bb_start(struct drm_i915_gem_request *req,
|
2016-08-02 21:50:27 +00:00
|
|
|
u64 offset, u32 len,
|
2017-02-28 15:28:08 +00:00
|
|
|
const unsigned int flags)
|
2014-07-24 16:04:32 +00:00
|
|
|
{
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 *cs;
|
2014-07-24 16:04:32 +00:00
|
|
|
int ret;
|
|
|
|
|
2015-06-26 12:46:14 +00: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 10:06:23 +00:00
|
|
|
* not idle). PML4 is allocated during ppgtt init so this is
|
|
|
|
* not needed in 48-bit.*/
|
2015-06-26 12:46:14 +00:00
|
|
|
if (req->ctx->ppgtt &&
|
2017-02-28 15:28:08 +00:00
|
|
|
(intel_engine_flag(req->engine) & req->ctx->ppgtt->pd_dirty_rings) &&
|
|
|
|
!i915_vm_is_48bit(&req->ctx->ppgtt->base) &&
|
|
|
|
!intel_vgpu_active(req->i915)) {
|
|
|
|
ret = intel_logical_ring_emit_pdps(req);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2015-06-26 12:46:14 +00:00
|
|
|
|
2016-03-16 11:00:39 +00:00
|
|
|
req->ctx->ppgtt->pd_dirty_rings &= ~intel_engine_flag(req->engine);
|
2015-06-26 12:46:14 +00:00
|
|
|
}
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
cs = intel_ring_begin(req, 4);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2014-07-24 16:04:32 +00:00
|
|
|
|
|
|
|
/* FIXME(BDW): Address space and security selectors. */
|
2017-02-28 15:28:08 +00:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START_GEN8 |
|
|
|
|
(flags & I915_DISPATCH_SECURE ? 0 : BIT(8)) |
|
|
|
|
(flags & I915_DISPATCH_RS ? MI_BATCH_RESOURCE_STREAMER : 0);
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = lower_32_bits(offset);
|
|
|
|
*cs++ = upper_32_bits(offset);
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
intel_ring_advance(req, cs);
|
2014-07-24 16:04:32 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-01 16:23:27 +00:00
|
|
|
static void gen8_logical_ring_enable_irq(struct intel_engine_cs *engine)
|
2014-07-24 16:04:31 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-07-01 16:23:27 +00:00
|
|
|
I915_WRITE_IMR(engine,
|
|
|
|
~(engine->irq_enable_mask | engine->irq_keep_mask));
|
|
|
|
POSTING_READ_FW(RING_IMR(engine->mmio_base));
|
2014-07-24 16:04:31 +00:00
|
|
|
}
|
|
|
|
|
2016-07-01 16:23:27 +00:00
|
|
|
static void gen8_logical_ring_disable_irq(struct intel_engine_cs *engine)
|
2014-07-24 16:04:31 +00:00
|
|
|
{
|
2016-05-06 14:40:21 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-07-01 16:23:27 +00:00
|
|
|
I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
|
2014-07-24 16:04:31 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:25 +00:00
|
|
|
static int gen8_emit_flush(struct drm_i915_gem_request *request, u32 mode)
|
2014-07-24 16:04:28 +00:00
|
|
|
{
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 cmd, *cs;
|
2014-07-24 16:04:28 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
cs = intel_ring_begin(request, 4);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2014-07-24 16:04:28 +00:00
|
|
|
|
|
|
|
cmd = MI_FLUSH_DW + 1;
|
|
|
|
|
2015-01-22 13:42:00 +00: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-02 21:50:25 +00:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2015-01-22 13:42:00 +00:00
|
|
|
cmd |= MI_INVALIDATE_TLB;
|
2016-08-02 21:50:19 +00:00
|
|
|
if (request->engine->id == VCS)
|
2015-01-22 13:42:00 +00:00
|
|
|
cmd |= MI_INVALIDATE_BSD;
|
2014-07-24 16:04:28 +00:00
|
|
|
}
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = cmd;
|
|
|
|
*cs++ = I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT;
|
|
|
|
*cs++ = 0; /* upper addr */
|
|
|
|
*cs++ = 0; /* value */
|
|
|
|
intel_ring_advance(request, cs);
|
2014-07-24 16:04:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-05-29 16:43:59 +00:00
|
|
|
static int gen8_emit_flush_render(struct drm_i915_gem_request *request,
|
2016-08-02 21:50:25 +00:00
|
|
|
u32 mode)
|
2014-07-24 16:04:28 +00:00
|
|
|
{
|
2016-08-02 21:50:18 +00:00
|
|
|
struct intel_engine_cs *engine = request->engine;
|
2016-08-15 09:49:07 +00:00
|
|
|
u32 scratch_addr =
|
|
|
|
i915_ggtt_offset(engine->scratch) + 2 * CACHELINE_BYTES;
|
2016-06-07 14:19:10 +00:00
|
|
|
bool vf_flush_wa = false, dc_flush_wa = false;
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 *cs, flags = 0;
|
2016-06-07 14:19:10 +00:00
|
|
|
int len;
|
2014-07-24 16:04:28 +00:00
|
|
|
|
|
|
|
flags |= PIPE_CONTROL_CS_STALL;
|
|
|
|
|
2016-08-02 21:50:25 +00:00
|
|
|
if (mode & EMIT_FLUSH) {
|
2014-07-24 16:04:28 +00:00
|
|
|
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
|
|
|
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
2016-01-14 02:59:39 +00:00
|
|
|
flags |= PIPE_CONTROL_DC_FLUSH_ENABLE;
|
2015-08-21 15:08:41 +00:00
|
|
|
flags |= PIPE_CONTROL_FLUSH_ENABLE;
|
2014-07-24 16:04:28 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:25 +00:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2014-07-24 16:04:28 +00: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-17 17:49:57 +00:00
|
|
|
/*
|
|
|
|
* On GEN9: before VF_CACHE_INVALIDATE we need to emit a NULL
|
|
|
|
* pipe control.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
if (IS_GEN9(request->i915))
|
2015-12-17 17:49:57 +00:00
|
|
|
vf_flush_wa = true;
|
2016-06-07 14:19:10 +00:00
|
|
|
|
|
|
|
/* WaForGAMHang:kbl */
|
|
|
|
if (IS_KBL_REVID(request->i915, 0, KBL_REVID_B0))
|
|
|
|
dc_flush_wa = true;
|
2015-12-17 17:49:57 +00:00
|
|
|
}
|
2015-01-25 21:27:11 +00:00
|
|
|
|
2016-06-07 14:19:10 +00:00
|
|
|
len = 6;
|
|
|
|
|
|
|
|
if (vf_flush_wa)
|
|
|
|
len += 6;
|
|
|
|
|
|
|
|
if (dc_flush_wa)
|
|
|
|
len += 12;
|
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
cs = intel_ring_begin(request, len);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2014-07-24 16:04:28 +00:00
|
|
|
|
2017-02-16 12:23:25 +00:00
|
|
|
if (vf_flush_wa)
|
|
|
|
cs = gen8_emit_pipe_control(cs, 0, 0);
|
2015-01-25 21:27:11 +00:00
|
|
|
|
2017-02-16 12:23:25 +00:00
|
|
|
if (dc_flush_wa)
|
|
|
|
cs = gen8_emit_pipe_control(cs, PIPE_CONTROL_DC_FLUSH_ENABLE,
|
|
|
|
0);
|
2016-06-07 14:19:10 +00:00
|
|
|
|
2017-02-16 12:23:25 +00:00
|
|
|
cs = gen8_emit_pipe_control(cs, flags, scratch_addr);
|
2016-06-07 14:19:10 +00:00
|
|
|
|
2017-02-16 12:23:25 +00:00
|
|
|
if (dc_flush_wa)
|
|
|
|
cs = gen8_emit_pipe_control(cs, PIPE_CONTROL_CS_STALL, 0);
|
2016-06-07 14:19:10 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
intel_ring_advance(request, cs);
|
2014-07-24 16:04:28 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-01-20 13:43:35 +00: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).
|
|
|
|
*/
|
2017-02-14 11:32:42 +00:00
|
|
|
static void gen8_emit_wa_tail(struct drm_i915_gem_request *request, u32 *cs)
|
2014-07-24 16:04:27 +00:00
|
|
|
{
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
request->wa_tail = intel_ring_offset(request, cs);
|
2016-10-28 12:58:52 +00:00
|
|
|
}
|
2014-07-24 16:04:27 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
static void gen8_emit_breadcrumb(struct drm_i915_gem_request *request, u32 *cs)
|
2016-10-28 12:58:52 +00:00
|
|
|
{
|
2016-01-20 13:43:35 +00: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-24 16:04:27 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = (MI_FLUSH_DW + 1) | MI_FLUSH_DW_OP_STOREDW;
|
|
|
|
*cs++ = intel_hws_seqno_address(request->engine) | MI_FLUSH_DW_USE_GTT;
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = request->global_seqno;
|
|
|
|
*cs++ = MI_USER_INTERRUPT;
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
request->tail = intel_ring_offset(request, cs);
|
2017-03-27 13:14:12 +00:00
|
|
|
assert_ring_tail_valid(request->ring, request->tail);
|
2016-10-28 12:58:52 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
gen8_emit_wa_tail(request, cs);
|
2016-01-20 13:43:35 +00:00
|
|
|
}
|
2014-07-24 16:04:27 +00:00
|
|
|
|
2016-10-28 12:58:51 +00:00
|
|
|
static const int gen8_emit_breadcrumb_sz = 6 + WA_TAIL_DWORDS;
|
|
|
|
|
2016-10-28 12:58:52 +00:00
|
|
|
static void gen8_emit_breadcrumb_render(struct drm_i915_gem_request *request,
|
2017-02-14 11:32:42 +00:00
|
|
|
u32 *cs)
|
2016-01-20 13:43:35 +00:00
|
|
|
{
|
2016-04-12 13:51:55 +00:00
|
|
|
/* We're using qword write, seqno should be aligned to 8 bytes. */
|
|
|
|
BUILD_BUG_ON(I915_GEM_HWS_INDEX & 1);
|
|
|
|
|
2016-01-20 13:43:35 +00: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.
|
|
|
|
*/
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(6);
|
|
|
|
*cs++ = PIPE_CONTROL_GLOBAL_GTT_IVB | PIPE_CONTROL_CS_STALL |
|
|
|
|
PIPE_CONTROL_QW_WRITE;
|
|
|
|
*cs++ = intel_hws_seqno_address(request->engine);
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = request->global_seqno;
|
2016-04-12 13:51:55 +00:00
|
|
|
/* We're thrashing one dword of HWS. */
|
2017-02-14 11:32:42 +00:00
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = MI_USER_INTERRUPT;
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
request->tail = intel_ring_offset(request, cs);
|
2017-03-27 13:14:12 +00:00
|
|
|
assert_ring_tail_valid(request->ring, request->tail);
|
2016-10-28 12:58:52 +00:00
|
|
|
|
2017-02-14 11:32:42 +00:00
|
|
|
gen8_emit_wa_tail(request, cs);
|
2014-07-24 16:04:27 +00:00
|
|
|
}
|
|
|
|
|
2016-10-28 12:58:51 +00:00
|
|
|
static const int gen8_emit_breadcrumb_render_sz = 8 + WA_TAIL_DWORDS;
|
|
|
|
|
2015-05-29 16:43:44 +00:00
|
|
|
static int gen8_init_rcs_context(struct drm_i915_gem_request *req)
|
2014-12-02 12:50:48 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2017-02-14 15:00:17 +00:00
|
|
|
ret = intel_ring_workarounds_emit(req);
|
2014-12-02 12:50:48 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2015-07-10 17:13:11 +00: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-10-28 12:58:31 +00:00
|
|
|
return i915_gem_render_state_emit(req);
|
2014-12-02 12:50:48 +00:00
|
|
|
}
|
|
|
|
|
2014-07-24 16:04:48 +00:00
|
|
|
/**
|
|
|
|
* intel_logical_ring_cleanup() - deallocate the Engine Command Streamer
|
2016-06-03 13:02:17 +00:00
|
|
|
* @engine: Engine Command Streamer.
|
2014-07-24 16:04:48 +00:00
|
|
|
*/
|
2016-03-16 11:00:37 +00:00
|
|
|
void intel_logical_ring_cleanup(struct intel_engine_cs *engine)
|
2014-07-24 16:04:22 +00:00
|
|
|
{
|
2014-10-31 12:00:26 +00:00
|
|
|
struct drm_i915_private *dev_priv;
|
2014-07-24 16:04:30 +00: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 11:11:56 +00: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 14:40:21 +00:00
|
|
|
dev_priv = engine->i915;
|
2014-10-31 12:00:26 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (engine->buffer) {
|
|
|
|
WARN_ON((I915_READ_MODE(engine) & MODE_IDLE) == 0);
|
2015-12-08 15:02:36 +00:00
|
|
|
}
|
2014-07-24 16:04:23 +00:00
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
if (engine->cleanup)
|
|
|
|
engine->cleanup(engine);
|
2014-07-24 16:04:23 +00:00
|
|
|
|
2016-08-15 09:48:57 +00:00
|
|
|
if (engine->status_page.vma) {
|
|
|
|
i915_gem_object_unpin_map(engine->status_page.vma->obj);
|
|
|
|
engine->status_page.vma = NULL;
|
2014-07-24 16:04:23 +00:00
|
|
|
}
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
|
|
|
|
intel_engine_cleanup_common(engine);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-17 07:58:59 +00:00
|
|
|
lrc_destroy_wa_ctx(engine);
|
2016-05-06 14:40:21 +00:00
|
|
|
engine->i915 = NULL;
|
drm/i915: Allocate intel_engine_cs structure only for the enabled engines
With the possibility of addition of many more number of rings in future,
the drm_i915_private structure could bloat as an array, of type
intel_engine_cs, is embedded inside it.
struct intel_engine_cs engine[I915_NUM_ENGINES];
Though this is still fine as generally there is only a single instance of
drm_i915_private structure used, but not all of the possible rings would be
enabled or active on most of the platforms. Some memory can be saved by
allocating intel_engine_cs structure only for the enabled/active engines.
Currently the engine/ring ID is kept static and dev_priv->engine[] is simply
indexed using the enums defined in intel_engine_id.
To save memory and continue using the static engine/ring IDs, 'engine' is
defined as an array of pointers.
struct intel_engine_cs *engine[I915_NUM_ENGINES];
dev_priv->engine[engine_ID] will be NULL for disabled engine instances.
There is a text size reduction of 928 bytes, from 1028200 to 1027272, for
i915.o file (but for i915.ko file text size remain same as 1193131 bytes).
v2:
- Remove the engine iterator field added in drm_i915_private structure,
instead pass a local iterator variable to the for_each_engine**
macros. (Chris)
- Do away with intel_engine_initialized() and instead directly use the
NULL pointer check on engine pointer. (Chris)
v3:
- Remove for_each_engine_id() macro, as the updated macro for_each_engine()
can be used in place of it. (Chris)
- Protect the access to Render engine Fault register with a NULL check, as
engine specific init is done later in Driver load sequence.
v4:
- Use !!dev_priv->engine[VCS] style for the engine check in getparam. (Chris)
- Kill the superfluous init_engine_lists().
v5:
- Cleanup the intel_engines_init() & intel_engines_setup(), with respect to
allocation of intel_engine_cs structure. (Chris)
v6:
- Rebase.
v7:
- Optimize the for_each_engine_masked() macro. (Chris)
- Change the type of 'iter' local variable to enum intel_engine_id. (Chris)
- Rebase.
v8: Rebase.
v9: Rebase.
v10:
- For index calculation use engine ID instead of pointer based arithmetic in
intel_engine_sync_index() as engine pointers are not contiguous now (Chris)
- For appropriateness, rename local enum variable 'iter' to 'id'. (Joonas)
- Use for_each_engine macro for cleanup in intel_engines_init() and remove
check for NULL engine pointer in cleanup() routines. (Joonas)
v11: Rebase.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476378888-7372-1-git-send-email-akash.goel@intel.com
2016-10-13 17:14:48 +00:00
|
|
|
dev_priv->engine[engine->id] = NULL;
|
|
|
|
kfree(engine);
|
2014-07-24 16:04:22 +00:00
|
|
|
}
|
|
|
|
|
2017-03-16 17:13:03 +00:00
|
|
|
static void execlists_set_default_submission(struct intel_engine_cs *engine)
|
2016-08-02 21:50:31 +00:00
|
|
|
{
|
2017-03-16 17:13:03 +00:00
|
|
|
engine->submit_request = execlists_submit_request;
|
|
|
|
engine->schedule = execlists_schedule;
|
2017-03-18 10:28:59 +00:00
|
|
|
engine->irq_tasklet.func = intel_lrc_irq_handler;
|
2016-08-02 21:50:31 +00:00
|
|
|
}
|
|
|
|
|
2016-01-12 17:32:34 +00:00
|
|
|
static void
|
2016-05-06 14:40:20 +00:00
|
|
|
logical_ring_default_vfuncs(struct intel_engine_cs *engine)
|
2016-01-12 17:32:34 +00:00
|
|
|
{
|
|
|
|
/* Default vfuncs which can be overriden by each engine. */
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->init_hw = gen8_init_common_ring;
|
2016-09-09 13:11:53 +00:00
|
|
|
engine->reset_hw = reset_common_ring;
|
drm/i915: Unify active context tracking between legacy/execlists/guc
The requests conversion introduced a nasty bug where we could generate a
new request in the middle of constructing a request if we needed to idle
the system in order to evict space for a context. The request to idle
would be executed (and waited upon) before the current one, creating a
minor havoc in the seqno accounting, as we will consider the current
request to already be completed (prior to deferred seqno assignment) but
ring->last_retired_head would have been updated and still could allow
us to overwrite the current request before execution.
We also employed two different mechanisms to track the active context
until it was switched out. The legacy method allowed for waiting upon an
active context (it could forcibly evict any vma, including context's),
but the execlists method took a step backwards by pinning the vma for
the entire active lifespan of the context (the only way to evict was to
idle the entire GPU, not individual contexts). However, to circumvent
the tricky issue of locking (i.e. we cannot take struct_mutex at the
time of i915_gem_request_submit(), where we would want to move the
previous context onto the active tracker and unpin it), we take the
execlists approach and keep the contexts pinned until retirement.
The benefit of the execlists approach, more important for execlists than
legacy, was the reduction in work in pinning the context for each
request - as the context was kept pinned until idle, it could short
circuit the pinning for all active contexts.
We introduce new engine vfuncs to pin and unpin the context
respectively. The context is pinned at the start of the request, and
only unpinned when the following request is retired (this ensures that
the context is idle and coherent in main memory before we unpin it). We
move the engine->last_context tracking into the retirement itself
(rather than during request submission) in order to allow the submission
to be reordered or unwound without undue difficultly.
And finally an ulterior motive for unifying context handling was to
prepare for mock requests.
v2: Rename to last_retired_context, split out legacy_context tracking
for MI_SET_CONTEXT.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161218153724.8439-3-chris@chris-wilson.co.uk
2016-12-18 15:37:20 +00:00
|
|
|
|
|
|
|
engine->context_pin = execlists_context_pin;
|
|
|
|
engine->context_unpin = execlists_context_unpin;
|
|
|
|
|
2016-12-18 15:37:24 +00:00
|
|
|
engine->request_alloc = execlists_request_alloc;
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->emit_flush = gen8_emit_flush;
|
2016-10-28 12:58:50 +00:00
|
|
|
engine->emit_breadcrumb = gen8_emit_breadcrumb;
|
2016-10-28 12:58:51 +00:00
|
|
|
engine->emit_breadcrumb_sz = gen8_emit_breadcrumb_sz;
|
2017-03-16 17:13:03 +00:00
|
|
|
|
|
|
|
engine->set_default_submission = execlists_set_default_submission;
|
2016-08-02 21:50:31 +00:00
|
|
|
|
2016-07-01 16:23:27 +00:00
|
|
|
engine->irq_enable = gen8_logical_ring_enable_irq;
|
|
|
|
engine->irq_disable = gen8_logical_ring_disable_irq;
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->emit_bb_start = gen8_emit_bb_start;
|
2016-01-12 17:32:34 +00:00
|
|
|
}
|
|
|
|
|
2016-01-12 17:32:35 +00:00
|
|
|
static inline void
|
2016-07-13 15:03:35 +00:00
|
|
|
logical_ring_default_irqs(struct intel_engine_cs *engine)
|
2016-01-12 17:32:35 +00:00
|
|
|
{
|
2016-07-13 15:03:35 +00:00
|
|
|
unsigned shift = engine->irq_shift;
|
2016-03-16 11:00:37 +00:00
|
|
|
engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT << shift;
|
|
|
|
engine->irq_keep_mask = GT_CONTEXT_SWITCH_INTERRUPT << shift;
|
2016-01-12 17:32:35 +00:00
|
|
|
}
|
|
|
|
|
2016-04-12 14:40:42 +00:00
|
|
|
static int
|
2016-08-15 09:48:54 +00:00
|
|
|
lrc_setup_hws(struct intel_engine_cs *engine, struct i915_vma *vma)
|
2016-04-12 14:40:41 +00:00
|
|
|
{
|
2016-08-15 09:48:57 +00:00
|
|
|
const int hws_offset = LRC_PPHWSP_PN * PAGE_SIZE;
|
2016-04-12 14:40:42 +00:00
|
|
|
void *hws;
|
2016-04-12 14:40:41 +00:00
|
|
|
|
|
|
|
/* The HWSP is part of the default context object in LRC mode. */
|
2016-08-15 09:48:54 +00:00
|
|
|
hws = i915_gem_object_pin_map(vma->obj, I915_MAP_WB);
|
2016-04-12 14:40:42 +00:00
|
|
|
if (IS_ERR(hws))
|
|
|
|
return PTR_ERR(hws);
|
2016-08-15 09:48:57 +00:00
|
|
|
|
|
|
|
engine->status_page.page_addr = hws + hws_offset;
|
2016-08-15 09:49:07 +00:00
|
|
|
engine->status_page.ggtt_offset = i915_ggtt_offset(vma) + hws_offset;
|
2016-08-15 09:48:57 +00:00
|
|
|
engine->status_page.vma = vma;
|
2016-04-12 14:40:42 +00:00
|
|
|
|
|
|
|
return 0;
|
2016-04-12 14:40:41 +00:00
|
|
|
}
|
|
|
|
|
2016-07-13 15:03:36 +00: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 15:03:41 +00:00
|
|
|
intel_engine_setup_common(engine);
|
|
|
|
|
2016-07-13 15:03:36 +00: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_default_vfuncs(engine);
|
|
|
|
logical_ring_default_irqs(engine);
|
|
|
|
}
|
|
|
|
|
2016-06-23 13:52:41 +00: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 15:03:41 +00:00
|
|
|
ret = intel_engine_init_common(engine);
|
2016-06-23 13:52:41 +00:00
|
|
|
if (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 15:03:40 +00:00
|
|
|
int logical_render_ring_init(struct intel_engine_cs *engine)
|
2016-06-23 13:52:41 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
|
|
|
int ret;
|
|
|
|
|
2016-07-13 15:03:36 +00:00
|
|
|
logical_ring_setup(engine);
|
|
|
|
|
2016-06-23 13:52:41 +00: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;
|
2016-10-28 12:58:50 +00:00
|
|
|
engine->emit_breadcrumb = gen8_emit_breadcrumb_render;
|
2016-10-28 12:58:51 +00:00
|
|
|
engine->emit_breadcrumb_sz = gen8_emit_breadcrumb_render_sz;
|
2016-06-23 13:52:41 +00:00
|
|
|
|
2017-01-10 14:47:34 +00:00
|
|
|
ret = intel_engine_create_scratch(engine, PAGE_SIZE);
|
2016-06-23 13:52:41 +00: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);
|
|
|
|
}
|
|
|
|
|
2016-12-16 13:18:42 +00:00
|
|
|
return logical_ring_init(engine);
|
2016-06-23 13:52:41 +00:00
|
|
|
}
|
|
|
|
|
2016-07-13 15:03:40 +00:00
|
|
|
int logical_xcs_ring_init(struct intel_engine_cs *engine)
|
2016-07-13 15:03:36 +00:00
|
|
|
{
|
|
|
|
logical_ring_setup(engine);
|
|
|
|
|
|
|
|
return logical_ring_init(engine);
|
2014-07-24 16:04:22 +00:00
|
|
|
}
|
|
|
|
|
2015-02-13 16:27:56 +00:00
|
|
|
static u32
|
2016-05-06 14:40:21 +00:00
|
|
|
make_rpcs(struct drm_i915_private *dev_priv)
|
2015-02-13 16:27:56 +00:00
|
|
|
{
|
|
|
|
u32 rpcs = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* No explicit RPCS request is needed to ensure full
|
|
|
|
* slice/subslice/EU enablement prior to Gen9.
|
|
|
|
*/
|
2016-05-06 14:40:21 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 9)
|
2015-02-13 16:27:56 +00: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-08-31 16:13:02 +00:00
|
|
|
if (INTEL_INFO(dev_priv)->sseu.has_slice_pg) {
|
2015-02-13 16:27:56 +00:00
|
|
|
rpcs |= GEN8_RPCS_S_CNT_ENABLE;
|
2016-08-31 16:13:04 +00:00
|
|
|
rpcs |= hweight8(INTEL_INFO(dev_priv)->sseu.slice_mask) <<
|
2015-02-13 16:27:56 +00:00
|
|
|
GEN8_RPCS_S_CNT_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
2016-08-31 16:13:02 +00:00
|
|
|
if (INTEL_INFO(dev_priv)->sseu.has_subslice_pg) {
|
2015-02-13 16:27:56 +00:00
|
|
|
rpcs |= GEN8_RPCS_SS_CNT_ENABLE;
|
2016-08-31 16:13:05 +00:00
|
|
|
rpcs |= hweight8(INTEL_INFO(dev_priv)->sseu.subslice_mask) <<
|
2015-02-13 16:27:56 +00:00
|
|
|
GEN8_RPCS_SS_CNT_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
2016-08-31 16:13:02 +00:00
|
|
|
if (INTEL_INFO(dev_priv)->sseu.has_eu_pg) {
|
|
|
|
rpcs |= INTEL_INFO(dev_priv)->sseu.eu_per_subslice <<
|
2015-02-13 16:27:56 +00:00
|
|
|
GEN8_RPCS_EU_MIN_SHIFT;
|
2016-08-31 16:13:02 +00:00
|
|
|
rpcs |= INTEL_INFO(dev_priv)->sseu.eu_per_subslice <<
|
2015-02-13 16:27:56 +00:00
|
|
|
GEN8_RPCS_EU_MAX_SHIFT;
|
|
|
|
rpcs |= GEN8_RPCS_ENABLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return rpcs;
|
|
|
|
}
|
|
|
|
|
2016-03-16 11:00:37 +00:00
|
|
|
static u32 intel_lr_indirect_ctx_offset(struct intel_engine_cs *engine)
|
2016-02-23 10:31:49 +00:00
|
|
|
{
|
|
|
|
u32 indirect_ctx_offset;
|
|
|
|
|
2016-05-06 14:40:21 +00:00
|
|
|
switch (INTEL_GEN(engine->i915)) {
|
2016-02-23 10:31:49 +00:00
|
|
|
default:
|
2016-05-06 14:40:21 +00:00
|
|
|
MISSING_CASE(INTEL_GEN(engine->i915));
|
2016-02-23 10:31:49 +00: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;
|
|
|
|
}
|
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
static void execlists_init_reg_state(u32 *regs,
|
2016-10-04 20:11:26 +00:00
|
|
|
struct i915_gem_context *ctx,
|
|
|
|
struct intel_engine_cs *engine,
|
|
|
|
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-24 16:04:17 +00:00
|
|
|
{
|
2016-10-04 20:11:26 +00:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
|
|
|
struct i915_hw_ppgtt *ppgtt = ctx->ppgtt ?: dev_priv->mm.aliasing_ppgtt;
|
2017-02-21 09:58:39 +00:00
|
|
|
u32 base = engine->mmio_base;
|
|
|
|
bool rcs = engine->id == RCS;
|
|
|
|
|
|
|
|
/* 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).
|
|
|
|
*/
|
|
|
|
regs[CTX_LRI_HEADER_0] = MI_LOAD_REGISTER_IMM(rcs ? 14 : 11) |
|
|
|
|
MI_LRI_FORCE_POSTED;
|
|
|
|
|
|
|
|
CTX_REG(regs, CTX_CONTEXT_CONTROL, RING_CONTEXT_CONTROL(engine),
|
|
|
|
_MASKED_BIT_ENABLE(CTX_CTRL_INHIBIT_SYN_CTX_SWITCH |
|
|
|
|
CTX_CTRL_ENGINE_CTX_RESTORE_INHIBIT |
|
|
|
|
(HAS_RESOURCE_STREAMER(dev_priv) ?
|
|
|
|
CTX_CTRL_RS_CTX_ENABLE : 0)));
|
|
|
|
CTX_REG(regs, CTX_RING_HEAD, RING_HEAD(base), 0);
|
|
|
|
CTX_REG(regs, CTX_RING_TAIL, RING_TAIL(base), 0);
|
|
|
|
CTX_REG(regs, CTX_RING_BUFFER_START, RING_START(base), 0);
|
|
|
|
CTX_REG(regs, CTX_RING_BUFFER_CONTROL, RING_CTL(base),
|
|
|
|
RING_CTL_SIZE(ring->size) | RING_VALID);
|
|
|
|
CTX_REG(regs, CTX_BB_HEAD_U, RING_BBADDR_UDW(base), 0);
|
|
|
|
CTX_REG(regs, CTX_BB_HEAD_L, RING_BBADDR(base), 0);
|
|
|
|
CTX_REG(regs, CTX_BB_STATE, RING_BBSTATE(base), RING_BB_PPGTT);
|
|
|
|
CTX_REG(regs, CTX_SECOND_BB_HEAD_U, RING_SBBADDR_UDW(base), 0);
|
|
|
|
CTX_REG(regs, CTX_SECOND_BB_HEAD_L, RING_SBBADDR(base), 0);
|
|
|
|
CTX_REG(regs, CTX_SECOND_BB_STATE, RING_SBBSTATE(base), 0);
|
|
|
|
if (rcs) {
|
|
|
|
CTX_REG(regs, CTX_BB_PER_CTX_PTR, RING_BB_PER_CTX_PTR(base), 0);
|
|
|
|
CTX_REG(regs, CTX_RCS_INDIRECT_CTX, RING_INDIRECT_CTX(base), 0);
|
|
|
|
CTX_REG(regs, CTX_RCS_INDIRECT_CTX_OFFSET,
|
|
|
|
RING_INDIRECT_CTX_OFFSET(base), 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-24 16:04:17 +00:00
|
|
|
|
2016-08-15 09:49:04 +00:00
|
|
|
if (engine->wa_ctx.vma) {
|
2016-03-16 11:00:37 +00:00
|
|
|
struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
|
2016-08-15 09:49:07 +00:00
|
|
|
u32 ggtt_offset = i915_ggtt_offset(wa_ctx->vma);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
regs[CTX_RCS_INDIRECT_CTX + 1] =
|
2017-02-17 07:58:59 +00:00
|
|
|
(ggtt_offset + wa_ctx->indirect_ctx.offset) |
|
|
|
|
(wa_ctx->indirect_ctx.size / CACHELINE_BYTES);
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
regs[CTX_RCS_INDIRECT_CTX_OFFSET + 1] =
|
2016-03-16 11:00:37 +00:00
|
|
|
intel_lr_indirect_ctx_offset(engine) << 6;
|
2015-06-19 18:07:01 +00:00
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
regs[CTX_BB_PER_CTX_PTR + 1] =
|
2017-02-17 07:58:59 +00:00
|
|
|
(ggtt_offset + wa_ctx->per_ctx.offset) | 0x01;
|
2015-06-19 18:07:01 +00:00
|
|
|
}
|
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-24 16:04:17 +00:00
|
|
|
}
|
2017-02-21 09:58:39 +00:00
|
|
|
|
|
|
|
regs[CTX_LRI_HEADER_1] = MI_LOAD_REGISTER_IMM(9) | MI_LRI_FORCE_POSTED;
|
|
|
|
|
|
|
|
CTX_REG(regs, CTX_CTX_TIMESTAMP, RING_CTX_TIMESTAMP(base), 0);
|
2015-11-04 21:20:11 +00:00
|
|
|
/* PDP values well be assigned later if needed */
|
2017-02-21 09:58:39 +00:00
|
|
|
CTX_REG(regs, CTX_PDP3_UDW, GEN8_RING_PDP_UDW(engine, 3), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP3_LDW, GEN8_RING_PDP_LDW(engine, 3), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP2_UDW, GEN8_RING_PDP_UDW(engine, 2), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP2_LDW, GEN8_RING_PDP_LDW(engine, 2), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP1_UDW, GEN8_RING_PDP_UDW(engine, 1), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP1_LDW, GEN8_RING_PDP_LDW(engine, 1), 0);
|
|
|
|
CTX_REG(regs, CTX_PDP0_UDW, GEN8_RING_PDP_UDW(engine, 0), 0);
|
|
|
|
CTX_REG(regs, 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 11:13:34 +00:00
|
|
|
|
2017-02-09 14:40:36 +00:00
|
|
|
if (ppgtt && i915_vm_is_48bit(&ppgtt->base)) {
|
2015-07-30 10:06:23 +00:00
|
|
|
/* 64b PPGTT (48bit canonical)
|
|
|
|
* PDP0_DESCRIPTOR contains the base address to PML4 and
|
|
|
|
* other PDP Descriptors are ignored.
|
|
|
|
*/
|
2017-02-21 09:58:39 +00:00
|
|
|
ASSIGN_CTX_PML4(ppgtt, regs);
|
2015-07-30 10:06:23 +00:00
|
|
|
}
|
|
|
|
|
2017-02-21 09:58:39 +00:00
|
|
|
if (rcs) {
|
|
|
|
regs[CTX_LRI_HEADER_2] = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
CTX_REG(regs, CTX_R_PWR_CLK_STATE, GEN8_R_PWR_CLK_STATE,
|
|
|
|
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-24 16:04:17 +00:00
|
|
|
}
|
2016-10-04 20:11:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
populate_lr_context(struct i915_gem_context *ctx,
|
|
|
|
struct drm_i915_gem_object *ctx_obj,
|
|
|
|
struct intel_engine_cs *engine,
|
|
|
|
struct intel_ring *ring)
|
|
|
|
{
|
|
|
|
void *vaddr;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
vaddr = i915_gem_object_pin_map(ctx_obj, I915_MAP_WB);
|
|
|
|
if (IS_ERR(vaddr)) {
|
|
|
|
ret = PTR_ERR(vaddr);
|
|
|
|
DRM_DEBUG_DRIVER("Could not map object pages! (%d)\n", ret);
|
|
|
|
return ret;
|
|
|
|
}
|
2016-10-28 12:58:35 +00:00
|
|
|
ctx_obj->mm.dirty = true;
|
2016-10-04 20:11:26 +00:00
|
|
|
|
|
|
|
/* The second page of the context object contains some fields which must
|
|
|
|
* be set up prior to the first execution. */
|
|
|
|
|
|
|
|
execlists_init_reg_state(vaddr + LRC_STATE_PN * PAGE_SIZE,
|
|
|
|
ctx, 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-24 16:04:17 +00:00
|
|
|
|
2016-04-12 14:40:42 +00: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-24 16:04:17 +00:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-24 13:53:34 +00:00
|
|
|
static int execlists_context_deferred_alloc(struct i915_gem_context *ctx,
|
2016-04-28 08:56:54 +00:00
|
|
|
struct intel_engine_cs *engine)
|
2014-07-24 16:04:12 +00: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-24 16:04:14 +00:00
|
|
|
struct drm_i915_gem_object *ctx_obj;
|
2016-05-24 13:53:37 +00:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
2016-08-15 09:48:54 +00: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-24 16:04:14 +00:00
|
|
|
uint32_t context_size;
|
2016-08-02 21:50:21 +00: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-24 16:04:14 +00:00
|
|
|
int ret;
|
|
|
|
|
2016-05-24 13:53:37 +00:00
|
|
|
WARN_ON(ce->state);
|
2014-07-24 16:04:12 +00:00
|
|
|
|
2017-04-28 07:53:36 +00:00
|
|
|
context_size = round_up(engine->context_size, I915_GTT_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-24 16:04:14 +00: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 14:43:43 +00:00
|
|
|
/* One extra page as the sharing data between driver and GuC */
|
|
|
|
context_size += PAGE_SIZE * LRC_PPHWSP_PN;
|
|
|
|
|
2016-12-01 14:16:37 +00:00
|
|
|
ctx_obj = i915_gem_object_create(ctx->i915, context_size);
|
2016-04-25 12:32:13 +00:00
|
|
|
if (IS_ERR(ctx_obj)) {
|
2015-04-30 14:30:50 +00:00
|
|
|
DRM_DEBUG_DRIVER("Alloc LRC backing obj failed.\n");
|
2016-04-25 12:32:13 +00: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-24 16:04:14 +00:00
|
|
|
}
|
|
|
|
|
2017-01-16 15:21:30 +00:00
|
|
|
vma = i915_vma_instance(ctx_obj, &ctx->i915->ggtt.base, NULL);
|
2016-08-15 09:48:54 +00:00
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
ret = PTR_ERR(vma);
|
|
|
|
goto error_deref_obj;
|
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:21 +00:00
|
|
|
ring = intel_engine_create_ring(engine, ctx->ring_size);
|
2016-08-02 21:50:20 +00:00
|
|
|
if (IS_ERR(ring)) {
|
|
|
|
ret = PTR_ERR(ring);
|
2015-09-11 11:53:46 +00: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-24 16:04:17 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:20 +00: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-24 16:04:17 +00:00
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_DRIVER("Failed to populate LRC: %d\n", ret);
|
2016-08-02 21:50:20 +00:00
|
|
|
goto error_ring_free;
|
2014-07-24 16:04:15 +00:00
|
|
|
}
|
|
|
|
|
2016-08-02 21:50:20 +00:00
|
|
|
ce->ring = ring;
|
2016-08-15 09:48:54 +00:00
|
|
|
ce->state = vma;
|
2017-05-11 10:07:42 +00:00
|
|
|
ce->initialised |= engine->init_context == NULL;
|
2014-07-24 16:04:12 +00: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-24 16:04:17 +00:00
|
|
|
|
2016-08-02 21:50:20 +00:00
|
|
|
error_ring_free:
|
2016-08-02 21:50:21 +00:00
|
|
|
intel_ring_free(ring);
|
2015-09-11 11:53:46 +00:00
|
|
|
error_deref_obj:
|
2016-07-20 12:31:53 +00: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-24 16:04:17 +00:00
|
|
|
return ret;
|
2014-07-24 16:04:12 +00:00
|
|
|
}
|
2015-02-16 16:12:53 +00:00
|
|
|
|
2016-09-09 13:11:53 +00:00
|
|
|
void intel_lr_context_resume(struct drm_i915_private *dev_priv)
|
2015-02-16 16:12:53 +00:00
|
|
|
{
|
2016-03-16 11:00:36 +00:00
|
|
|
struct intel_engine_cs *engine;
|
2016-09-21 13:51:08 +00:00
|
|
|
struct i915_gem_context *ctx;
|
drm/i915: Allocate intel_engine_cs structure only for the enabled engines
With the possibility of addition of many more number of rings in future,
the drm_i915_private structure could bloat as an array, of type
intel_engine_cs, is embedded inside it.
struct intel_engine_cs engine[I915_NUM_ENGINES];
Though this is still fine as generally there is only a single instance of
drm_i915_private structure used, but not all of the possible rings would be
enabled or active on most of the platforms. Some memory can be saved by
allocating intel_engine_cs structure only for the enabled/active engines.
Currently the engine/ring ID is kept static and dev_priv->engine[] is simply
indexed using the enums defined in intel_engine_id.
To save memory and continue using the static engine/ring IDs, 'engine' is
defined as an array of pointers.
struct intel_engine_cs *engine[I915_NUM_ENGINES];
dev_priv->engine[engine_ID] will be NULL for disabled engine instances.
There is a text size reduction of 928 bytes, from 1028200 to 1027272, for
i915.o file (but for i915.ko file text size remain same as 1193131 bytes).
v2:
- Remove the engine iterator field added in drm_i915_private structure,
instead pass a local iterator variable to the for_each_engine**
macros. (Chris)
- Do away with intel_engine_initialized() and instead directly use the
NULL pointer check on engine pointer. (Chris)
v3:
- Remove for_each_engine_id() macro, as the updated macro for_each_engine()
can be used in place of it. (Chris)
- Protect the access to Render engine Fault register with a NULL check, as
engine specific init is done later in Driver load sequence.
v4:
- Use !!dev_priv->engine[VCS] style for the engine check in getparam. (Chris)
- Kill the superfluous init_engine_lists().
v5:
- Cleanup the intel_engines_init() & intel_engines_setup(), with respect to
allocation of intel_engine_cs structure. (Chris)
v6:
- Rebase.
v7:
- Optimize the for_each_engine_masked() macro. (Chris)
- Change the type of 'iter' local variable to enum intel_engine_id. (Chris)
- Rebase.
v8: Rebase.
v9: Rebase.
v10:
- For index calculation use engine ID instead of pointer based arithmetic in
intel_engine_sync_index() as engine pointers are not contiguous now (Chris)
- For appropriateness, rename local enum variable 'iter' to 'id'. (Joonas)
- Use for_each_engine macro for cleanup in intel_engines_init() and remove
check for NULL engine pointer in cleanup() routines. (Joonas)
v11: Rebase.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476378888-7372-1-git-send-email-akash.goel@intel.com
2016-10-13 17:14:48 +00:00
|
|
|
enum intel_engine_id id;
|
2016-09-21 13:51:08 +00:00
|
|
|
|
|
|
|
/* Because we emit WA_TAIL_DWORDS there may be a disparity
|
|
|
|
* between our bookkeeping in ce->ring->head and ce->ring->tail and
|
|
|
|
* that stored in context. As we only write new commands from
|
|
|
|
* ce->ring->tail onwards, everything before that is junk. If the GPU
|
|
|
|
* starts reading from its RING_HEAD from the context, it may try to
|
|
|
|
* execute that junk and die.
|
|
|
|
*
|
|
|
|
* So to avoid that we reset the context images upon resume. For
|
|
|
|
* simplicity, we just zero everything out.
|
|
|
|
*/
|
|
|
|
list_for_each_entry(ctx, &dev_priv->context_list, link) {
|
drm/i915: Allocate intel_engine_cs structure only for the enabled engines
With the possibility of addition of many more number of rings in future,
the drm_i915_private structure could bloat as an array, of type
intel_engine_cs, is embedded inside it.
struct intel_engine_cs engine[I915_NUM_ENGINES];
Though this is still fine as generally there is only a single instance of
drm_i915_private structure used, but not all of the possible rings would be
enabled or active on most of the platforms. Some memory can be saved by
allocating intel_engine_cs structure only for the enabled/active engines.
Currently the engine/ring ID is kept static and dev_priv->engine[] is simply
indexed using the enums defined in intel_engine_id.
To save memory and continue using the static engine/ring IDs, 'engine' is
defined as an array of pointers.
struct intel_engine_cs *engine[I915_NUM_ENGINES];
dev_priv->engine[engine_ID] will be NULL for disabled engine instances.
There is a text size reduction of 928 bytes, from 1028200 to 1027272, for
i915.o file (but for i915.ko file text size remain same as 1193131 bytes).
v2:
- Remove the engine iterator field added in drm_i915_private structure,
instead pass a local iterator variable to the for_each_engine**
macros. (Chris)
- Do away with intel_engine_initialized() and instead directly use the
NULL pointer check on engine pointer. (Chris)
v3:
- Remove for_each_engine_id() macro, as the updated macro for_each_engine()
can be used in place of it. (Chris)
- Protect the access to Render engine Fault register with a NULL check, as
engine specific init is done later in Driver load sequence.
v4:
- Use !!dev_priv->engine[VCS] style for the engine check in getparam. (Chris)
- Kill the superfluous init_engine_lists().
v5:
- Cleanup the intel_engines_init() & intel_engines_setup(), with respect to
allocation of intel_engine_cs structure. (Chris)
v6:
- Rebase.
v7:
- Optimize the for_each_engine_masked() macro. (Chris)
- Change the type of 'iter' local variable to enum intel_engine_id. (Chris)
- Rebase.
v8: Rebase.
v9: Rebase.
v10:
- For index calculation use engine ID instead of pointer based arithmetic in
intel_engine_sync_index() as engine pointers are not contiguous now (Chris)
- For appropriateness, rename local enum variable 'iter' to 'id'. (Joonas)
- Use for_each_engine macro for cleanup in intel_engines_init() and remove
check for NULL engine pointer in cleanup() routines. (Joonas)
v11: Rebase.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Akash Goel <akash.goel@intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1476378888-7372-1-git-send-email-akash.goel@intel.com
2016-10-13 17:14:48 +00:00
|
|
|
for_each_engine(engine, dev_priv, id) {
|
2016-09-21 13:51:08 +00:00
|
|
|
struct intel_context *ce = &ctx->engine[engine->id];
|
|
|
|
u32 *reg;
|
2015-02-16 16:12:53 +00:00
|
|
|
|
2016-09-21 13:51:08 +00:00
|
|
|
if (!ce->state)
|
|
|
|
continue;
|
2016-04-12 14:40:42 +00:00
|
|
|
|
2016-09-21 13:51:08 +00:00
|
|
|
reg = i915_gem_object_pin_map(ce->state->obj,
|
|
|
|
I915_MAP_WB);
|
|
|
|
if (WARN_ON(IS_ERR(reg)))
|
|
|
|
continue;
|
2015-02-16 16:12:53 +00:00
|
|
|
|
2016-09-21 13:51:08 +00:00
|
|
|
reg += LRC_STATE_PN * PAGE_SIZE / sizeof(*reg);
|
|
|
|
reg[CTX_RING_HEAD+1] = 0;
|
|
|
|
reg[CTX_RING_TAIL+1] = 0;
|
2015-02-16 16:12:53 +00:00
|
|
|
|
2016-10-28 12:58:35 +00:00
|
|
|
ce->state->obj->mm.dirty = true;
|
2016-09-21 13:51:08 +00:00
|
|
|
i915_gem_object_unpin_map(ce->state->obj);
|
2015-02-16 16:12:53 +00:00
|
|
|
|
2017-04-25 13:00:49 +00:00
|
|
|
intel_ring_reset(ce->ring, 0);
|
2016-09-21 13:51:08 +00:00
|
|
|
}
|
2015-02-16 16:12:53 +00:00
|
|
|
}
|
|
|
|
}
|