2010-05-22 04:26:39 +08:00
|
|
|
/*
|
|
|
|
* Copyright © 2008-2010 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:
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
* Zou Nan hai <nanhai.zou@intel.com>
|
|
|
|
* Xiang Hai hao<haihao.xiang@intel.com>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2015-12-06 18:26:30 +08:00
|
|
|
#include <linux/log2.h>
|
2017-11-10 22:26:34 +08:00
|
|
|
|
2012-10-03 01:01:07 +08:00
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include <drm/i915_drm.h>
|
2017-11-10 22:26:34 +08:00
|
|
|
|
|
|
|
#include "i915_drv.h"
|
|
|
|
#include "i915_gem_render_state.h"
|
2010-05-22 04:26:39 +08:00
|
|
|
#include "i915_trace.h"
|
2010-09-19 21:40:43 +08:00
|
|
|
#include "intel_drv.h"
|
2018-04-11 00:12:46 +08:00
|
|
|
#include "intel_workarounds.h"
|
2010-05-22 04:26:39 +08:00
|
|
|
|
2016-04-29 16:07:05 +08:00
|
|
|
/* Rough estimate of the typical request size, performing a flush,
|
|
|
|
* set-context and then emitting the batch.
|
|
|
|
*/
|
|
|
|
#define LEGACY_REQUEST_SIZE 200
|
|
|
|
|
2017-05-04 21:08:44 +08:00
|
|
|
static unsigned int __intel_ring_space(unsigned int head,
|
|
|
|
unsigned int tail,
|
|
|
|
unsigned int size)
|
2011-01-21 01:00:10 +08:00
|
|
|
{
|
2017-05-04 21:08:44 +08:00
|
|
|
/*
|
|
|
|
* "If the Ring Buffer Head Pointer and the Tail Pointer are on the
|
|
|
|
* same cacheline, the Head Pointer must not be greater than the Tail
|
|
|
|
* Pointer."
|
|
|
|
*/
|
|
|
|
GEM_BUG_ON(!is_power_of_2(size));
|
|
|
|
return (head - tail - CACHELINE_BYTES) & (size - 1);
|
2011-01-21 01:00:10 +08:00
|
|
|
}
|
|
|
|
|
2017-05-04 21:08:45 +08:00
|
|
|
unsigned int intel_ring_update_space(struct intel_ring *ring)
|
2014-11-27 19:22:49 +08:00
|
|
|
{
|
2017-05-04 21:08:45 +08:00
|
|
|
unsigned int space;
|
|
|
|
|
|
|
|
space = __intel_ring_space(ring->head, ring->emit, ring->size);
|
|
|
|
|
|
|
|
ring->space = space;
|
|
|
|
return space;
|
2014-11-27 19:22:49 +08:00
|
|
|
}
|
|
|
|
|
2011-01-05 01:34:02 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen2_render_ring_flush(struct i915_request *rq, u32 mode)
|
2012-04-18 18:12:11 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 cmd, *cs;
|
2012-04-18 18:12:11 +08:00
|
|
|
|
|
|
|
cmd = MI_FLUSH;
|
|
|
|
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE)
|
2012-04-18 18:12:11 +08:00
|
|
|
cmd |= MI_READ_FLUSH;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2012-04-18 18:12:11 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = cmd;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2012-04-18 18:12:11 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen4_render_ring_flush(struct i915_request *rq, u32 mode)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 cmd, *cs;
|
2010-08-07 18:01:22 +08:00
|
|
|
|
2011-03-20 06:26:49 +08:00
|
|
|
/*
|
|
|
|
* read/write caches:
|
|
|
|
*
|
|
|
|
* I915_GEM_DOMAIN_RENDER is always invalidated, but is
|
|
|
|
* only flushed if MI_NO_WRITE_FLUSH is unset. On 965, it is
|
|
|
|
* also flushed at 2d versus 3d pipeline switches.
|
|
|
|
*
|
|
|
|
* read-only caches:
|
|
|
|
*
|
|
|
|
* I915_GEM_DOMAIN_SAMPLER is flushed on pre-965 if
|
|
|
|
* MI_READ_FLUSH is set, and is always flushed on 965.
|
|
|
|
*
|
|
|
|
* I915_GEM_DOMAIN_COMMAND may not exist?
|
|
|
|
*
|
|
|
|
* I915_GEM_DOMAIN_INSTRUCTION, which exists on 965, is
|
|
|
|
* invalidated when MI_EXE_FLUSH is set.
|
|
|
|
*
|
|
|
|
* I915_GEM_DOMAIN_VERTEX, which exists on 965, is
|
|
|
|
* invalidated with every MI_FLUSH.
|
|
|
|
*
|
|
|
|
* TLBs:
|
|
|
|
*
|
|
|
|
* On 965, TLBs associated with I915_GEM_DOMAIN_COMMAND
|
|
|
|
* and I915_GEM_DOMAIN_CPU in are invalidated at PTE write and
|
|
|
|
* I915_GEM_DOMAIN_RENDER and I915_GEM_DOMAIN_SAMPLER
|
|
|
|
* are flushed at any MI_FLUSH.
|
|
|
|
*/
|
|
|
|
|
2016-08-03 05:50:18 +08:00
|
|
|
cmd = MI_FLUSH;
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2011-03-20 06:26:49 +08:00
|
|
|
cmd |= MI_EXE_FLUSH;
|
2018-02-21 17:56:36 +08:00
|
|
|
if (IS_G4X(rq->i915) || IS_GEN5(rq->i915))
|
2016-08-03 05:50:18 +08:00
|
|
|
cmd |= MI_INVALIDATE_ISP;
|
|
|
|
}
|
2010-11-30 22:07:47 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2011-01-05 01:34:02 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = cmd;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2011-01-05 01:34:02 +08:00
|
|
|
|
|
|
|
return 0;
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
|
|
|
|
2018-02-08 19:12:20 +08:00
|
|
|
/*
|
2011-10-16 16:23:31 +08:00
|
|
|
* Emits a PIPE_CONTROL with a non-zero post-sync operation, for
|
|
|
|
* implementing two workarounds on gen6. From section 1.4.7.1
|
|
|
|
* "PIPE_CONTROL" of the Sandy Bridge PRM volume 2 part 1:
|
|
|
|
*
|
|
|
|
* [DevSNB-C+{W/A}] Before any depth stall flush (including those
|
|
|
|
* produced by non-pipelined state commands), software needs to first
|
|
|
|
* send a PIPE_CONTROL with no bits set except Post-Sync Operation !=
|
|
|
|
* 0.
|
|
|
|
*
|
|
|
|
* [Dev-SNB{W/A}]: Before a PIPE_CONTROL with Write Cache Flush Enable
|
|
|
|
* =1, a PIPE_CONTROL with any non-zero post-sync-op is required.
|
|
|
|
*
|
|
|
|
* And the workaround for these two requires this workaround first:
|
|
|
|
*
|
|
|
|
* [Dev-SNB{W/A}]: Pipe-control with CS-stall bit set must be sent
|
|
|
|
* BEFORE the pipe-control with a post-sync op and no write-cache
|
|
|
|
* flushes.
|
|
|
|
*
|
|
|
|
* And this last workaround is tricky because of the requirements on
|
|
|
|
* that bit. From section 1.4.7.2.3 "Stall" of the Sandy Bridge PRM
|
|
|
|
* volume 2 part 1:
|
|
|
|
*
|
|
|
|
* "1 of the following must also be set:
|
|
|
|
* - Render Target Cache Flush Enable ([12] of DW1)
|
|
|
|
* - Depth Cache Flush Enable ([0] of DW1)
|
|
|
|
* - Stall at Pixel Scoreboard ([1] of DW1)
|
|
|
|
* - Depth Stall ([13] of DW1)
|
|
|
|
* - Post-Sync Operation ([13] of DW1)
|
|
|
|
* - Notify Enable ([8] of DW1)"
|
|
|
|
*
|
|
|
|
* The cache flushes require the workaround flush that triggered this
|
|
|
|
* one, so we can't use it. Depth stall would trigger the same.
|
|
|
|
* Post-sync nonzero is what triggered this second workaround, so we
|
|
|
|
* can't use that one either. Notify enable is IRQs, which aren't
|
|
|
|
* really our business. That leaves only stall at scoreboard.
|
|
|
|
*/
|
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_emit_post_sync_nonzero_flush(struct i915_request *rq)
|
2011-10-16 16:23:31 +08:00
|
|
|
{
|
2016-08-03 05:50:18 +08:00
|
|
|
u32 scratch_addr =
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_ggtt_offset(rq->engine->scratch) + 2 * CACHELINE_BYTES;
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 6);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(5);
|
|
|
|
*cs++ = PIPE_CONTROL_CS_STALL | PIPE_CONTROL_STALL_AT_SCOREBOARD;
|
|
|
|
*cs++ = scratch_addr | PIPE_CONTROL_GLOBAL_GTT;
|
|
|
|
*cs++ = 0; /* low dword */
|
|
|
|
*cs++ = 0; /* high dword */
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2017-02-14 19:32:42 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 6);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(5);
|
|
|
|
*cs++ = PIPE_CONTROL_QW_WRITE;
|
|
|
|
*cs++ = scratch_addr | PIPE_CONTROL_GLOBAL_GTT;
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2011-10-16 16:23:31 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen6_render_ring_flush(struct i915_request *rq, u32 mode)
|
2011-10-16 16:23:31 +08:00
|
|
|
{
|
2016-08-03 05:50:18 +08:00
|
|
|
u32 scratch_addr =
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_ggtt_offset(rq->engine->scratch) + 2 * CACHELINE_BYTES;
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs, flags = 0;
|
2011-10-16 16:23:31 +08:00
|
|
|
int ret;
|
|
|
|
|
2012-08-18 05:35:42 +08:00
|
|
|
/* Force SNB workarounds for PIPE_CONTROL flushes */
|
2018-02-21 17:56:36 +08:00
|
|
|
ret = intel_emit_post_sync_nonzero_flush(rq);
|
2012-08-18 05:35:42 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2011-10-16 16:23:31 +08:00
|
|
|
/* Just flush everything. Experiments have shown that reducing the
|
|
|
|
* number of bits based on the write domains has little performance
|
|
|
|
* impact.
|
|
|
|
*/
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_FLUSH) {
|
2012-08-10 17:18:10 +08:00
|
|
|
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
|
|
|
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
|
|
|
/*
|
|
|
|
* Ensure that any following seqno writes only happen
|
|
|
|
* when the render cache is indeed flushed.
|
|
|
|
*/
|
2012-06-28 15:48:42 +08:00
|
|
|
flags |= PIPE_CONTROL_CS_STALL;
|
2012-08-10 17:18:10 +08:00
|
|
|
}
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2012-08-10 17:18:10 +08:00
|
|
|
flags |= PIPE_CONTROL_TLB_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_VF_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_CONST_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_STATE_CACHE_INVALIDATE;
|
|
|
|
/*
|
|
|
|
* TLB invalidate requires a post-sync write.
|
|
|
|
*/
|
2012-10-26 03:15:47 +08:00
|
|
|
flags |= PIPE_CONTROL_QW_WRITE | PIPE_CONTROL_CS_STALL;
|
2012-08-10 17:18:10 +08:00
|
|
|
}
|
2011-10-16 16:23:31 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 4);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2011-10-16 16:23:31 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(4);
|
|
|
|
*cs++ = flags;
|
|
|
|
*cs++ = scratch_addr | PIPE_CONTROL_GLOBAL_GTT;
|
|
|
|
*cs++ = 0;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2011-10-16 16:23:31 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen7_render_ring_cs_stall_wa(struct i915_request *rq)
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 4);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(4);
|
|
|
|
*cs++ = PIPE_CONTROL_CS_STALL | PIPE_CONTROL_STALL_AT_SCOREBOARD;
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = 0;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-08-18 05:35:41 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen7_render_ring_flush(struct i915_request *rq, u32 mode)
|
2012-08-18 05:35:41 +08:00
|
|
|
{
|
2016-08-03 05:50:18 +08:00
|
|
|
u32 scratch_addr =
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_ggtt_offset(rq->engine->scratch) + 2 * CACHELINE_BYTES;
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs, flags = 0;
|
2012-08-18 05:35:41 +08:00
|
|
|
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
/*
|
|
|
|
* Ensure that any following seqno writes only happen when the render
|
|
|
|
* cache is indeed flushed.
|
|
|
|
*
|
|
|
|
* Workaround: 4th PIPE_CONTROL command (except the ones with only
|
|
|
|
* read-cache invalidate bits set) must have the CS_STALL bit set. We
|
|
|
|
* don't try to be clever and just set it unconditionally.
|
|
|
|
*/
|
|
|
|
flags |= PIPE_CONTROL_CS_STALL;
|
|
|
|
|
2012-08-18 05:35:41 +08:00
|
|
|
/* Just flush everything. Experiments have shown that reducing the
|
|
|
|
* number of bits based on the write domains has little performance
|
|
|
|
* impact.
|
|
|
|
*/
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_FLUSH) {
|
2012-08-18 05:35:41 +08:00
|
|
|
flags |= PIPE_CONTROL_RENDER_TARGET_CACHE_FLUSH;
|
|
|
|
flags |= PIPE_CONTROL_DEPTH_CACHE_FLUSH;
|
2016-01-14 10:59:39 +08:00
|
|
|
flags |= PIPE_CONTROL_DC_FLUSH_ENABLE;
|
2015-08-21 23:08:41 +08:00
|
|
|
flags |= PIPE_CONTROL_FLUSH_ENABLE;
|
2012-08-18 05:35:41 +08:00
|
|
|
}
|
2016-08-03 05:50:25 +08:00
|
|
|
if (mode & EMIT_INVALIDATE) {
|
2012-08-18 05:35:41 +08:00
|
|
|
flags |= PIPE_CONTROL_TLB_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_INSTRUCTION_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_TEXTURE_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_VF_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_CONST_CACHE_INVALIDATE;
|
|
|
|
flags |= PIPE_CONTROL_STATE_CACHE_INVALIDATE;
|
2014-12-16 16:44:31 +08:00
|
|
|
flags |= PIPE_CONTROL_MEDIA_STATE_CLEAR;
|
2012-08-18 05:35:41 +08:00
|
|
|
/*
|
|
|
|
* TLB invalidate requires a post-sync write.
|
|
|
|
*/
|
|
|
|
flags |= PIPE_CONTROL_QW_WRITE;
|
2013-02-15 03:53:51 +08:00
|
|
|
flags |= PIPE_CONTROL_GLOBAL_GTT_IVB;
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
|
2014-12-16 16:44:32 +08:00
|
|
|
flags |= PIPE_CONTROL_STALL_AT_SCOREBOARD;
|
|
|
|
|
drm/i915: add workarounds to gen7_render_ring_flush
From Bspec, Vol 2a, Section 1.9.3.4 "PIPE_CONTROL", intro section
detailing the various workarounds:
"[DevIVB {W/A}, DevHSW {W/A}]: Pipe_control with CS-stall bit
set must be issued before a pipe-control command that has the State
Cache Invalidate bit set."
Note that public Bspec has different numbering, it's Vol2Part1,
Section 1.10.4.1 "PIPE_CONTROL" there.
There's also a second workaround for the PIPE_CONTROL command itself:
"[DevIVB, DevVLV, DevHSW] {WA}: Every 4th PIPE_CONTROL command, not
counting the PIPE_CONTROL with only read-cache-invalidate bit(s) set,
must have a CS_STALL bit set"
For simplicity we simply set the CS_STALL bit on every pipe_control on
gen7+
Note that this massively helps on some hsw machines, together with the
following patch to unconditionally set the CS_STALL bit on every
pipe_control it prevents a gpu hang every few seconds.
This is a regression that has been introduced in the pipe_control
cleanup:
commit 6c6cf5aa9c583478b19e23149feaa92d01fb8c2d
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Jul 20 18:02:28 2012 +0100
drm/i915: Only apply the SNB pipe control w/a to gen6
It looks like the massive snb pipe_control workaround also papered
over any issues on ivb and hsw.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: squashed both workarounds together, pimped commit message
with Bsepc citations, regression commit citation and changed the
comment in the code a bit to clarify that we unconditionally set
CS_STALL to avoid being hurt by trying to be clever.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-08-18 05:35:43 +08:00
|
|
|
/* Workaround: we must issue a pipe_control with CS-stall bit
|
|
|
|
* set before a pipe_control command that has the state cache
|
|
|
|
* invalidate bit set. */
|
2018-02-21 17:56:36 +08:00
|
|
|
gen7_render_ring_cs_stall_wa(rq);
|
2012-08-18 05:35:41 +08:00
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 4);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2012-08-18 05:35:41 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = GFX_OP_PIPE_CONTROL(4);
|
|
|
|
*cs++ = flags;
|
|
|
|
*cs++ = scratch_addr;
|
|
|
|
*cs++ = 0;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2012-08-18 05:35:41 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static void ring_setup_phys_status_page(struct intel_engine_cs *engine)
|
2013-07-03 18:56:54 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2018-09-03 23:23:04 +08:00
|
|
|
struct page *page = virt_to_page(engine->status_page.page_addr);
|
|
|
|
phys_addr_t phys = PFN_PHYS(page_to_pfn(page));
|
2013-07-03 18:56:54 +08:00
|
|
|
u32 addr;
|
|
|
|
|
2018-09-03 23:23:04 +08:00
|
|
|
addr = lower_32_bits(phys);
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 4)
|
2018-09-03 23:23:04 +08:00
|
|
|
addr |= (phys >> 28) & 0xf0;
|
|
|
|
|
2013-07-03 18:56:54 +08:00
|
|
|
I915_WRITE(HWS_PGA, addr);
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
|
2015-02-11 03:32:17 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 21:33:26 +08:00
|
|
|
i915_reg_t mmio;
|
2015-02-11 03:32:17 +08:00
|
|
|
|
|
|
|
/* The ring status page addresses are no longer next to the rest of
|
|
|
|
* the ring registers as of gen7.
|
|
|
|
*/
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN7(dev_priv)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
switch (engine->id) {
|
2017-08-31 02:01:15 +08:00
|
|
|
/*
|
|
|
|
* No more rings exist on Gen7. Default case is only to shut up
|
|
|
|
* gcc switch check warning.
|
|
|
|
*/
|
|
|
|
default:
|
|
|
|
GEM_BUG_ON(engine->id);
|
2015-02-11 03:32:17 +08:00
|
|
|
case RCS:
|
|
|
|
mmio = RENDER_HWS_PGA_GEN7;
|
|
|
|
break;
|
|
|
|
case BCS:
|
|
|
|
mmio = BLT_HWS_PGA_GEN7;
|
|
|
|
break;
|
|
|
|
case VCS:
|
|
|
|
mmio = BSD_HWS_PGA_GEN7;
|
|
|
|
break;
|
|
|
|
case VECS:
|
|
|
|
mmio = VEBOX_HWS_PGA_GEN7;
|
|
|
|
break;
|
|
|
|
}
|
2016-05-06 22:40:21 +08:00
|
|
|
} else if (IS_GEN6(dev_priv)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
mmio = RING_HWS_PGA_GEN6(engine->mmio_base);
|
2015-02-11 03:32:17 +08:00
|
|
|
} else {
|
2016-03-16 19:00:37 +08:00
|
|
|
mmio = RING_HWS_PGA(engine->mmio_base);
|
2015-02-11 03:32:17 +08:00
|
|
|
}
|
|
|
|
|
2018-08-08 18:51:00 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6) {
|
|
|
|
u32 mask = ~0u;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Keep the render interrupt unmasked as this papers over
|
|
|
|
* lost interrupts following a reset.
|
|
|
|
*/
|
|
|
|
if (engine->id == RCS)
|
|
|
|
mask &= ~BIT(0);
|
|
|
|
|
|
|
|
I915_WRITE(RING_HWSTAM(engine->mmio_base), mask);
|
|
|
|
}
|
2017-08-19 02:37:01 +08:00
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
I915_WRITE(mmio, engine->status_page.ggtt_offset);
|
2015-02-11 03:32:17 +08:00
|
|
|
POSTING_READ(mmio);
|
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
/* Flush the TLB for this page */
|
2016-05-10 17:57:08 +08:00
|
|
|
if (IS_GEN(dev_priv, 6, 7)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
i915_reg_t reg = RING_INSTPM(engine->mmio_base);
|
2015-02-11 03:32:17 +08:00
|
|
|
|
|
|
|
/* ring should be idle before issuing a sync flush*/
|
2016-03-16 19:00:37 +08:00
|
|
|
WARN_ON((I915_READ_MODE(engine) & MODE_IDLE) == 0);
|
2015-02-11 03:32:17 +08:00
|
|
|
|
|
|
|
I915_WRITE(reg,
|
|
|
|
_MASKED_BIT_ENABLE(INSTPM_TLB_INVALIDATE |
|
|
|
|
INSTPM_SYNC_FLUSH));
|
2016-06-30 22:33:29 +08:00
|
|
|
if (intel_wait_for_register(dev_priv,
|
|
|
|
reg, INSTPM_SYNC_FLUSH, 0,
|
|
|
|
1000))
|
2015-02-11 03:32:17 +08:00
|
|
|
DRM_ERROR("%s: wait for SyncFlush to complete for TLB invalidation timed out\n",
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->name);
|
2015-02-11 03:32:17 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static bool stop_ring(struct intel_engine_cs *engine)
|
2010-05-21 09:08:55 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2010-05-21 09:08:55 +08:00
|
|
|
|
2016-08-15 17:49:11 +08:00
|
|
|
if (INTEL_GEN(dev_priv) > 2) {
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_WRITE_MODE(engine, _MASKED_BIT_ENABLE(STOP_RING));
|
2016-06-30 22:33:30 +08:00
|
|
|
if (intel_wait_for_register(dev_priv,
|
|
|
|
RING_MI_MODE(engine->mmio_base),
|
|
|
|
MODE_IDLE,
|
|
|
|
MODE_IDLE,
|
|
|
|
1000)) {
|
2016-03-16 19:00:37 +08:00
|
|
|
DRM_ERROR("%s : timed out trying to stop ring\n",
|
|
|
|
engine->name);
|
2014-08-11 16:21:35 +08:00
|
|
|
/* Sometimes we observe that the idle flag is not
|
|
|
|
* set even though the ring is empty. So double
|
|
|
|
* check before giving up.
|
|
|
|
*/
|
2016-03-16 19:00:37 +08:00
|
|
|
if (I915_READ_HEAD(engine) != I915_READ_TAIL(engine))
|
2014-08-11 16:21:35 +08:00
|
|
|
return false;
|
2014-04-02 23:36:07 +08:00
|
|
|
}
|
|
|
|
}
|
2012-06-04 17:18:15 +08:00
|
|
|
|
2017-10-27 17:43:11 +08:00
|
|
|
I915_WRITE_HEAD(engine, I915_READ_TAIL(engine));
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_WRITE_HEAD(engine, 0);
|
2016-08-03 05:50:29 +08:00
|
|
|
I915_WRITE_TAIL(engine, 0);
|
2010-05-21 09:08:55 +08:00
|
|
|
|
2017-10-27 17:43:11 +08:00
|
|
|
/* The ring must be empty before it is disabled */
|
|
|
|
I915_WRITE_CTL(engine, 0);
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
return (I915_READ_HEAD(engine) & HEAD_ADDR) == 0;
|
2014-04-02 23:36:07 +08:00
|
|
|
}
|
2010-05-21 09:08:55 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int init_ring_common(struct intel_engine_cs *engine)
|
2014-04-02 23:36:07 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring = engine->buffer;
|
2014-04-02 23:36:07 +08:00
|
|
|
int ret = 0;
|
|
|
|
|
2015-01-16 17:34:40 +08:00
|
|
|
intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
|
2014-04-02 23:36:07 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (!stop_ring(engine)) {
|
2014-04-02 23:36:07 +08:00
|
|
|
/* G45 ring initialization often fails to reset head to zero */
|
2018-02-07 19:15:45 +08:00
|
|
|
DRM_DEBUG_DRIVER("%s head not reset to zero "
|
|
|
|
"ctl %08x head %08x tail %08x start %08x\n",
|
|
|
|
engine->name,
|
|
|
|
I915_READ_CTL(engine),
|
|
|
|
I915_READ_HEAD(engine),
|
|
|
|
I915_READ_TAIL(engine),
|
|
|
|
I915_READ_START(engine));
|
2010-05-21 09:08:55 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (!stop_ring(engine)) {
|
2010-12-06 04:42:33 +08:00
|
|
|
DRM_ERROR("failed to set %s head to zero "
|
|
|
|
"ctl %08x head %08x tail %08x start %08x\n",
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->name,
|
|
|
|
I915_READ_CTL(engine),
|
|
|
|
I915_READ_HEAD(engine),
|
|
|
|
I915_READ_TAIL(engine),
|
|
|
|
I915_READ_START(engine));
|
2014-04-02 23:36:07 +08:00
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
2010-12-06 04:42:33 +08:00
|
|
|
}
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
|
|
|
|
2016-08-18 03:30:56 +08:00
|
|
|
if (HWS_NEEDS_PHYSICAL(dev_priv))
|
2016-03-16 19:00:37 +08:00
|
|
|
ring_setup_phys_status_page(engine);
|
2016-08-18 03:30:56 +08:00
|
|
|
else
|
|
|
|
intel_ring_setup_status_page(engine);
|
2014-04-02 23:36:07 +08:00
|
|
|
|
2016-10-07 14:53:26 +08:00
|
|
|
intel_engine_reset_breadcrumbs(engine);
|
2016-09-09 21:11:53 +08:00
|
|
|
|
2014-08-07 22:29:53 +08:00
|
|
|
/* Enforce ordering by reading HEAD register back */
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_READ_HEAD(engine);
|
2014-08-07 22:29:53 +08:00
|
|
|
|
2012-08-07 15:54:14 +08:00
|
|
|
/* Initialize the ring. This must happen _after_ we've cleared the ring
|
|
|
|
* registers with the above sequence (the readback of the HEAD registers
|
|
|
|
* also enforces ordering), otherwise the hw might lose the new ring
|
|
|
|
* register values. */
|
2016-08-15 17:49:07 +08:00
|
|
|
I915_WRITE_START(engine, i915_ggtt_offset(ring->vma));
|
2014-08-07 22:39:54 +08:00
|
|
|
|
|
|
|
/* WaClearRingBufHeadRegAtInit:ctg,elk */
|
2016-03-16 19:00:37 +08:00
|
|
|
if (I915_READ_HEAD(engine))
|
2018-02-07 19:15:45 +08:00
|
|
|
DRM_DEBUG_DRIVER("%s initialization failed [head=%08x], fudging\n",
|
|
|
|
engine->name, I915_READ_HEAD(engine));
|
2016-09-09 21:11:53 +08:00
|
|
|
|
2018-06-11 19:08:45 +08:00
|
|
|
/* Check that the ring offsets point within the ring! */
|
|
|
|
GEM_BUG_ON(!intel_ring_offset_valid(ring, ring->head));
|
|
|
|
GEM_BUG_ON(!intel_ring_offset_valid(ring, ring->tail));
|
|
|
|
|
2016-09-09 21:11:53 +08:00
|
|
|
intel_ring_update_space(ring);
|
|
|
|
I915_WRITE_HEAD(engine, ring->head);
|
|
|
|
I915_WRITE_TAIL(engine, ring->tail);
|
|
|
|
(void)I915_READ_TAIL(engine);
|
2014-08-07 22:39:54 +08:00
|
|
|
|
2016-10-05 04:11:25 +08:00
|
|
|
I915_WRITE_CTL(engine, RING_CTL_SIZE(ring->size) | RING_VALID);
|
2010-05-21 09:08:55 +08:00
|
|
|
|
|
|
|
/* If the head is still not zero, the ring is dead */
|
2017-04-11 18:13:40 +08:00
|
|
|
if (intel_wait_for_register(dev_priv, RING_CTL(engine->mmio_base),
|
|
|
|
RING_VALID, RING_VALID,
|
|
|
|
50)) {
|
2010-11-09 18:16:56 +08:00
|
|
|
DRM_ERROR("%s initialization failed "
|
2016-09-09 21:11:53 +08:00
|
|
|
"ctl %08x (valid? %d) head %08x [%08x] tail %08x [%08x] start %08x [expected %08x]\n",
|
2016-03-16 19:00:37 +08:00
|
|
|
engine->name,
|
|
|
|
I915_READ_CTL(engine),
|
|
|
|
I915_READ_CTL(engine) & RING_VALID,
|
2016-09-09 21:11:53 +08:00
|
|
|
I915_READ_HEAD(engine), ring->head,
|
|
|
|
I915_READ_TAIL(engine), ring->tail,
|
2016-03-16 19:00:37 +08:00
|
|
|
I915_READ_START(engine),
|
2016-08-15 17:49:07 +08:00
|
|
|
i915_ggtt_offset(ring->vma));
|
2012-06-04 17:18:15 +08:00
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
|
|
|
|
2017-10-13 21:12:17 +08:00
|
|
|
if (INTEL_GEN(dev_priv) > 2)
|
|
|
|
I915_WRITE_MODE(engine, _MASKED_BIT_DISABLE(STOP_RING));
|
|
|
|
|
2018-08-14 18:40:56 +08:00
|
|
|
/* Papering over lost _interrupts_ immediately following the restart */
|
|
|
|
intel_engine_wakeup(engine);
|
2012-06-04 17:18:15 +08:00
|
|
|
out:
|
2015-01-16 17:34:40 +08:00
|
|
|
intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
|
2012-06-04 17:18:15 +08:00
|
|
|
|
|
|
|
return ret;
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
|
|
|
|
2018-05-17 02:33:51 +08:00
|
|
|
static struct i915_request *reset_prepare(struct intel_engine_cs *engine)
|
2016-09-09 21:11:53 +08:00
|
|
|
{
|
2018-05-17 02:33:55 +08:00
|
|
|
intel_engine_stop_cs(engine);
|
|
|
|
|
2018-05-17 02:33:51 +08:00
|
|
|
if (engine->irq_seqno_barrier)
|
|
|
|
engine->irq_seqno_barrier(engine);
|
|
|
|
|
|
|
|
return i915_gem_find_active_request(engine);
|
|
|
|
}
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
static void skip_request(struct i915_request *rq)
|
2018-05-17 02:33:51 +08:00
|
|
|
{
|
2018-06-11 19:08:44 +08:00
|
|
|
void *vaddr = rq->ring->vaddr;
|
|
|
|
u32 head;
|
2018-05-17 02:33:51 +08:00
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
head = rq->infix;
|
|
|
|
if (rq->postfix < head) {
|
|
|
|
memset32(vaddr + head, MI_NOOP,
|
|
|
|
(rq->ring->size - head) / sizeof(u32));
|
|
|
|
head = 0;
|
|
|
|
}
|
|
|
|
memset32(vaddr + head, MI_NOOP, (rq->postfix - head) / sizeof(u32));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void reset_ring(struct intel_engine_cs *engine, struct i915_request *rq)
|
|
|
|
{
|
2018-09-26 22:50:33 +08:00
|
|
|
GEM_TRACE("%s request global=%d, current=%d\n",
|
|
|
|
engine->name, rq ? rq->global_seqno : 0,
|
|
|
|
intel_engine_get_seqno(engine));
|
2017-10-09 19:03:01 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to restore the logical GPU state to match the continuation
|
2017-02-07 23:24:37 +08:00
|
|
|
* of the request queue. If we skip the context/PD restore, then
|
|
|
|
* the next request may try to execute assuming that its context
|
|
|
|
* is valid and loaded on the GPU and so may try to access invalid
|
|
|
|
* memory, prompting repeated GPU hangs.
|
|
|
|
*
|
|
|
|
* If the request was guilty, we still restore the logical state
|
|
|
|
* in case the next request requires it (e.g. the aliasing ppgtt),
|
|
|
|
* but skip over the hung batch.
|
|
|
|
*
|
|
|
|
* If the request was innocent, we try to replay the request with
|
|
|
|
* the restored context.
|
|
|
|
*/
|
2018-06-11 19:08:44 +08:00
|
|
|
if (rq) {
|
2017-02-07 23:24:37 +08:00
|
|
|
/* If the rq hung, jump to its breadcrumb and skip the batch */
|
2018-06-11 19:08:44 +08:00
|
|
|
rq->ring->head = intel_ring_wrap(rq->ring, rq->head);
|
|
|
|
if (rq->fence.error == -EIO)
|
|
|
|
skip_request(rq);
|
2017-02-07 23:24:37 +08:00
|
|
|
}
|
2016-09-09 21:11:53 +08:00
|
|
|
}
|
|
|
|
|
2018-05-17 02:33:51 +08:00
|
|
|
static void reset_finish(struct intel_engine_cs *engine)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static int intel_rcs_ctx_init(struct i915_request *rq)
|
2014-12-02 23:19:07 +08:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2018-04-11 00:12:47 +08:00
|
|
|
ret = intel_ctx_workarounds_emit(rq);
|
2014-12-02 23:19:07 +08:00
|
|
|
if (ret != 0)
|
|
|
|
return ret;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
ret = i915_gem_render_state_emit(rq);
|
2014-12-02 23:19:07 +08:00
|
|
|
if (ret)
|
2016-01-30 00:49:05 +08:00
|
|
|
return ret;
|
2014-12-02 23:19:07 +08:00
|
|
|
|
2016-01-30 00:49:05 +08:00
|
|
|
return 0;
|
2014-12-02 23:19:07 +08:00
|
|
|
}
|
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
static int init_render_ring(struct intel_engine_cs *engine)
|
2010-05-21 09:08:55 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-03-16 19:00:37 +08:00
|
|
|
int ret = init_ring_common(engine);
|
2014-06-20 01:07:15 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2010-08-30 16:12:42 +08:00
|
|
|
|
2018-04-14 20:27:54 +08:00
|
|
|
intel_whitelist_workarounds_apply(engine);
|
2018-04-11 00:12:47 +08:00
|
|
|
|
2014-03-25 20:31:50 +08:00
|
|
|
/* WaTimedSingleVertexDispatch:cl,bw,ctg,elk,ilk,snb */
|
2016-05-10 17:57:08 +08:00
|
|
|
if (IS_GEN(dev_priv, 4, 6))
|
2012-04-24 20:04:12 +08:00
|
|
|
I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(VS_TIMER_DISPATCH));
|
2013-01-21 00:11:20 +08:00
|
|
|
|
|
|
|
/* 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.
|
2013-05-04 01:48:11 +08:00
|
|
|
*
|
2015-06-02 20:37:37 +08:00
|
|
|
* WaDisableAsyncFlipPerfMode:snb,ivb,hsw,vlv
|
2013-01-21 00:11:20 +08:00
|
|
|
*/
|
2016-05-10 17:57:08 +08:00
|
|
|
if (IS_GEN(dev_priv, 6, 7))
|
2013-01-21 00:11:20 +08:00
|
|
|
I915_WRITE(MI_MODE, _MASKED_BIT_ENABLE(ASYNC_FLIP_PERF_DISABLE));
|
|
|
|
|
2013-01-21 00:33:32 +08:00
|
|
|
/* Required for the hardware to program scanline values for waiting */
|
2014-03-25 01:30:04 +08:00
|
|
|
/* WaEnableFlushTlbInvalidationMode:snb */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN6(dev_priv))
|
2013-01-21 00:33:32 +08:00
|
|
|
I915_WRITE(GFX_MODE,
|
2014-03-22 01:18:54 +08:00
|
|
|
_MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_EXPLICIT));
|
2013-01-21 00:33:32 +08:00
|
|
|
|
2014-03-25 01:30:04 +08:00
|
|
|
/* WaBCSVCSTlbInvalidationMode:ivb,vlv,hsw */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN7(dev_priv))
|
2013-01-21 00:11:20 +08:00
|
|
|
I915_WRITE(GFX_MODE_GEN7,
|
2014-03-25 01:30:04 +08:00
|
|
|
_MASKED_BIT_ENABLE(GFX_TLB_INVALIDATE_EXPLICIT) |
|
2013-01-21 00:11:20 +08:00
|
|
|
_MASKED_BIT_ENABLE(GFX_REPLAY_MODE));
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN6(dev_priv)) {
|
2012-04-28 03:44:41 +08:00
|
|
|
/* From the Sandybridge PRM, volume 1 part 3, page 24:
|
|
|
|
* "If this bit is set, STCunit will have LRA as replacement
|
|
|
|
* policy. [...] This bit must be reset. LRA replacement
|
|
|
|
* policy is not supported."
|
|
|
|
*/
|
|
|
|
I915_WRITE(CACHE_MODE_0,
|
2012-05-08 19:39:59 +08:00
|
|
|
_MASKED_BIT_DISABLE(CM0_STC_EVICT_DISABLE_LRA_SNB));
|
2011-12-13 11:21:58 +08:00
|
|
|
}
|
|
|
|
|
2016-05-10 17:57:08 +08:00
|
|
|
if (IS_GEN(dev_priv, 6, 7))
|
2012-04-24 20:04:12 +08:00
|
|
|
I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING));
|
2011-12-13 11:21:58 +08:00
|
|
|
|
2018-02-10 05:58:46 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6)
|
2016-07-13 00:24:47 +08:00
|
|
|
I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
|
2012-05-26 07:56:23 +08:00
|
|
|
|
2018-04-11 00:12:47 +08:00
|
|
|
return 0;
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static u32 *gen6_signal(struct i915_request *rq, u32 *cs)
|
2010-12-04 19:30:53 +08:00
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
struct drm_i915_private *dev_priv = rq->i915;
|
2016-08-17 00:04:21 +08:00
|
|
|
struct intel_engine_cs *engine;
|
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-14 01:14:48 +08:00
|
|
|
enum intel_engine_id id;
|
2016-10-28 20:58:52 +08:00
|
|
|
int num_rings = 0;
|
2014-04-30 05:52:30 +08:00
|
|
|
|
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-14 01:14:48 +08:00
|
|
|
for_each_engine(engine, dev_priv, id) {
|
2016-08-17 00:04:21 +08:00
|
|
|
i915_reg_t mbox_reg;
|
|
|
|
|
|
|
|
if (!(BIT(engine->hw_id) & GEN6_SEMAPHORES_MASK))
|
|
|
|
continue;
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 21:33:26 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
mbox_reg = rq->engine->semaphore.mbox.signal[engine->hw_id];
|
drm/i915: Type safe register read/write
Make I915_READ and I915_WRITE more type safe by wrapping the register
offset in a struct. This should eliminate most of the fumbles we've had
with misplaced parens.
This only takes care of normal mmio registers. We could extend the idea
to other register types and define each with its own struct. That way
you wouldn't be able to accidentally pass the wrong thing to a specific
register access function.
The gpio_reg setup is probably the ugliest thing left. But I figure I'd
just leave it for now, and wait for some divine inspiration to strike
before making it nice.
As for the generated code, it's actually a bit better sometimes. Eg.
looking at i915_irq_handler(), we can see the following change:
lea 0x70024(%rdx,%rax,1),%r9d
mov $0x1,%edx
- movslq %r9d,%r9
- mov %r9,%rsi
- mov %r9,-0x58(%rbp)
- callq *0xd8(%rbx)
+ mov %r9d,%esi
+ mov %r9d,-0x48(%rbp)
callq *0xd8(%rbx)
So previously gcc thought the register offset might be signed and
decided to sign extend it, just in case. The rest appears to be
mostly just minor shuffling of instructions.
v2: i915_mmio_reg_{offset,equal,valid}() helpers added
s/_REG/_MMIO/ in the register defines
mo more switch statements left to worry about
ring_emit stuff got sorted in a prep patch
cmd parser, lrc context and w/a batch buildup also in prep patch
vgpu stuff cleaned up and moved to a prep patch
all other unrelated changes split out
v3: Rebased due to BXT DSI/BLC, MOCS, etc.
v4: Rebased due to churn, s/i915_mmio_reg_t/i915_reg_t/
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1447853606-2751-1-git-send-email-ville.syrjala@linux.intel.com
2015-11-18 21:33:26 +08:00
|
|
|
if (i915_mmio_reg_valid(mbox_reg)) {
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
*cs++ = i915_mmio_reg_offset(mbox_reg);
|
2018-02-21 17:56:36 +08:00
|
|
|
*cs++ = rq->global_seqno;
|
2016-10-28 20:58:52 +08:00
|
|
|
num_rings++;
|
2014-04-30 05:52:29 +08:00
|
|
|
}
|
|
|
|
}
|
2016-10-28 20:58:52 +08:00
|
|
|
if (num_rings & 1)
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_NOOP;
|
2014-04-30 05:52:30 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
return cs;
|
2010-12-04 19:30:53 +08:00
|
|
|
}
|
|
|
|
|
2017-09-16 01:31:00 +08:00
|
|
|
static void cancel_requests(struct intel_engine_cs *engine)
|
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
struct i915_request *request;
|
2017-09-16 01:31:00 +08:00
|
|
|
unsigned long flags;
|
|
|
|
|
2018-05-03 00:38:39 +08:00
|
|
|
spin_lock_irqsave(&engine->timeline.lock, flags);
|
2017-09-16 01:31:00 +08:00
|
|
|
|
|
|
|
/* Mark all submitted requests as skipped. */
|
2018-05-03 00:38:39 +08:00
|
|
|
list_for_each_entry(request, &engine->timeline.requests, link) {
|
2017-09-16 01:31:00 +08:00
|
|
|
GEM_BUG_ON(!request->global_seqno);
|
2018-02-21 17:56:36 +08:00
|
|
|
if (!i915_request_completed(request))
|
2017-09-16 01:31:00 +08:00
|
|
|
dma_fence_set_error(&request->fence, -EIO);
|
|
|
|
}
|
|
|
|
/* Remaining _unready_ requests will be nop'ed when submitted */
|
|
|
|
|
2018-05-03 00:38:39 +08:00
|
|
|
spin_unlock_irqrestore(&engine->timeline.lock, flags);
|
2017-09-16 01:31:00 +08:00
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static void i9xx_submit_request(struct i915_request *request)
|
2016-08-03 05:50:34 +08:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = request->i915;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_request_submit(request);
|
2016-11-15 04:40:59 +08:00
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
I915_WRITE_TAIL(request->engine,
|
|
|
|
intel_ring_set_tail(request->ring, request->tail));
|
2016-08-03 05:50:34 +08:00
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static void i9xx_emit_breadcrumb(struct i915_request *rq, u32 *cs)
|
2010-12-04 19:30:53 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_STORE_DWORD_INDEX;
|
|
|
|
*cs++ = I915_GEM_HWS_INDEX << MI_STORE_DWORD_INDEX_SHIFT;
|
2018-02-21 17:56:36 +08:00
|
|
|
*cs++ = rq->global_seqno;
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_USER_INTERRUPT;
|
2010-12-04 19:30:53 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
rq->tail = intel_ring_offset(rq, cs);
|
|
|
|
assert_ring_tail_valid(rq->ring, rq->tail);
|
2010-12-04 19:30:53 +08:00
|
|
|
}
|
|
|
|
|
2016-10-28 20:58:51 +08:00
|
|
|
static const int i9xx_emit_breadcrumb_sz = 4;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static void gen6_sema_emit_breadcrumb(struct i915_request *rq, u32 *cs)
|
2016-08-03 05:50:34 +08:00
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
return i9xx_emit_breadcrumb(rq, rq->engine->semaphore.signal(rq, cs));
|
2016-08-03 05:50:34 +08:00
|
|
|
}
|
|
|
|
|
2011-09-15 11:32:47 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen6_ring_sync_to(struct i915_request *rq, struct i915_request *signal)
|
2010-12-04 19:30:53 +08:00
|
|
|
{
|
2011-09-15 11:32:47 +08:00
|
|
|
u32 dw1 = MI_SEMAPHORE_MBOX |
|
|
|
|
MI_SEMAPHORE_COMPARE |
|
|
|
|
MI_SEMAPHORE_REGISTER;
|
2018-02-21 17:56:36 +08:00
|
|
|
u32 wait_mbox = signal->engine->semaphore.mbox.wait[rq->engine->hw_id];
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2010-12-04 19:30:53 +08:00
|
|
|
|
2014-04-30 05:52:28 +08:00
|
|
|
WARN_ON(wait_mbox == MI_SEMAPHORE_SYNC_INVALID);
|
2012-04-12 04:12:52 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 4);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2010-12-04 19:30:53 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = dw1 | wait_mbox;
|
2016-08-03 05:50:39 +08:00
|
|
|
/* Throughout all of the GEM code, seqno passed implies our current
|
|
|
|
* seqno is >= the last seqno executed. However for hardware the
|
|
|
|
* comparison is strictly greater than.
|
|
|
|
*/
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = signal->global_seqno - 1;
|
|
|
|
*cs++ = 0;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2010-12-04 19:30:53 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:21 +08:00
|
|
|
static void
|
2016-07-21 01:16:06 +08:00
|
|
|
gen5_seqno_barrier(struct intel_engine_cs *engine)
|
2010-12-15 17:56:50 +08:00
|
|
|
{
|
2016-07-02 00:23:21 +08:00
|
|
|
/* MI_STORE are internally buffered by the GPU and not flushed
|
|
|
|
* either by MI_FLUSH or SyncFlush or any other combination of
|
|
|
|
* MI commands.
|
2010-12-15 17:56:50 +08:00
|
|
|
*
|
2016-07-02 00:23:21 +08:00
|
|
|
* "Only the submission of the store operation is guaranteed.
|
|
|
|
* The write result will be complete (coherent) some time later
|
|
|
|
* (this is practically a finite period but there is no guaranteed
|
|
|
|
* latency)."
|
|
|
|
*
|
|
|
|
* Empirically, we observe that we need a delay of at least 75us to
|
|
|
|
* be sure that the seqno write is visible by the CPU.
|
2010-12-15 17:56:50 +08:00
|
|
|
*/
|
2016-07-02 00:23:21 +08:00
|
|
|
usleep_range(125, 250);
|
2010-12-15 17:56:50 +08:00
|
|
|
}
|
|
|
|
|
2016-04-09 17:57:54 +08:00
|
|
|
static void
|
|
|
|
gen6_seqno_barrier(struct intel_engine_cs *engine)
|
2012-12-14 23:01:25 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-04-27 16:02:01 +08:00
|
|
|
|
2012-12-14 23:01:25 +08:00
|
|
|
/* Workaround to force correct ordering between irq and seqno writes on
|
|
|
|
* ivb (and maybe also on snb) by reading from a CS register (like
|
2016-04-09 17:57:53 +08:00
|
|
|
* ACTHD) before reading the status page.
|
|
|
|
*
|
|
|
|
* Note that this effectively stalls the read by the time it takes to
|
|
|
|
* do a memory transaction, which more or less ensures that the write
|
|
|
|
* from the GPU has sufficient time to invalidate the CPU cacheline.
|
|
|
|
* Alternatively we could delay the interrupt from the CS ring to give
|
|
|
|
* the write time to land, but that would incur a delay after every
|
|
|
|
* batch i.e. much more frequent than a delay when waiting for the
|
|
|
|
* interrupt (with the same net latency).
|
2016-04-27 16:02:01 +08:00
|
|
|
*
|
|
|
|
* Also note that to prevent whole machine hangs on gen7, we have to
|
|
|
|
* take the spinlock to guard against concurrent cacheline access.
|
2016-04-09 17:57:53 +08:00
|
|
|
*/
|
2016-04-27 16:02:01 +08:00
|
|
|
spin_lock_irq(&dev_priv->uncore.lock);
|
2016-04-09 17:57:54 +08:00
|
|
|
POSTING_READ_FW(RING_ACTHD(engine->mmio_base));
|
2016-04-27 16:02:01 +08:00
|
|
|
spin_unlock_irq(&dev_priv->uncore.lock);
|
2012-12-14 23:01:25 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void
|
|
|
|
gen5_irq_enable(struct intel_engine_cs *engine)
|
2012-04-12 04:12:54 +08:00
|
|
|
{
|
2016-07-02 00:23:27 +08:00
|
|
|
gen5_enable_gt_irq(engine->i915, engine->irq_enable_mask);
|
2012-04-12 04:12:54 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2016-07-02 00:23:27 +08:00
|
|
|
gen5_irq_disable(struct intel_engine_cs *engine)
|
2012-04-12 04:12:54 +08:00
|
|
|
{
|
2016-07-02 00:23:27 +08:00
|
|
|
gen5_disable_gt_irq(engine->i915, engine->irq_enable_mask);
|
2012-04-12 04:12:54 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void
|
|
|
|
i9xx_irq_enable(struct intel_engine_cs *engine)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2010-12-14 00:54:50 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
dev_priv->irq_mask &= ~engine->irq_enable_mask;
|
|
|
|
I915_WRITE(IMR, dev_priv->irq_mask);
|
|
|
|
POSTING_READ_FW(RING_IMR(engine->mmio_base));
|
2010-05-22 04:26:39 +08:00
|
|
|
}
|
|
|
|
|
2010-05-21 09:08:55 +08:00
|
|
|
static void
|
2016-07-02 00:23:27 +08:00
|
|
|
i9xx_irq_disable(struct intel_engine_cs *engine)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2010-05-22 04:26:39 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
dev_priv->irq_mask |= engine->irq_enable_mask;
|
|
|
|
I915_WRITE(IMR, dev_priv->irq_mask);
|
2010-05-22 04:26:39 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void
|
|
|
|
i8xx_irq_enable(struct intel_engine_cs *engine)
|
2012-04-23 04:13:57 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2012-04-23 04:13:57 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
dev_priv->irq_mask &= ~engine->irq_enable_mask;
|
|
|
|
I915_WRITE16(IMR, dev_priv->irq_mask);
|
|
|
|
POSTING_READ16(RING_IMR(engine->mmio_base));
|
2012-04-23 04:13:57 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2016-07-02 00:23:27 +08:00
|
|
|
i8xx_irq_disable(struct intel_engine_cs *engine)
|
2012-04-23 04:13:57 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2012-04-23 04:13:57 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
dev_priv->irq_mask |= engine->irq_enable_mask;
|
|
|
|
I915_WRITE16(IMR, dev_priv->irq_mask);
|
2012-04-23 04:13:57 +08:00
|
|
|
}
|
|
|
|
|
2011-01-05 01:34:02 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
bsd_ring_flush(struct i915_request *rq, u32 mode)
|
2010-05-21 09:08:57 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2011-01-05 01:34:02 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2011-01-05 01:34:02 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_FLUSH;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2011-01-05 01:34:02 +08:00
|
|
|
return 0;
|
2010-05-21 09:08:57 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void
|
|
|
|
gen6_irq_enable(struct intel_engine_cs *engine)
|
2011-01-05 01:35:21 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2011-01-05 01:35:21 +08:00
|
|
|
|
2016-07-02 00:23:28 +08:00
|
|
|
I915_WRITE_IMR(engine,
|
|
|
|
~(engine->irq_enable_mask |
|
|
|
|
engine->irq_keep_mask));
|
2016-07-02 00:23:27 +08:00
|
|
|
gen5_enable_gt_irq(dev_priv, engine->irq_enable_mask);
|
2011-01-05 01:35:21 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2016-07-02 00:23:27 +08:00
|
|
|
gen6_irq_disable(struct intel_engine_cs *engine)
|
2011-01-05 01:35:21 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2011-01-05 01:35:21 +08:00
|
|
|
|
2016-07-02 00:23:28 +08:00
|
|
|
I915_WRITE_IMR(engine, ~engine->irq_keep_mask);
|
2016-07-02 00:23:27 +08:00
|
|
|
gen5_disable_gt_irq(dev_priv, engine->irq_enable_mask);
|
2010-05-21 09:08:57 +08:00
|
|
|
}
|
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
static void
|
|
|
|
hsw_vebox_irq_enable(struct intel_engine_cs *engine)
|
2013-05-29 10:22:30 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2013-05-29 10:22:30 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
I915_WRITE_IMR(engine, ~engine->irq_enable_mask);
|
2016-10-13 00:24:30 +08:00
|
|
|
gen6_unmask_pm_irq(dev_priv, engine->irq_enable_mask);
|
2013-05-29 10:22:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2016-07-02 00:23:27 +08:00
|
|
|
hsw_vebox_irq_disable(struct intel_engine_cs *engine)
|
2013-05-29 10:22:30 +08:00
|
|
|
{
|
2016-05-06 22:40:21 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2013-05-29 10:22:30 +08:00
|
|
|
|
2016-07-02 00:23:27 +08:00
|
|
|
I915_WRITE_IMR(engine, ~0);
|
2016-10-13 00:24:30 +08:00
|
|
|
gen6_mask_pm_irq(dev_priv, engine->irq_enable_mask);
|
2013-05-29 10:22:30 +08:00
|
|
|
}
|
|
|
|
|
2010-05-21 09:08:57 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
i965_emit_bb_start(struct i915_request *rq,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 length,
|
|
|
|
unsigned int dispatch_flags)
|
2010-05-21 09:08:57 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2010-10-27 19:45:26 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT | (dispatch_flags &
|
|
|
|
I915_DISPATCH_SECURE ? 0 : MI_BATCH_NON_SECURE_I965);
|
|
|
|
*cs++ = offset;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2010-05-21 09:08:57 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-12-17 23:21:27 +08:00
|
|
|
/* Just userspace ABI convention to limit the wa batch bo to a resonable size */
|
|
|
|
#define I830_BATCH_LIMIT (256*1024)
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
#define I830_TLB_ENTRIES (2)
|
|
|
|
#define I830_WA_SIZE max(I830_TLB_ENTRIES*4096, I830_BATCH_LIMIT)
|
2010-05-21 09:08:55 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
i830_emit_bb_start(struct i915_request *rq,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 len,
|
|
|
|
unsigned int dispatch_flags)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
u32 *cs, cs_offset = i915_ggtt_offset(rq->engine->scratch);
|
2010-05-22 04:26:39 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 6);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2010-05-22 04:26:39 +08:00
|
|
|
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
/* Evict the invalid PTE TLBs */
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = COLOR_BLT_CMD | BLT_WRITE_RGBA;
|
|
|
|
*cs++ = BLT_DEPTH_32 | BLT_ROP_COLOR_COPY | 4096;
|
|
|
|
*cs++ = I830_TLB_ENTRIES << 16 | 4; /* load each page */
|
|
|
|
*cs++ = cs_offset;
|
|
|
|
*cs++ = 0xdeadbeef;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2012-12-17 23:21:27 +08:00
|
|
|
|
2015-02-13 19:48:10 +08:00
|
|
|
if ((dispatch_flags & I915_DISPATCH_PINNED) == 0) {
|
2012-12-17 23:21:27 +08:00
|
|
|
if (len > I830_BATCH_LIMIT)
|
|
|
|
return -ENOSPC;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 6 + 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
|
|
|
|
/* Blit the batch (which has now all relocs applied) to the
|
|
|
|
* stable batch scratch bo area (so that the CS never
|
|
|
|
* stumbles over its tlb invalidation bug) ...
|
|
|
|
*/
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = SRC_COPY_BLT_CMD | BLT_WRITE_RGBA;
|
|
|
|
*cs++ = BLT_DEPTH_32 | BLT_ROP_SRC_COPY | 4096;
|
|
|
|
*cs++ = DIV_ROUND_UP(len, 4096) << 16 | 4096;
|
|
|
|
*cs++ = cs_offset;
|
|
|
|
*cs++ = 4096;
|
|
|
|
*cs++ = offset;
|
|
|
|
|
|
|
|
*cs++ = MI_FLUSH;
|
|
|
|
*cs++ = MI_NOOP;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2012-12-17 23:21:27 +08:00
|
|
|
|
|
|
|
/* ... and execute it. */
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
offset = cs_offset;
|
2012-12-17 23:21:27 +08:00
|
|
|
}
|
2010-10-27 19:45:26 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
|
|
|
|
*cs++ = offset | (dispatch_flags & I915_DISPATCH_SECURE ? 0 :
|
|
|
|
MI_BATCH_NON_SECURE);
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
drm/i915: Evict CS TLBs between batches
Running igt, I was encountering the invalid TLB bug on my 845g, despite
that it was using the CS workaround. Examining the w/a buffer in the
error state, showed that the copy from the user batch into the
workaround itself was suffering from the invalid TLB bug (the first
cacheline was broken with the first two words reversed). Time to try a
fresh approach. This extends the workaround to write into each page of
our scratch buffer in order to overflow the TLB and evict the invalid
entries. This could be refined to only do so after we update the GTT,
but for simplicity, we do it before each batch.
I suspect this supersedes our current workaround, but for safety keep
doing both.
v2: The magic number shall be 2.
This doesn't conclusively prove that it is the mythical TLB bug we've
been trying to workaround for so long, that it requires touching a number
of pages to prevent the corruption indicates to me that it is TLB
related, but the corruption (the reversed cacheline) is more subtle than
a TLB bug, where we would expect it to read the wrong page entirely.
Oh well, it prevents a reliable hang for me and so probably for others
as well.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
2014-09-08 21:25:41 +08:00
|
|
|
|
2012-04-12 04:12:56 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_emit_bb_start(struct i915_request *rq,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 len,
|
|
|
|
unsigned int dispatch_flags)
|
2012-04-12 04:12:56 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2012-04-12 04:12:56 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2012-04-12 04:12:56 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START | MI_BATCH_GTT;
|
|
|
|
*cs++ = offset | (dispatch_flags & I915_DISPATCH_SECURE ? 0 :
|
|
|
|
MI_BATCH_NON_SECURE);
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2010-05-22 04:26:39 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-07-27 23:55:01 +08:00
|
|
|
int intel_ring_pin(struct intel_ring *ring)
|
2014-11-13 18:28:56 +08:00
|
|
|
{
|
2016-08-15 17:48:57 +08:00
|
|
|
struct i915_vma *vma = ring->vma;
|
2018-10-02 03:44:44 +08:00
|
|
|
enum i915_map_type map = i915_coherent_map_type(vma->vm->i915);
|
2017-04-03 19:34:25 +08:00
|
|
|
unsigned int flags;
|
2016-04-12 21:46:16 +08:00
|
|
|
void *addr;
|
2014-11-13 18:28:56 +08:00
|
|
|
int ret;
|
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
GEM_BUG_ON(ring->vaddr);
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2016-12-24 07:56:21 +08:00
|
|
|
flags = PIN_GLOBAL;
|
2018-07-27 22:11:46 +08:00
|
|
|
|
|
|
|
/* Ring wraparound at offset 0 sometimes hangs. No idea why. */
|
|
|
|
flags |= PIN_OFFSET_BIAS | i915_ggtt_pin_bias(vma);
|
|
|
|
|
2016-08-19 00:16:56 +08:00
|
|
|
if (vma->obj->stolen)
|
2016-08-15 17:48:57 +08:00
|
|
|
flags |= PIN_MAPPABLE;
|
2018-05-21 16:21:31 +08:00
|
|
|
else
|
|
|
|
flags |= PIN_HIGH;
|
2015-10-08 20:39:54 +08:00
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
if (!(vma->flags & I915_VMA_GLOBAL_BIND)) {
|
2016-08-19 00:16:56 +08:00
|
|
|
if (flags & PIN_MAPPABLE || map == I915_MAP_WC)
|
2016-08-15 17:48:57 +08:00
|
|
|
ret = i915_gem_object_set_to_gtt_domain(vma->obj, true);
|
|
|
|
else
|
|
|
|
ret = i915_gem_object_set_to_cpu_domain(vma->obj, true);
|
|
|
|
if (unlikely(ret))
|
2015-10-08 20:39:54 +08:00
|
|
|
return ret;
|
2016-08-15 17:48:57 +08:00
|
|
|
}
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2018-07-27 17:18:55 +08:00
|
|
|
ret = i915_vma_pin(vma, 0, 0, flags);
|
2016-08-15 17:48:57 +08:00
|
|
|
if (unlikely(ret))
|
|
|
|
return ret;
|
2015-10-08 20:39:54 +08:00
|
|
|
|
2016-08-19 00:16:56 +08:00
|
|
|
if (i915_vma_is_map_and_fenceable(vma))
|
2016-08-15 17:48:57 +08:00
|
|
|
addr = (void __force *)i915_vma_pin_iomap(vma);
|
|
|
|
else
|
2016-08-19 00:16:56 +08:00
|
|
|
addr = i915_gem_object_pin_map(vma->obj, map);
|
2016-08-15 17:48:57 +08:00
|
|
|
if (IS_ERR(addr))
|
|
|
|
goto err;
|
2014-11-13 18:28:56 +08:00
|
|
|
|
2017-10-14 04:26:16 +08:00
|
|
|
vma->obj->pin_global++;
|
|
|
|
|
2016-08-03 05:50:22 +08:00
|
|
|
ring->vaddr = addr;
|
2014-11-13 18:28:56 +08:00
|
|
|
return 0;
|
2016-04-08 19:11:10 +08:00
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
err:
|
|
|
|
i915_vma_unpin(vma);
|
|
|
|
return PTR_ERR(addr);
|
2014-11-13 18:28:56 +08:00
|
|
|
}
|
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
void intel_ring_reset(struct intel_ring *ring, u32 tail)
|
|
|
|
{
|
2018-06-11 19:08:45 +08:00
|
|
|
GEM_BUG_ON(!intel_ring_offset_valid(ring, tail));
|
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
ring->tail = tail;
|
|
|
|
ring->head = tail;
|
|
|
|
ring->emit = tail;
|
|
|
|
intel_ring_update_space(ring);
|
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:23 +08:00
|
|
|
void intel_ring_unpin(struct intel_ring *ring)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(!ring->vma);
|
|
|
|
GEM_BUG_ON(!ring->vaddr);
|
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
/* Discard any unused bytes beyond that submitted to hw. */
|
|
|
|
intel_ring_reset(ring, ring->tail);
|
|
|
|
|
2016-08-19 00:16:56 +08:00
|
|
|
if (i915_vma_is_map_and_fenceable(ring->vma))
|
2016-08-03 05:50:23 +08:00
|
|
|
i915_vma_unpin_iomap(ring->vma);
|
2016-08-15 17:48:57 +08:00
|
|
|
else
|
|
|
|
i915_gem_object_unpin_map(ring->vma->obj);
|
2016-08-03 05:50:23 +08:00
|
|
|
ring->vaddr = NULL;
|
|
|
|
|
2017-10-14 04:26:16 +08:00
|
|
|
ring->vma->obj->pin_global--;
|
2016-08-15 17:48:57 +08:00
|
|
|
i915_vma_unpin(ring->vma);
|
2014-07-03 23:28:02 +08:00
|
|
|
}
|
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
static struct i915_vma *
|
|
|
|
intel_ring_create_vma(struct drm_i915_private *dev_priv, int size)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2018-07-13 02:53:11 +08:00
|
|
|
struct i915_address_space *vm = &dev_priv->ggtt.vm;
|
2010-11-09 03:18:58 +08:00
|
|
|
struct drm_i915_gem_object *obj;
|
2016-08-15 17:48:57 +08:00
|
|
|
struct i915_vma *vma;
|
2010-05-22 04:26:39 +08:00
|
|
|
|
2016-12-01 22:16:36 +08:00
|
|
|
obj = i915_gem_object_create_stolen(dev_priv, size);
|
2016-08-19 00:16:57 +08:00
|
|
|
if (!obj)
|
2017-04-20 18:17:09 +08:00
|
|
|
obj = i915_gem_object_create_internal(dev_priv, size);
|
2016-08-15 17:48:57 +08:00
|
|
|
if (IS_ERR(obj))
|
|
|
|
return ERR_CAST(obj);
|
2010-05-21 09:08:55 +08:00
|
|
|
|
2018-07-13 02:53:11 +08:00
|
|
|
/*
|
|
|
|
* Mark ring buffers as read-only from GPU side (so no stray overwrites)
|
|
|
|
* if supported by the platform's GGTT.
|
|
|
|
*/
|
|
|
|
if (vm->has_read_only)
|
2018-07-13 02:53:13 +08:00
|
|
|
i915_gem_object_set_readonly(obj);
|
2014-06-17 13:29:42 +08:00
|
|
|
|
2018-07-13 02:53:11 +08:00
|
|
|
vma = i915_vma_instance(obj, vm, NULL);
|
2016-08-15 17:48:57 +08:00
|
|
|
if (IS_ERR(vma))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
return vma;
|
2014-04-09 16:19:41 +08:00
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
err:
|
|
|
|
i915_gem_object_put(obj);
|
|
|
|
return vma;
|
2014-04-09 16:19:41 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *
|
2018-05-03 00:38:38 +08:00
|
|
|
intel_engine_create_ring(struct intel_engine_cs *engine,
|
2018-05-03 00:38:39 +08:00
|
|
|
struct i915_timeline *timeline,
|
2018-05-03 00:38:38 +08:00
|
|
|
int size)
|
2015-09-03 20:01:39 +08:00
|
|
|
{
|
2016-08-03 05:50:21 +08:00
|
|
|
struct intel_ring *ring;
|
2016-08-15 17:48:57 +08:00
|
|
|
struct i915_vma *vma;
|
2015-09-03 20:01:39 +08:00
|
|
|
|
2016-08-03 05:50:30 +08:00
|
|
|
GEM_BUG_ON(!is_power_of_2(size));
|
2016-10-05 04:11:25 +08:00
|
|
|
GEM_BUG_ON(RING_CTL_SIZE(size) & ~RING_NR_PAGES);
|
2018-05-03 00:38:39 +08:00
|
|
|
GEM_BUG_ON(timeline == &engine->timeline);
|
2018-04-30 21:15:02 +08:00
|
|
|
lockdep_assert_held(&engine->i915->drm.struct_mutex);
|
2016-08-03 05:50:30 +08:00
|
|
|
|
2015-09-03 20:01:39 +08:00
|
|
|
ring = kzalloc(sizeof(*ring), GFP_KERNEL);
|
2016-08-15 17:48:57 +08:00
|
|
|
if (!ring)
|
2015-09-03 20:01:39 +08:00
|
|
|
return ERR_PTR(-ENOMEM);
|
|
|
|
|
2016-08-04 14:52:36 +08:00
|
|
|
INIT_LIST_HEAD(&ring->request_list);
|
2018-05-03 00:38:39 +08:00
|
|
|
ring->timeline = i915_timeline_get(timeline);
|
2016-08-04 14:52:36 +08:00
|
|
|
|
2015-09-03 20:01:39 +08:00
|
|
|
ring->size = size;
|
|
|
|
/* Workaround an erratum on the i830 which causes a hang if
|
|
|
|
* the TAIL pointer points to within the last 2 cachelines
|
|
|
|
* of the buffer.
|
|
|
|
*/
|
|
|
|
ring->effective_size = size;
|
2016-11-30 23:43:04 +08:00
|
|
|
if (IS_I830(engine->i915) || IS_I845G(engine->i915))
|
2015-09-03 20:01:39 +08:00
|
|
|
ring->effective_size -= 2 * CACHELINE_BYTES;
|
|
|
|
|
|
|
|
intel_ring_update_space(ring);
|
|
|
|
|
2016-08-15 17:48:57 +08:00
|
|
|
vma = intel_ring_create_vma(engine->i915, size);
|
|
|
|
if (IS_ERR(vma)) {
|
2015-09-03 20:01:39 +08:00
|
|
|
kfree(ring);
|
2016-08-15 17:48:57 +08:00
|
|
|
return ERR_CAST(vma);
|
2015-09-03 20:01:39 +08:00
|
|
|
}
|
2016-08-15 17:48:57 +08:00
|
|
|
ring->vma = vma;
|
2015-09-03 20:01:39 +08:00
|
|
|
|
|
|
|
return ring;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2016-08-03 05:50:21 +08:00
|
|
|
intel_ring_free(struct intel_ring *ring)
|
2015-09-03 20:01:39 +08:00
|
|
|
{
|
2016-10-28 20:58:29 +08:00
|
|
|
struct drm_i915_gem_object *obj = ring->vma->obj;
|
|
|
|
|
|
|
|
i915_vma_close(ring->vma);
|
|
|
|
__i915_gem_object_release_unless_active(obj);
|
|
|
|
|
2018-05-03 00:38:39 +08:00
|
|
|
i915_timeline_put(ring->timeline);
|
2015-09-03 20:01:39 +08:00
|
|
|
kfree(ring);
|
|
|
|
}
|
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
static void intel_ring_context_destroy(struct intel_context *ce)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(ce->pin_count);
|
|
|
|
|
2018-06-25 18:06:04 +08:00
|
|
|
if (!ce->state)
|
|
|
|
return;
|
|
|
|
|
|
|
|
GEM_BUG_ON(i915_gem_object_is_active(ce->state->obj));
|
|
|
|
i915_gem_object_put(ce->state->obj);
|
2018-05-18 05:26:32 +08:00
|
|
|
}
|
|
|
|
|
2018-06-14 17:41:03 +08:00
|
|
|
static int __context_pin_ppgtt(struct i915_gem_context *ctx)
|
|
|
|
{
|
|
|
|
struct i915_hw_ppgtt *ppgtt;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
ppgtt = ctx->ppgtt ?: ctx->i915->mm.aliasing_ppgtt;
|
|
|
|
if (ppgtt)
|
|
|
|
err = gen6_ppgtt_pin(ppgtt);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __context_unpin_ppgtt(struct i915_gem_context *ctx)
|
|
|
|
{
|
|
|
|
struct i915_hw_ppgtt *ppgtt;
|
|
|
|
|
|
|
|
ppgtt = ctx->ppgtt ?: ctx->i915->mm.aliasing_ppgtt;
|
|
|
|
if (ppgtt)
|
|
|
|
gen6_ppgtt_unpin(ppgtt);
|
|
|
|
}
|
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
static int __context_pin(struct intel_context *ce)
|
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 23:37:20 +08:00
|
|
|
{
|
2018-06-05 16:53:48 +08:00
|
|
|
struct i915_vma *vma;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
vma = ce->state;
|
|
|
|
if (!vma)
|
|
|
|
return 0;
|
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 23:37:20 +08:00
|
|
|
|
2017-11-10 22:26:32 +08:00
|
|
|
/*
|
|
|
|
* Clear this page out of any CPU caches for coherent swap-in/out.
|
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 23:37:20 +08:00
|
|
|
* We only want to do this on the first bind so that we do not stall
|
|
|
|
* on an active context (which by nature is already on the GPU).
|
|
|
|
*/
|
|
|
|
if (!(vma->flags & I915_VMA_GLOBAL_BIND)) {
|
2018-06-05 16:53:48 +08:00
|
|
|
err = i915_gem_object_set_to_gtt_domain(vma->obj, true);
|
|
|
|
if (err)
|
|
|
|
return err;
|
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 23:37:20 +08:00
|
|
|
}
|
|
|
|
|
2018-07-27 17:18:55 +08:00
|
|
|
err = i915_vma_pin(vma, 0, 0, PIN_GLOBAL | PIN_HIGH);
|
2018-06-05 16:53:48 +08:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* And mark is as a globally pinned object to let the shrinker know
|
|
|
|
* it cannot reclaim the object until we release it.
|
|
|
|
*/
|
|
|
|
vma->obj->pin_global++;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __context_unpin(struct intel_context *ce)
|
|
|
|
{
|
|
|
|
struct i915_vma *vma;
|
|
|
|
|
|
|
|
vma = ce->state;
|
|
|
|
if (!vma)
|
|
|
|
return;
|
|
|
|
|
|
|
|
vma->obj->pin_global--;
|
|
|
|
i915_vma_unpin(vma);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void intel_ring_context_unpin(struct intel_context *ce)
|
|
|
|
{
|
2018-06-14 17:41:03 +08:00
|
|
|
__context_unpin_ppgtt(ce->gem_context);
|
2018-06-05 16:53:48 +08:00
|
|
|
__context_unpin(ce);
|
|
|
|
|
|
|
|
i915_gem_context_put(ce->gem_context);
|
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 23:37:20 +08:00
|
|
|
}
|
|
|
|
|
2017-04-27 18:46:51 +08:00
|
|
|
static struct i915_vma *
|
|
|
|
alloc_context_vma(struct intel_engine_cs *engine)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *i915 = engine->i915;
|
|
|
|
struct drm_i915_gem_object *obj;
|
|
|
|
struct i915_vma *vma;
|
2017-11-10 22:26:33 +08:00
|
|
|
int err;
|
2017-04-27 18:46:51 +08:00
|
|
|
|
2017-04-28 15:53:36 +08:00
|
|
|
obj = i915_gem_object_create(i915, engine->context_size);
|
2017-04-27 18:46:51 +08:00
|
|
|
if (IS_ERR(obj))
|
|
|
|
return ERR_CAST(obj);
|
|
|
|
|
2017-11-10 22:26:33 +08:00
|
|
|
if (engine->default_state) {
|
|
|
|
void *defaults, *vaddr;
|
|
|
|
|
|
|
|
vaddr = i915_gem_object_pin_map(obj, I915_MAP_WB);
|
|
|
|
if (IS_ERR(vaddr)) {
|
|
|
|
err = PTR_ERR(vaddr);
|
|
|
|
goto err_obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
defaults = i915_gem_object_pin_map(engine->default_state,
|
|
|
|
I915_MAP_WB);
|
|
|
|
if (IS_ERR(defaults)) {
|
|
|
|
err = PTR_ERR(defaults);
|
|
|
|
goto err_map;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(vaddr, defaults, engine->context_size);
|
|
|
|
|
|
|
|
i915_gem_object_unpin_map(engine->default_state);
|
|
|
|
i915_gem_object_unpin_map(obj);
|
|
|
|
}
|
|
|
|
|
2017-04-27 18:46:51 +08:00
|
|
|
/*
|
|
|
|
* Try to make the context utilize L3 as well as LLC.
|
|
|
|
*
|
|
|
|
* On VLV we don't have L3 controls in the PTEs so we
|
|
|
|
* shouldn't touch the cache level, especially as that
|
|
|
|
* would make the object snooped which might have a
|
|
|
|
* negative performance impact.
|
|
|
|
*
|
|
|
|
* Snooping is required on non-llc platforms in execlist
|
|
|
|
* mode, but since all GGTT accesses use PAT entry 0 we
|
|
|
|
* get snooping anyway regardless of cache_level.
|
|
|
|
*
|
|
|
|
* This is only applicable for Ivy Bridge devices since
|
|
|
|
* later platforms don't have L3 control bits in the PTE.
|
|
|
|
*/
|
|
|
|
if (IS_IVYBRIDGE(i915)) {
|
|
|
|
/* Ignore any error, regard it as a simple optimisation */
|
|
|
|
i915_gem_object_set_cache_level(obj, I915_CACHE_L3_LLC);
|
|
|
|
}
|
|
|
|
|
2018-06-05 23:37:58 +08:00
|
|
|
vma = i915_vma_instance(obj, &i915->ggtt.vm, NULL);
|
2017-11-10 22:26:33 +08:00
|
|
|
if (IS_ERR(vma)) {
|
|
|
|
err = PTR_ERR(vma);
|
|
|
|
goto err_obj;
|
|
|
|
}
|
2017-04-27 18:46:51 +08:00
|
|
|
|
|
|
|
return vma;
|
2017-11-10 22:26:33 +08:00
|
|
|
|
|
|
|
err_map:
|
|
|
|
i915_gem_object_unpin_map(obj);
|
|
|
|
err_obj:
|
|
|
|
i915_gem_object_put(obj);
|
|
|
|
return ERR_PTR(err);
|
2017-04-27 18:46:51 +08:00
|
|
|
}
|
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
static struct intel_context *
|
|
|
|
__ring_context_pin(struct intel_engine_cs *engine,
|
|
|
|
struct i915_gem_context *ctx,
|
|
|
|
struct intel_context *ce)
|
2016-06-24 21:55:53 +08:00
|
|
|
{
|
2018-05-18 05:26:32 +08:00
|
|
|
int err;
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2017-04-28 15:53:36 +08:00
|
|
|
if (!ce->state && engine->context_size) {
|
2017-04-27 18:46:51 +08:00
|
|
|
struct i915_vma *vma;
|
|
|
|
|
|
|
|
vma = alloc_context_vma(engine);
|
|
|
|
if (IS_ERR(vma)) {
|
2018-05-18 05:26:32 +08:00
|
|
|
err = PTR_ERR(vma);
|
2017-05-04 17:33:08 +08:00
|
|
|
goto err;
|
2017-04-27 18:46:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
ce->state = vma;
|
|
|
|
}
|
|
|
|
|
2018-06-05 16:53:48 +08:00
|
|
|
err = __context_pin(ce);
|
|
|
|
if (err)
|
|
|
|
goto err;
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2018-06-14 17:41:03 +08:00
|
|
|
err = __context_pin_ppgtt(ce->gem_context);
|
|
|
|
if (err)
|
|
|
|
goto err_unpin;
|
|
|
|
|
2016-07-20 20:31:50 +08:00
|
|
|
i915_gem_context_get(ctx);
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2017-05-04 17:33:08 +08:00
|
|
|
/* One ringbuffer to rule them all */
|
2018-05-18 05:26:32 +08:00
|
|
|
GEM_BUG_ON(!engine->buffer);
|
|
|
|
ce->ring = engine->buffer;
|
|
|
|
|
|
|
|
return ce;
|
2017-05-04 17:33:08 +08:00
|
|
|
|
2018-06-14 17:41:03 +08:00
|
|
|
err_unpin:
|
|
|
|
__context_unpin(ce);
|
2017-05-04 17:33:08 +08:00
|
|
|
err:
|
2016-06-24 21:55:53 +08:00
|
|
|
ce->pin_count = 0;
|
2018-05-18 05:26:32 +08:00
|
|
|
return ERR_PTR(err);
|
2016-06-24 21:55:53 +08:00
|
|
|
}
|
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
static const struct intel_context_ops ring_context_ops = {
|
|
|
|
.unpin = intel_ring_context_unpin,
|
|
|
|
.destroy = intel_ring_context_destroy,
|
|
|
|
};
|
|
|
|
|
|
|
|
static struct intel_context *
|
|
|
|
intel_ring_context_pin(struct intel_engine_cs *engine,
|
|
|
|
struct i915_gem_context *ctx)
|
2016-06-24 21:55:53 +08:00
|
|
|
{
|
2018-04-30 21:15:01 +08:00
|
|
|
struct intel_context *ce = to_intel_context(ctx, engine);
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2016-07-05 17:40:23 +08:00
|
|
|
lockdep_assert_held(&ctx->i915->drm.struct_mutex);
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
if (likely(ce->pin_count++))
|
|
|
|
return ce;
|
|
|
|
GEM_BUG_ON(!ce->pin_count); /* no overflow please! */
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
ce->ops = &ring_context_ops;
|
2016-06-24 21:55:53 +08:00
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
return __ring_context_pin(engine, ctx, ce);
|
2016-06-24 21:55:53 +08:00
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:39 +08:00
|
|
|
static int intel_init_ring_buffer(struct intel_engine_cs *engine)
|
2014-04-09 16:19:41 +08:00
|
|
|
{
|
2018-05-03 00:38:39 +08:00
|
|
|
struct i915_timeline *timeline;
|
2018-06-12 01:18:25 +08:00
|
|
|
struct intel_ring *ring;
|
|
|
|
unsigned int size;
|
2017-04-03 19:34:26 +08:00
|
|
|
int err;
|
2014-11-20 07:33:08 +08:00
|
|
|
|
2016-07-13 23:03:41 +08:00
|
|
|
intel_engine_setup_common(engine);
|
|
|
|
|
2018-05-03 00:38:39 +08:00
|
|
|
timeline = i915_timeline_create(engine->i915, engine->name);
|
|
|
|
if (IS_ERR(timeline)) {
|
|
|
|
err = PTR_ERR(timeline);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
ring = intel_engine_create_ring(engine, timeline, 32 * PAGE_SIZE);
|
|
|
|
i915_timeline_put(timeline);
|
2017-04-03 19:34:25 +08:00
|
|
|
if (IS_ERR(ring)) {
|
2017-04-03 19:34:26 +08:00
|
|
|
err = PTR_ERR(ring);
|
2017-09-13 16:56:02 +08:00
|
|
|
goto err;
|
2017-04-03 19:34:25 +08:00
|
|
|
}
|
|
|
|
|
2018-07-27 23:55:01 +08:00
|
|
|
err = intel_ring_pin(ring);
|
2017-04-03 19:34:26 +08:00
|
|
|
if (err)
|
|
|
|
goto err_ring;
|
|
|
|
|
|
|
|
GEM_BUG_ON(engine->buffer);
|
2016-08-15 17:48:57 +08:00
|
|
|
engine->buffer = ring;
|
2010-05-22 04:26:39 +08:00
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
size = PAGE_SIZE;
|
|
|
|
if (HAS_BROKEN_CS_TLB(engine->i915))
|
|
|
|
size = I830_WA_SIZE;
|
|
|
|
err = intel_engine_create_scratch(engine, size);
|
2018-05-18 05:26:32 +08:00
|
|
|
if (err)
|
|
|
|
goto err_unpin;
|
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
err = intel_engine_init_common(engine);
|
|
|
|
if (err)
|
|
|
|
goto err_scratch;
|
|
|
|
|
2014-05-22 21:13:34 +08:00
|
|
|
return 0;
|
2014-02-19 02:15:46 +08:00
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
err_scratch:
|
|
|
|
intel_engine_cleanup_scratch(engine);
|
2018-05-18 05:26:32 +08:00
|
|
|
err_unpin:
|
|
|
|
intel_ring_unpin(ring);
|
2017-04-03 19:34:26 +08:00
|
|
|
err_ring:
|
|
|
|
intel_ring_free(ring);
|
|
|
|
err:
|
|
|
|
intel_engine_cleanup_common(engine);
|
|
|
|
return err;
|
2010-05-22 04:26:39 +08:00
|
|
|
}
|
|
|
|
|
2016-08-03 05:50:21 +08:00
|
|
|
void intel_engine_cleanup(struct intel_engine_cs *engine)
|
2010-05-22 04:26:39 +08:00
|
|
|
{
|
2017-04-03 19:34:26 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-10-31 20:00:26 +08:00
|
|
|
|
2017-04-03 19:34:26 +08:00
|
|
|
WARN_ON(INTEL_GEN(dev_priv) > 2 &&
|
|
|
|
(I915_READ_MODE(engine) & MODE_IDLE) == 0);
|
2010-10-29 23:18:36 +08:00
|
|
|
|
2017-04-03 19:34:26 +08:00
|
|
|
intel_ring_unpin(engine->buffer);
|
|
|
|
intel_ring_free(engine->buffer);
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2016-03-16 19:00:37 +08:00
|
|
|
if (engine->cleanup)
|
|
|
|
engine->cleanup(engine);
|
2010-11-02 16:31:01 +08:00
|
|
|
|
2016-08-03 20:19:16 +08:00
|
|
|
intel_engine_cleanup_common(engine);
|
2016-06-24 21:55:53 +08:00
|
|
|
|
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-14 01:14:48 +08:00
|
|
|
dev_priv->engine[engine->id] = NULL;
|
|
|
|
kfree(engine);
|
2010-05-22 04:26:39 +08:00
|
|
|
}
|
|
|
|
|
2016-09-09 21:11:53 +08:00
|
|
|
void intel_legacy_submission_resume(struct drm_i915_private *dev_priv)
|
|
|
|
{
|
|
|
|
struct intel_engine_cs *engine;
|
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-14 01:14:48 +08:00
|
|
|
enum intel_engine_id id;
|
2016-09-09 21:11:53 +08:00
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
/* Restart from the beginning of the rings for convenience */
|
2017-03-21 18:25:52 +08:00
|
|
|
for_each_engine(engine, dev_priv, id)
|
2017-04-25 21:00:49 +08:00
|
|
|
intel_ring_reset(engine->buffer, 0);
|
2016-09-09 21:11:53 +08:00
|
|
|
}
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
static int load_pd_dir(struct i915_request *rq,
|
|
|
|
const struct i915_hw_ppgtt *ppgtt)
|
|
|
|
{
|
|
|
|
const struct intel_engine_cs * const engine = rq->engine;
|
|
|
|
u32 *cs;
|
|
|
|
|
|
|
|
cs = intel_ring_begin(rq, 6);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
*cs++ = i915_mmio_reg_offset(RING_PP_DIR_DCLV(engine));
|
|
|
|
*cs++ = PP_DIR_DCLV_2G;
|
|
|
|
|
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(1);
|
|
|
|
*cs++ = i915_mmio_reg_offset(RING_PP_DIR_BASE(engine));
|
|
|
|
*cs++ = ppgtt->pd.base.ggtt_offset << 10;
|
|
|
|
|
|
|
|
intel_ring_advance(rq, cs);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
static int flush_pd_dir(struct i915_request *rq)
|
|
|
|
{
|
|
|
|
const struct intel_engine_cs * const engine = rq->engine;
|
|
|
|
u32 *cs;
|
|
|
|
|
|
|
|
cs = intel_ring_begin(rq, 4);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
/* Stall until the page table load is complete */
|
|
|
|
*cs++ = MI_STORE_REGISTER_MEM | MI_SRM_LRM_GLOBAL_GTT;
|
|
|
|
*cs++ = i915_mmio_reg_offset(RING_PP_DIR_BASE(engine));
|
|
|
|
*cs++ = i915_ggtt_offset(engine->scratch);
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
|
|
|
|
intel_ring_advance(rq, cs);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static inline int mi_set_context(struct i915_request *rq, u32 flags)
|
2017-11-23 23:26:31 +08:00
|
|
|
{
|
|
|
|
struct drm_i915_private *i915 = rq->i915;
|
|
|
|
struct intel_engine_cs *engine = rq->engine;
|
|
|
|
enum intel_engine_id id;
|
|
|
|
const int num_rings =
|
|
|
|
/* Use an extended w/a on gen7 if signalling from other rings */
|
|
|
|
(HAS_LEGACY_SEMAPHORES(i915) && IS_GEN7(i915)) ?
|
|
|
|
INTEL_INFO(i915)->num_rings - 1 :
|
|
|
|
0;
|
2018-06-11 18:48:08 +08:00
|
|
|
bool force_restore = false;
|
2017-11-23 23:26:31 +08:00
|
|
|
int len;
|
|
|
|
u32 *cs;
|
|
|
|
|
|
|
|
flags |= MI_MM_SPACE_GTT;
|
|
|
|
if (IS_HASWELL(i915))
|
|
|
|
/* These flags are for resource streamer on HSW+ */
|
|
|
|
flags |= HSW_MI_RS_SAVE_STATE_EN | HSW_MI_RS_RESTORE_STATE_EN;
|
|
|
|
else
|
|
|
|
flags |= MI_SAVE_EXT_STATE_EN | MI_RESTORE_EXT_STATE_EN;
|
|
|
|
|
|
|
|
len = 4;
|
|
|
|
if (IS_GEN7(i915))
|
|
|
|
len += 2 + (num_rings ? 4*num_rings + 6 : 0);
|
2018-06-11 18:48:08 +08:00
|
|
|
if (flags & MI_FORCE_RESTORE) {
|
|
|
|
GEM_BUG_ON(flags & MI_RESTORE_INHIBIT);
|
|
|
|
flags &= ~MI_FORCE_RESTORE;
|
|
|
|
force_restore = true;
|
|
|
|
len += 2;
|
|
|
|
}
|
2017-11-23 23:26:31 +08:00
|
|
|
|
|
|
|
cs = intel_ring_begin(rq, len);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
/* WaProgramMiArbOnOffAroundMiSetContext:ivb,vlv,hsw,bdw,chv */
|
|
|
|
if (IS_GEN7(i915)) {
|
|
|
|
*cs++ = MI_ARB_ON_OFF | MI_ARB_DISABLE;
|
|
|
|
if (num_rings) {
|
|
|
|
struct intel_engine_cs *signaller;
|
|
|
|
|
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(num_rings);
|
|
|
|
for_each_engine(signaller, i915, id) {
|
|
|
|
if (signaller == engine)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
*cs++ = i915_mmio_reg_offset(
|
|
|
|
RING_PSMI_CTL(signaller->mmio_base));
|
|
|
|
*cs++ = _MASKED_BIT_ENABLE(
|
|
|
|
GEN6_PSMI_SLEEP_MSG_DISABLE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-11 18:48:08 +08:00
|
|
|
if (force_restore) {
|
|
|
|
/*
|
|
|
|
* The HW doesn't handle being told to restore the current
|
|
|
|
* context very well. Quite often it likes goes to go off and
|
|
|
|
* sulk, especially when it is meant to be reloading PP_DIR.
|
|
|
|
* A very simple fix to force the reload is to simply switch
|
|
|
|
* away from the current context and back again.
|
|
|
|
*
|
|
|
|
* Note that the kernel_context will contain random state
|
|
|
|
* following the INHIBIT_RESTORE. We accept this since we
|
|
|
|
* never use the kernel_context state; it is merely a
|
|
|
|
* placeholder we use to flush other contexts.
|
|
|
|
*/
|
|
|
|
*cs++ = MI_SET_CONTEXT;
|
|
|
|
*cs++ = i915_ggtt_offset(to_intel_context(i915->kernel_context,
|
|
|
|
engine)->state) |
|
|
|
|
MI_MM_SPACE_GTT |
|
|
|
|
MI_RESTORE_INHIBIT;
|
|
|
|
}
|
|
|
|
|
2017-11-23 23:26:31 +08:00
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
*cs++ = MI_SET_CONTEXT;
|
2018-05-18 05:26:32 +08:00
|
|
|
*cs++ = i915_ggtt_offset(rq->hw_context->state) | flags;
|
2017-11-23 23:26:31 +08:00
|
|
|
/*
|
|
|
|
* w/a: MI_SET_CONTEXT must always be followed by MI_NOOP
|
|
|
|
* WaMiSetContext_Hang:snb,ivb,vlv
|
|
|
|
*/
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
|
|
|
|
if (IS_GEN7(i915)) {
|
|
|
|
if (num_rings) {
|
|
|
|
struct intel_engine_cs *signaller;
|
|
|
|
i915_reg_t last_reg = {}; /* keep gcc quiet */
|
|
|
|
|
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(num_rings);
|
|
|
|
for_each_engine(signaller, i915, id) {
|
|
|
|
if (signaller == engine)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
last_reg = RING_PSMI_CTL(signaller->mmio_base);
|
|
|
|
*cs++ = i915_mmio_reg_offset(last_reg);
|
|
|
|
*cs++ = _MASKED_BIT_DISABLE(
|
|
|
|
GEN6_PSMI_SLEEP_MSG_DISABLE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert a delay before the next switch! */
|
|
|
|
*cs++ = MI_STORE_REGISTER_MEM | MI_SRM_LRM_GLOBAL_GTT;
|
|
|
|
*cs++ = i915_mmio_reg_offset(last_reg);
|
|
|
|
*cs++ = i915_ggtt_offset(engine->scratch);
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
}
|
|
|
|
*cs++ = MI_ARB_ON_OFF | MI_ARB_ENABLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
intel_ring_advance(rq, cs);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static int remap_l3(struct i915_request *rq, int slice)
|
2017-11-23 23:26:31 +08:00
|
|
|
{
|
|
|
|
u32 *cs, *remap_info = rq->i915->l3_parity.remap_info[slice];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!remap_info)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
cs = intel_ring_begin(rq, GEN7_L3LOG_SIZE/4 * 2 + 2);
|
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: We do not worry about the concurrent register cacheline hang
|
|
|
|
* here because no other code should access these registers other than
|
|
|
|
* at initialization time.
|
|
|
|
*/
|
|
|
|
*cs++ = MI_LOAD_REGISTER_IMM(GEN7_L3LOG_SIZE/4);
|
|
|
|
for (i = 0; i < GEN7_L3LOG_SIZE/4; i++) {
|
|
|
|
*cs++ = i915_mmio_reg_offset(GEN7_L3LOG(slice, i));
|
|
|
|
*cs++ = remap_info[i];
|
|
|
|
}
|
|
|
|
*cs++ = MI_NOOP;
|
|
|
|
intel_ring_advance(rq, cs);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static int switch_context(struct i915_request *rq)
|
2017-11-23 23:26:31 +08:00
|
|
|
{
|
|
|
|
struct intel_engine_cs *engine = rq->engine;
|
2018-06-11 19:08:44 +08:00
|
|
|
struct i915_gem_context *ctx = rq->gem_context;
|
|
|
|
struct i915_hw_ppgtt *ppgtt = ctx->ppgtt ?: rq->i915->mm.aliasing_ppgtt;
|
|
|
|
unsigned int unwind_mm = 0;
|
2017-11-23 23:26:31 +08:00
|
|
|
u32 hw_flags = 0;
|
|
|
|
int ret, i;
|
|
|
|
|
|
|
|
lockdep_assert_held(&rq->i915->drm.struct_mutex);
|
|
|
|
GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
if (ppgtt) {
|
2018-09-10 21:08:08 +08:00
|
|
|
int loops;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Baytail takes a little more convincing that it really needs
|
|
|
|
* to reload the PD between contexts. It is not just a little
|
|
|
|
* longer, as adding more stalls after the load_pd_dir (i.e.
|
|
|
|
* adding a long loop around flush_pd_dir) is not as effective
|
|
|
|
* as reloading the PD umpteen times. 32 is derived from
|
|
|
|
* experimentation (gem_exec_parallel/fds) and has no good
|
|
|
|
* explanation.
|
|
|
|
*/
|
|
|
|
loops = 1;
|
|
|
|
if (engine->id == BCS && IS_VALLEYVIEW(engine->i915))
|
|
|
|
loops = 32;
|
|
|
|
|
|
|
|
do {
|
|
|
|
ret = load_pd_dir(rq, ppgtt);
|
|
|
|
if (ret)
|
|
|
|
goto err;
|
|
|
|
} while (--loops);
|
2017-11-23 23:26:31 +08:00
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
if (intel_engine_flag(engine) & ppgtt->pd_dirty_rings) {
|
|
|
|
unwind_mm = intel_engine_flag(engine);
|
|
|
|
ppgtt->pd_dirty_rings &= ~unwind_mm;
|
|
|
|
hw_flags = MI_FORCE_RESTORE;
|
|
|
|
}
|
2017-11-23 23:26:31 +08:00
|
|
|
}
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
if (rq->hw_context->state) {
|
2017-11-23 23:26:31 +08:00
|
|
|
GEM_BUG_ON(engine->id != RCS);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The kernel context(s) is treated as pure scratch and is not
|
|
|
|
* expected to retain any state (as we sacrifice it during
|
|
|
|
* suspend and on resume it may be corrupted). This is ok,
|
|
|
|
* as nothing actually executes using the kernel context; it
|
|
|
|
* is purely used for flushing user contexts.
|
|
|
|
*/
|
2018-06-11 19:08:44 +08:00
|
|
|
if (i915_gem_context_is_kernel(ctx))
|
2017-11-23 23:26:31 +08:00
|
|
|
hw_flags = MI_RESTORE_INHIBIT;
|
|
|
|
|
|
|
|
ret = mi_set_context(rq, hw_flags);
|
|
|
|
if (ret)
|
|
|
|
goto err_mm;
|
|
|
|
}
|
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
if (ppgtt) {
|
2018-09-04 14:38:02 +08:00
|
|
|
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
|
|
|
|
if (ret)
|
|
|
|
goto err_mm;
|
|
|
|
|
2018-06-12 01:18:25 +08:00
|
|
|
ret = flush_pd_dir(rq);
|
|
|
|
if (ret)
|
|
|
|
goto err_mm;
|
2018-09-04 14:38:02 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Not only do we need a full barrier (post-sync write) after
|
|
|
|
* invalidating the TLBs, but we need to wait a little bit
|
|
|
|
* longer. Whether this is merely delaying us, or the
|
|
|
|
* subsequent flush is a key part of serialising with the
|
|
|
|
* post-sync op, this extra pass appears vital before a
|
|
|
|
* mm switch!
|
|
|
|
*/
|
|
|
|
ret = engine->emit_flush(rq, EMIT_INVALIDATE);
|
|
|
|
if (ret)
|
|
|
|
goto err_mm;
|
|
|
|
|
|
|
|
ret = engine->emit_flush(rq, EMIT_FLUSH);
|
|
|
|
if (ret)
|
|
|
|
goto err_mm;
|
2017-11-23 23:26:31 +08:00
|
|
|
}
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
if (ctx->remap_slice) {
|
2017-11-23 23:26:31 +08:00
|
|
|
for (i = 0; i < MAX_L3_SLICES; i++) {
|
2018-06-11 19:08:44 +08:00
|
|
|
if (!(ctx->remap_slice & BIT(i)))
|
2017-11-23 23:26:31 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
ret = remap_l3(rq, i);
|
|
|
|
if (ret)
|
2018-06-11 19:08:44 +08:00
|
|
|
goto err_mm;
|
2017-11-23 23:26:31 +08:00
|
|
|
}
|
|
|
|
|
2018-06-11 19:08:44 +08:00
|
|
|
ctx->remap_slice = 0;
|
2017-11-23 23:26:31 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err_mm:
|
2018-06-11 19:08:44 +08:00
|
|
|
if (unwind_mm)
|
|
|
|
ppgtt->pd_dirty_rings |= unwind_mm;
|
2017-11-23 23:26:31 +08:00
|
|
|
err:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static int ring_request_alloc(struct i915_request *request)
|
2012-11-28 00:22:52 +08:00
|
|
|
{
|
2017-11-15 23:12:04 +08:00
|
|
|
int ret;
|
2016-04-28 16:56:49 +08:00
|
|
|
|
2018-05-18 05:26:32 +08:00
|
|
|
GEM_BUG_ON(!request->hw_context->pin_count);
|
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 23:37:20 +08:00
|
|
|
|
2016-04-28 16:56:49 +08:00
|
|
|
/* Flush enough space to reduce the likelihood of waiting after
|
|
|
|
* we start building the request - in which case we will just
|
|
|
|
* have to repeat work.
|
|
|
|
*/
|
2016-04-29 16:07:05 +08:00
|
|
|
request->reserved_space += LEGACY_REQUEST_SIZE;
|
2016-04-28 16:56:49 +08:00
|
|
|
|
2017-11-15 23:12:04 +08:00
|
|
|
ret = intel_ring_wait_for_space(request->ring, request->reserved_space);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2016-04-28 16:56:49 +08:00
|
|
|
|
2017-11-23 23:26:31 +08:00
|
|
|
ret = switch_context(request);
|
2017-11-20 18:20:02 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2016-04-29 16:07:05 +08:00
|
|
|
request->reserved_space -= LEGACY_REQUEST_SIZE;
|
2016-04-28 16:56:49 +08:00
|
|
|
return 0;
|
2012-11-28 00:22:52 +08:00
|
|
|
}
|
|
|
|
|
2017-11-15 23:12:04 +08:00
|
|
|
static noinline int wait_for_space(struct intel_ring *ring, unsigned int bytes)
|
2016-04-28 16:56:46 +08:00
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
struct i915_request *target;
|
2016-10-28 20:58:27 +08:00
|
|
|
long timeout;
|
|
|
|
|
2017-11-15 23:12:04 +08:00
|
|
|
lockdep_assert_held(&ring->vma->vm->i915->drm.struct_mutex);
|
2016-04-28 16:56:46 +08:00
|
|
|
|
2017-05-04 21:08:45 +08:00
|
|
|
if (intel_ring_update_space(ring) >= bytes)
|
2016-04-28 16:56:46 +08:00
|
|
|
return 0;
|
|
|
|
|
2018-03-07 21:42:23 +08:00
|
|
|
GEM_BUG_ON(list_empty(&ring->request_list));
|
2016-08-04 14:52:36 +08:00
|
|
|
list_for_each_entry(target, &ring->request_list, ring_link) {
|
2016-04-28 16:56:46 +08:00
|
|
|
/* Would completion of this request free enough space? */
|
2017-05-04 21:08:44 +08:00
|
|
|
if (bytes <= __intel_ring_space(target->postfix,
|
|
|
|
ring->emit, ring->size))
|
2016-04-28 16:56:46 +08:00
|
|
|
break;
|
2015-06-30 19:40:55 +08:00
|
|
|
}
|
drm/i915: Reserve ring buffer space for i915_add_request() commands
It is a bad idea for i915_add_request() to fail. The work will already have been
send to the ring and will be processed, but there will not be any tracking or
management of that work.
The only way the add request call can fail is if it can't write its epilogue
commands to the ring (cache flushing, seqno updates, interrupt signalling). The
reasons for that are mostly down to running out of ring buffer space and the
problems associated with trying to get some more. This patch prevents that
situation from happening in the first place.
When a request is created, it marks sufficient space as reserved for the
epilogue commands. Thus guaranteeing that by the time the epilogue is written,
there will be plenty of space for it. Note that a ring_begin() call is required
to actually reserve the space (and do any potential waiting). However, that is
not currently done at request creation time. This is because the ring_begin()
code can allocate a request. Hence calling begin() from the request allocation
code would lead to infinite recursion! Later patches in this series remove the
need for begin() to do the allocate. At that point, it becomes safe for the
allocate to call begin() and really reserve the space.
Until then, there is a potential for insufficient space to be available at the
point of calling i915_add_request(). However, that would only be in the case
where the request was created and immediately submitted without ever calling
ring_begin() and adding any work to that request. Which should never happen. And
even if it does, and if that request happens to fall down the tiny window of
opportunity for failing due to being out of ring space then does it really
matter because the request wasn't doing anything in the first place?
v2: Updated the 'reserved space too small' warning to include the offending
sizes. Added a 'cancel' operation to clean up when a request is abandoned. Added
re-initialisation of tracking state after a buffer wrap to keep the sanity
checks accurate.
v3: Incremented the reserved size to accommodate Ironlake (after finally
managing to run on an ILK system). Also fixed missing wrap code in LRC mode.
v4: Added extra comment and removed duplicate WARN (feedback from Tomas).
For: VIZ-5115
CC: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-06-18 20:10:09 +08:00
|
|
|
|
2016-08-04 14:52:36 +08:00
|
|
|
if (WARN_ON(&target->ring_link == &ring->request_list))
|
2016-04-28 16:56:46 +08:00
|
|
|
return -ENOSPC;
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
timeout = i915_request_wait(target,
|
2016-10-28 20:58:27 +08:00
|
|
|
I915_WAIT_INTERRUPTIBLE | I915_WAIT_LOCKED,
|
|
|
|
MAX_SCHEDULE_TIMEOUT);
|
|
|
|
if (timeout < 0)
|
|
|
|
return timeout;
|
2016-08-04 14:52:38 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
i915_request_retire_upto(target);
|
2016-08-04 14:52:38 +08:00
|
|
|
|
|
|
|
intel_ring_update_space(ring);
|
|
|
|
GEM_BUG_ON(ring->space < bytes);
|
|
|
|
return 0;
|
drm/i915: Reserve ring buffer space for i915_add_request() commands
It is a bad idea for i915_add_request() to fail. The work will already have been
send to the ring and will be processed, but there will not be any tracking or
management of that work.
The only way the add request call can fail is if it can't write its epilogue
commands to the ring (cache flushing, seqno updates, interrupt signalling). The
reasons for that are mostly down to running out of ring buffer space and the
problems associated with trying to get some more. This patch prevents that
situation from happening in the first place.
When a request is created, it marks sufficient space as reserved for the
epilogue commands. Thus guaranteeing that by the time the epilogue is written,
there will be plenty of space for it. Note that a ring_begin() call is required
to actually reserve the space (and do any potential waiting). However, that is
not currently done at request creation time. This is because the ring_begin()
code can allocate a request. Hence calling begin() from the request allocation
code would lead to infinite recursion! Later patches in this series remove the
need for begin() to do the allocate. At that point, it becomes safe for the
allocate to call begin() and really reserve the space.
Until then, there is a potential for insufficient space to be available at the
point of calling i915_add_request(). However, that would only be in the case
where the request was created and immediately submitted without ever calling
ring_begin() and adding any work to that request. Which should never happen. And
even if it does, and if that request happens to fall down the tiny window of
opportunity for failing due to being out of ring space then does it really
matter because the request wasn't doing anything in the first place?
v2: Updated the 'reserved space too small' warning to include the offending
sizes. Added a 'cancel' operation to clean up when a request is abandoned. Added
re-initialisation of tracking state after a buffer wrap to keep the sanity
checks accurate.
v3: Incremented the reserved size to accommodate Ironlake (after finally
managing to run on an ILK system). Also fixed missing wrap code in LRC mode.
v4: Added extra comment and removed duplicate WARN (feedback from Tomas).
For: VIZ-5115
CC: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-06-18 20:10:09 +08:00
|
|
|
}
|
|
|
|
|
2017-11-15 23:12:04 +08:00
|
|
|
int intel_ring_wait_for_space(struct intel_ring *ring, unsigned int bytes)
|
|
|
|
{
|
|
|
|
GEM_BUG_ON(bytes > ring->effective_size);
|
|
|
|
if (unlikely(bytes > ring->effective_size - ring->emit))
|
|
|
|
bytes += ring->size - ring->emit;
|
|
|
|
|
|
|
|
if (unlikely(bytes > ring->space)) {
|
|
|
|
int ret = wait_for_space(ring, bytes);
|
|
|
|
if (unlikely(ret))
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
GEM_BUG_ON(ring->space < bytes);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
u32 *intel_ring_begin(struct i915_request *rq, unsigned int num_dwords)
|
2012-12-04 21:12:03 +08:00
|
|
|
{
|
2018-02-21 17:56:36 +08:00
|
|
|
struct intel_ring *ring = rq->ring;
|
2017-05-04 21:08:46 +08:00
|
|
|
const unsigned int remain_usable = ring->effective_size - ring->emit;
|
|
|
|
const unsigned int bytes = num_dwords * sizeof(u32);
|
|
|
|
unsigned int need_wrap = 0;
|
|
|
|
unsigned int total_bytes;
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
drm/i915: Reserve ring buffer space for i915_add_request() commands
It is a bad idea for i915_add_request() to fail. The work will already have been
send to the ring and will be processed, but there will not be any tracking or
management of that work.
The only way the add request call can fail is if it can't write its epilogue
commands to the ring (cache flushing, seqno updates, interrupt signalling). The
reasons for that are mostly down to running out of ring buffer space and the
problems associated with trying to get some more. This patch prevents that
situation from happening in the first place.
When a request is created, it marks sufficient space as reserved for the
epilogue commands. Thus guaranteeing that by the time the epilogue is written,
there will be plenty of space for it. Note that a ring_begin() call is required
to actually reserve the space (and do any potential waiting). However, that is
not currently done at request creation time. This is because the ring_begin()
code can allocate a request. Hence calling begin() from the request allocation
code would lead to infinite recursion! Later patches in this series remove the
need for begin() to do the allocate. At that point, it becomes safe for the
allocate to call begin() and really reserve the space.
Until then, there is a potential for insufficient space to be available at the
point of calling i915_add_request(). However, that would only be in the case
where the request was created and immediately submitted without ever calling
ring_begin() and adding any work to that request. Which should never happen. And
even if it does, and if that request happens to fall down the tiny window of
opportunity for failing due to being out of ring space then does it really
matter because the request wasn't doing anything in the first place?
v2: Updated the 'reserved space too small' warning to include the offending
sizes. Added a 'cancel' operation to clean up when a request is abandoned. Added
re-initialisation of tracking state after a buffer wrap to keep the sanity
checks accurate.
v3: Incremented the reserved size to accommodate Ironlake (after finally
managing to run on an ILK system). Also fixed missing wrap code in LRC mode.
v4: Added extra comment and removed duplicate WARN (feedback from Tomas).
For: VIZ-5115
CC: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-06-18 20:10:09 +08:00
|
|
|
|
2017-07-22 00:11:01 +08:00
|
|
|
/* Packets must be qword aligned. */
|
|
|
|
GEM_BUG_ON(num_dwords & 1);
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
total_bytes = bytes + rq->reserved_space;
|
2017-05-04 21:08:46 +08:00
|
|
|
GEM_BUG_ON(total_bytes > ring->effective_size);
|
drm/i915: Reserve ring buffer space for i915_add_request() commands
It is a bad idea for i915_add_request() to fail. The work will already have been
send to the ring and will be processed, but there will not be any tracking or
management of that work.
The only way the add request call can fail is if it can't write its epilogue
commands to the ring (cache flushing, seqno updates, interrupt signalling). The
reasons for that are mostly down to running out of ring buffer space and the
problems associated with trying to get some more. This patch prevents that
situation from happening in the first place.
When a request is created, it marks sufficient space as reserved for the
epilogue commands. Thus guaranteeing that by the time the epilogue is written,
there will be plenty of space for it. Note that a ring_begin() call is required
to actually reserve the space (and do any potential waiting). However, that is
not currently done at request creation time. This is because the ring_begin()
code can allocate a request. Hence calling begin() from the request allocation
code would lead to infinite recursion! Later patches in this series remove the
need for begin() to do the allocate. At that point, it becomes safe for the
allocate to call begin() and really reserve the space.
Until then, there is a potential for insufficient space to be available at the
point of calling i915_add_request(). However, that would only be in the case
where the request was created and immediately submitted without ever calling
ring_begin() and adding any work to that request. Which should never happen. And
even if it does, and if that request happens to fall down the tiny window of
opportunity for failing due to being out of ring space then does it really
matter because the request wasn't doing anything in the first place?
v2: Updated the 'reserved space too small' warning to include the offending
sizes. Added a 'cancel' operation to clean up when a request is abandoned. Added
re-initialisation of tracking state after a buffer wrap to keep the sanity
checks accurate.
v3: Incremented the reserved size to accommodate Ironlake (after finally
managing to run on an ILK system). Also fixed missing wrap code in LRC mode.
v4: Added extra comment and removed duplicate WARN (feedback from Tomas).
For: VIZ-5115
CC: Tomas Elf <tomas.elf@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-06-18 20:10:09 +08:00
|
|
|
|
2017-05-04 21:08:46 +08:00
|
|
|
if (unlikely(total_bytes > remain_usable)) {
|
|
|
|
const int remain_actual = ring->size - ring->emit;
|
|
|
|
|
|
|
|
if (bytes > remain_usable) {
|
|
|
|
/*
|
|
|
|
* Not enough space for the basic request. So need to
|
|
|
|
* flush out the remainder and then wait for
|
|
|
|
* base + reserved.
|
|
|
|
*/
|
|
|
|
total_bytes += remain_actual;
|
|
|
|
need_wrap = remain_actual | 1;
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* The base request will fit but the reserved space
|
|
|
|
* falls off the end. So we don't need an immediate
|
|
|
|
* wrap and only need to effectively wait for the
|
|
|
|
* reserved size from the start of ringbuffer.
|
|
|
|
*/
|
2018-02-21 17:56:36 +08:00
|
|
|
total_bytes = rq->reserved_space + remain_actual;
|
2017-05-04 21:08:46 +08:00
|
|
|
}
|
2012-12-04 21:12:03 +08:00
|
|
|
}
|
|
|
|
|
2017-05-04 21:08:46 +08:00
|
|
|
if (unlikely(total_bytes > ring->space)) {
|
2017-11-15 23:12:04 +08:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Space is reserved in the ringbuffer for finalising the
|
|
|
|
* request, as that cannot be allowed to fail. During request
|
|
|
|
* finalisation, reserved_space is set to 0 to stop the
|
|
|
|
* overallocation and the assumption is that then we never need
|
|
|
|
* to wait (which has the risk of failing with EINTR).
|
|
|
|
*
|
2018-02-21 17:56:36 +08:00
|
|
|
* See also i915_request_alloc() and i915_request_add().
|
2017-11-15 23:12:04 +08:00
|
|
|
*/
|
2018-02-21 17:56:36 +08:00
|
|
|
GEM_BUG_ON(!rq->reserved_space);
|
2017-11-15 23:12:04 +08:00
|
|
|
|
|
|
|
ret = wait_for_space(ring, total_bytes);
|
2012-12-04 21:12:03 +08:00
|
|
|
if (unlikely(ret))
|
2017-02-14 19:32:42 +08:00
|
|
|
return ERR_PTR(ret);
|
2012-12-04 21:12:03 +08:00
|
|
|
}
|
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
if (unlikely(need_wrap)) {
|
2017-05-04 21:08:46 +08:00
|
|
|
need_wrap &= ~1;
|
|
|
|
GEM_BUG_ON(need_wrap > ring->space);
|
|
|
|
GEM_BUG_ON(ring->emit + need_wrap > ring->size);
|
2018-03-19 20:35:28 +08:00
|
|
|
GEM_BUG_ON(!IS_ALIGNED(need_wrap, sizeof(u64)));
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2016-04-28 16:56:46 +08:00
|
|
|
/* Fill the tail with MI_NOOP */
|
2018-03-19 20:35:28 +08:00
|
|
|
memset64(ring->vaddr + ring->emit, 0, need_wrap / sizeof(u64));
|
2017-05-04 21:08:46 +08:00
|
|
|
ring->space -= need_wrap;
|
2018-03-19 20:35:28 +08:00
|
|
|
ring->emit = 0;
|
2016-04-28 16:56:46 +08:00
|
|
|
}
|
2014-01-02 22:32:35 +08:00
|
|
|
|
2017-04-25 21:00:49 +08:00
|
|
|
GEM_BUG_ON(ring->emit > ring->size - bytes);
|
2017-05-04 21:08:44 +08:00
|
|
|
GEM_BUG_ON(ring->space < bytes);
|
2017-04-25 21:00:49 +08:00
|
|
|
cs = ring->vaddr + ring->emit;
|
2018-03-19 20:35:28 +08:00
|
|
|
GEM_DEBUG_EXEC(memset32(cs, POISON_INUSE, bytes / sizeof(*cs)));
|
2017-04-25 21:00:49 +08:00
|
|
|
ring->emit += bytes;
|
2016-08-03 05:50:19 +08:00
|
|
|
ring->space -= bytes;
|
2017-02-14 19:32:42 +08:00
|
|
|
|
|
|
|
return cs;
|
2010-05-21 09:08:55 +08:00
|
|
|
}
|
2010-10-27 19:18:21 +08:00
|
|
|
|
2014-02-12 01:52:05 +08:00
|
|
|
/* Align the ring tail to a cacheline boundary */
|
2018-02-21 17:56:36 +08:00
|
|
|
int intel_ring_cacheline_align(struct i915_request *rq)
|
2014-02-12 01:52:05 +08:00
|
|
|
{
|
2018-04-25 20:37:18 +08:00
|
|
|
int num_dwords;
|
|
|
|
void *cs;
|
2014-02-12 01:52:05 +08:00
|
|
|
|
2018-04-25 20:37:18 +08:00
|
|
|
num_dwords = (rq->ring->emit & (CACHELINE_BYTES - 1)) / sizeof(u32);
|
2014-02-12 01:52:05 +08:00
|
|
|
if (num_dwords == 0)
|
|
|
|
return 0;
|
|
|
|
|
2018-04-25 20:37:18 +08:00
|
|
|
num_dwords = CACHELINE_DWORDS - num_dwords;
|
|
|
|
GEM_BUG_ON(num_dwords & 1);
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, num_dwords);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2014-02-12 01:52:05 +08:00
|
|
|
|
2018-04-25 20:37:18 +08:00
|
|
|
memset64(cs, (u64)MI_NOOP << 32 | MI_NOOP, num_dwords / 2);
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2014-02-12 01:52:05 +08:00
|
|
|
|
2018-04-25 20:37:18 +08:00
|
|
|
GEM_BUG_ON(rq->ring->emit & (CACHELINE_BYTES - 1));
|
2014-02-12 01:52:05 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static void gen6_bsd_submit_request(struct i915_request *request)
|
2010-09-19 21:40:43 +08:00
|
|
|
{
|
2016-08-03 05:50:29 +08:00
|
|
|
struct drm_i915_private *dev_priv = request->i915;
|
2010-09-19 21:40:43 +08:00
|
|
|
|
2016-06-30 22:33:45 +08:00
|
|
|
intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
|
|
|
|
|
2010-09-19 21:40:43 +08:00
|
|
|
/* Every tail move must follow the sequence below */
|
2012-07-06 00:14:01 +08:00
|
|
|
|
|
|
|
/* Disable notification that the ring is IDLE. The GT
|
|
|
|
* will then assume that it is busy and bring it out of rc6.
|
|
|
|
*/
|
2016-06-30 22:33:45 +08:00
|
|
|
I915_WRITE_FW(GEN6_BSD_SLEEP_PSMI_CONTROL,
|
|
|
|
_MASKED_BIT_ENABLE(GEN6_BSD_SLEEP_MSG_DISABLE));
|
2012-07-06 00:14:01 +08:00
|
|
|
|
|
|
|
/* Clear the context id. Here be magic! */
|
2016-06-30 22:33:45 +08:00
|
|
|
I915_WRITE64_FW(GEN6_BSD_RNCID, 0x0);
|
2011-08-17 03:34:10 +08:00
|
|
|
|
2012-07-06 00:14:01 +08:00
|
|
|
/* Wait for the ring not to be idle, i.e. for it to wake up. */
|
2017-04-11 18:13:37 +08:00
|
|
|
if (__intel_wait_for_register_fw(dev_priv,
|
|
|
|
GEN6_BSD_SLEEP_PSMI_CONTROL,
|
|
|
|
GEN6_BSD_SLEEP_INDICATOR,
|
|
|
|
0,
|
|
|
|
1000, 0, NULL))
|
2012-07-06 00:14:01 +08:00
|
|
|
DRM_ERROR("timed out waiting for the BSD ring to wake up\n");
|
2011-08-17 03:34:10 +08:00
|
|
|
|
2012-07-06 00:14:01 +08:00
|
|
|
/* Now that the ring is fully powered up, update the tail */
|
2016-08-03 05:50:34 +08:00
|
|
|
i9xx_submit_request(request);
|
2012-07-06 00:14:01 +08:00
|
|
|
|
|
|
|
/* Let the ring send IDLE messages to the GT again,
|
|
|
|
* and so let it sleep to conserve power when idle.
|
|
|
|
*/
|
2016-06-30 22:33:45 +08:00
|
|
|
I915_WRITE_FW(GEN6_BSD_SLEEP_PSMI_CONTROL,
|
|
|
|
_MASKED_BIT_DISABLE(GEN6_BSD_SLEEP_MSG_DISABLE));
|
|
|
|
|
|
|
|
intel_uncore_forcewake_put(dev_priv, FORCEWAKE_ALL);
|
2010-09-19 21:40:43 +08:00
|
|
|
}
|
|
|
|
|
2018-09-04 14:38:02 +08:00
|
|
|
static int mi_flush_dw(struct i915_request *rq, u32 flags)
|
2010-09-19 21:40:43 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 cmd, *cs;
|
2011-01-05 01:34:02 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 4);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2011-01-05 01:34:02 +08:00
|
|
|
|
2011-02-02 20:13:49 +08:00
|
|
|
cmd = MI_FLUSH_DW;
|
2015-01-22 21:42:00 +08:00
|
|
|
|
2018-08-31 00:10:42 +08:00
|
|
|
/*
|
|
|
|
* We always require a command barrier so that subsequent
|
2015-01-22 21:42:00 +08:00
|
|
|
* 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;
|
|
|
|
|
2012-10-27 00:42:42 +08:00
|
|
|
/*
|
2018-08-31 00:10:42 +08:00
|
|
|
* Bspec vol 1c.3 - blitter engine command streamer:
|
2012-10-27 00:42:42 +08:00
|
|
|
* "If ENABLED, all TLBs will be invalidated once the flush
|
|
|
|
* operation is complete. This bit is only valid when the
|
|
|
|
* Post-Sync Operation field is a value of 1h or 3h."
|
|
|
|
*/
|
2018-08-31 00:10:42 +08:00
|
|
|
cmd |= flags;
|
2015-01-22 21:42:00 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = cmd;
|
|
|
|
*cs++ = I915_GEM_HWS_SCRATCH_ADDR | MI_FLUSH_DW_USE_GTT;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
*cs++ = 0;
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_NOOP;
|
2018-08-31 00:10:42 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2018-08-31 00:10:42 +08:00
|
|
|
|
2013-11-03 12:07:12 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-08-31 00:10:42 +08:00
|
|
|
static int gen6_flush_dw(struct i915_request *rq, u32 mode, u32 invflags)
|
|
|
|
{
|
2018-09-04 14:38:02 +08:00
|
|
|
return mi_flush_dw(rq, mode & EMIT_INVALIDATE ? invflags : 0);
|
2018-08-31 00:10:42 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int gen6_bsd_ring_flush(struct i915_request *rq, u32 mode)
|
|
|
|
{
|
|
|
|
return gen6_flush_dw(rq, mode, MI_INVALIDATE_TLB | MI_INVALIDATE_BSD);
|
|
|
|
}
|
|
|
|
|
2012-10-17 19:09:54 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
hsw_emit_bb_start(struct i915_request *rq,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 len,
|
|
|
|
unsigned int dispatch_flags)
|
2012-10-17 19:09:54 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2012-10-17 19:09:54 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2012-10-17 19:09:54 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START | (dispatch_flags & I915_DISPATCH_SECURE ?
|
2018-08-04 07:24:43 +08:00
|
|
|
0 : MI_BATCH_PPGTT_HSW | MI_BATCH_NON_SECURE_HSW);
|
2012-10-17 19:09:54 +08:00
|
|
|
/* bit0-7 is the length on GEN6+ */
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = offset;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2012-10-17 19:09:54 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-09-19 21:40:43 +08:00
|
|
|
static int
|
2018-02-21 17:56:36 +08:00
|
|
|
gen6_emit_bb_start(struct i915_request *rq,
|
2016-08-03 05:50:27 +08:00
|
|
|
u64 offset, u32 len,
|
|
|
|
unsigned int dispatch_flags)
|
2010-09-19 21:40:43 +08:00
|
|
|
{
|
2017-02-14 19:32:42 +08:00
|
|
|
u32 *cs;
|
2010-09-20 00:53:44 +08:00
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
cs = intel_ring_begin(rq, 2);
|
2017-02-14 19:32:42 +08:00
|
|
|
if (IS_ERR(cs))
|
|
|
|
return PTR_ERR(cs);
|
2010-10-27 19:45:26 +08:00
|
|
|
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = MI_BATCH_BUFFER_START | (dispatch_flags & I915_DISPATCH_SECURE ?
|
|
|
|
0 : MI_BATCH_NON_SECURE_I965);
|
2011-08-17 03:34:10 +08:00
|
|
|
/* bit0-7 is the length on GEN6+ */
|
2017-02-14 19:32:42 +08:00
|
|
|
*cs++ = offset;
|
2018-02-21 17:56:36 +08:00
|
|
|
intel_ring_advance(rq, cs);
|
2010-09-20 00:53:44 +08:00
|
|
|
|
2011-08-17 03:34:10 +08:00
|
|
|
return 0;
|
2010-09-19 21:40:43 +08:00
|
|
|
}
|
|
|
|
|
2010-10-19 18:19:32 +08:00
|
|
|
/* Blitter support (SandyBridge+) */
|
|
|
|
|
2018-02-21 17:56:36 +08:00
|
|
|
static int gen6_ring_flush(struct i915_request *rq, u32 mode)
|
2010-11-02 16:31:01 +08:00
|
|
|
{
|
2018-08-31 00:10:42 +08:00
|
|
|
return gen6_flush_dw(rq, mode, MI_INVALIDATE_TLB);
|
2010-11-02 16:31:01 +08:00
|
|
|
}
|
|
|
|
|
2016-06-29 23:09:27 +08:00
|
|
|
static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,
|
|
|
|
struct intel_engine_cs *engine)
|
|
|
|
{
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
int i;
|
2016-06-29 23:09:28 +08:00
|
|
|
|
2017-11-21 04:55:04 +08:00
|
|
|
if (!HAS_LEGACY_SEMAPHORES(dev_priv))
|
2016-06-29 23:09:28 +08:00
|
|
|
return;
|
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
GEM_BUG_ON(INTEL_GEN(dev_priv) < 6);
|
|
|
|
engine->semaphore.sync_to = gen6_ring_sync_to;
|
|
|
|
engine->semaphore.signal = gen6_signal;
|
2016-08-15 17:49:02 +08:00
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
/*
|
|
|
|
* The current semaphore is only applied on pre-gen8
|
|
|
|
* platform. And there is no VCS2 ring on the pre-gen8
|
|
|
|
* platform. So the semaphore between RCS and VCS2 is
|
|
|
|
* initialized as INVALID.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < GEN6_NUM_SEMAPHORES; i++) {
|
|
|
|
static const struct {
|
2016-06-29 23:09:31 +08:00
|
|
|
u32 wait_mbox;
|
|
|
|
i915_reg_t mbox_reg;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
} sem_data[GEN6_NUM_SEMAPHORES][GEN6_NUM_SEMAPHORES] = {
|
|
|
|
[RCS_HW] = {
|
|
|
|
[VCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_RV, .mbox_reg = GEN6_VRSYNC },
|
|
|
|
[BCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_RB, .mbox_reg = GEN6_BRSYNC },
|
|
|
|
[VECS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_RVE, .mbox_reg = GEN6_VERSYNC },
|
|
|
|
},
|
|
|
|
[VCS_HW] = {
|
|
|
|
[RCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VR, .mbox_reg = GEN6_RVSYNC },
|
|
|
|
[BCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VB, .mbox_reg = GEN6_BVSYNC },
|
|
|
|
[VECS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VVE, .mbox_reg = GEN6_VEVSYNC },
|
|
|
|
},
|
|
|
|
[BCS_HW] = {
|
|
|
|
[RCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_BR, .mbox_reg = GEN6_RBSYNC },
|
|
|
|
[VCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_BV, .mbox_reg = GEN6_VBSYNC },
|
|
|
|
[VECS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_BVE, .mbox_reg = GEN6_VEBSYNC },
|
|
|
|
},
|
|
|
|
[VECS_HW] = {
|
|
|
|
[RCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VER, .mbox_reg = GEN6_RVESYNC },
|
|
|
|
[VCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VEV, .mbox_reg = GEN6_VVESYNC },
|
|
|
|
[BCS_HW] = { .wait_mbox = MI_SEMAPHORE_SYNC_VEB, .mbox_reg = GEN6_BVESYNC },
|
|
|
|
},
|
|
|
|
};
|
|
|
|
u32 wait_mbox;
|
|
|
|
i915_reg_t mbox_reg;
|
2016-06-29 23:09:31 +08:00
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
if (i == engine->hw_id) {
|
|
|
|
wait_mbox = MI_SEMAPHORE_SYNC_INVALID;
|
|
|
|
mbox_reg = GEN6_NOSYNC;
|
|
|
|
} else {
|
|
|
|
wait_mbox = sem_data[engine->hw_id][i].wait_mbox;
|
|
|
|
mbox_reg = sem_data[engine->hw_id][i].mbox_reg;
|
2016-06-29 23:09:31 +08:00
|
|
|
}
|
2016-08-15 17:49:02 +08:00
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
engine->semaphore.mbox.wait[i] = wait_mbox;
|
|
|
|
engine->semaphore.mbox.signal[i] = mbox_reg;
|
|
|
|
}
|
2016-06-29 23:09:27 +08:00
|
|
|
}
|
|
|
|
|
2016-07-01 16:18:13 +08:00
|
|
|
static void intel_ring_init_irq(struct drm_i915_private *dev_priv,
|
|
|
|
struct intel_engine_cs *engine)
|
|
|
|
{
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6) {
|
2016-07-02 00:23:27 +08:00
|
|
|
engine->irq_enable = gen6_irq_enable;
|
|
|
|
engine->irq_disable = gen6_irq_disable;
|
2016-07-01 16:18:13 +08:00
|
|
|
engine->irq_seqno_barrier = gen6_seqno_barrier;
|
|
|
|
} else if (INTEL_GEN(dev_priv) >= 5) {
|
2016-07-02 00:23:27 +08:00
|
|
|
engine->irq_enable = gen5_irq_enable;
|
|
|
|
engine->irq_disable = gen5_irq_disable;
|
2016-07-02 00:23:21 +08:00
|
|
|
engine->irq_seqno_barrier = gen5_seqno_barrier;
|
2016-07-01 16:18:13 +08:00
|
|
|
} else if (INTEL_GEN(dev_priv) >= 3) {
|
2016-07-02 00:23:27 +08:00
|
|
|
engine->irq_enable = i9xx_irq_enable;
|
|
|
|
engine->irq_disable = i9xx_irq_disable;
|
2016-07-01 16:18:13 +08:00
|
|
|
} else {
|
2016-07-02 00:23:27 +08:00
|
|
|
engine->irq_enable = i8xx_irq_enable;
|
|
|
|
engine->irq_disable = i8xx_irq_disable;
|
2016-07-01 16:18:13 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-17 01:13:03 +08:00
|
|
|
static void i9xx_set_default_submission(struct intel_engine_cs *engine)
|
|
|
|
{
|
|
|
|
engine->submit_request = i9xx_submit_request;
|
2017-09-16 01:31:00 +08:00
|
|
|
engine->cancel_requests = cancel_requests;
|
2017-10-25 22:39:41 +08:00
|
|
|
|
|
|
|
engine->park = NULL;
|
|
|
|
engine->unpark = NULL;
|
2017-03-17 01:13:03 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void gen6_bsd_set_default_submission(struct intel_engine_cs *engine)
|
|
|
|
{
|
2017-10-25 22:39:41 +08:00
|
|
|
i9xx_set_default_submission(engine);
|
2017-03-17 01:13:03 +08:00
|
|
|
engine->submit_request = gen6_bsd_submit_request;
|
|
|
|
}
|
|
|
|
|
2016-06-29 23:09:20 +08:00
|
|
|
static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv,
|
|
|
|
struct intel_engine_cs *engine)
|
|
|
|
{
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
/* gen8+ are only supported with execlists */
|
|
|
|
GEM_BUG_ON(INTEL_GEN(dev_priv) >= 8);
|
|
|
|
|
2016-08-03 05:50:35 +08:00
|
|
|
intel_ring_init_irq(dev_priv, engine);
|
|
|
|
intel_ring_init_semaphores(dev_priv, engine);
|
|
|
|
|
2016-06-29 23:09:25 +08:00
|
|
|
engine->init_hw = init_ring_common;
|
2018-05-17 02:33:51 +08:00
|
|
|
engine->reset.prepare = reset_prepare;
|
|
|
|
engine->reset.reset = reset_ring;
|
|
|
|
engine->reset.finish = reset_finish;
|
2016-06-29 23:09:21 +08: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 23:37:20 +08:00
|
|
|
engine->context_pin = intel_ring_context_pin;
|
2016-12-18 23:37:24 +08:00
|
|
|
engine->request_alloc = ring_request_alloc;
|
|
|
|
|
2016-10-28 20:58:50 +08:00
|
|
|
engine->emit_breadcrumb = i9xx_emit_breadcrumb;
|
2016-10-28 20:58:51 +08:00
|
|
|
engine->emit_breadcrumb_sz = i9xx_emit_breadcrumb_sz;
|
2017-11-21 04:55:04 +08:00
|
|
|
if (HAS_LEGACY_SEMAPHORES(dev_priv)) {
|
2016-10-28 20:58:51 +08:00
|
|
|
int num_rings;
|
|
|
|
|
2016-10-28 20:58:50 +08:00
|
|
|
engine->emit_breadcrumb = gen6_sema_emit_breadcrumb;
|
2016-10-28 20:58:51 +08:00
|
|
|
|
2017-06-19 18:59:17 +08:00
|
|
|
num_rings = INTEL_INFO(dev_priv)->num_rings - 1;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
engine->emit_breadcrumb_sz += num_rings * 3;
|
|
|
|
if (num_rings & 1)
|
|
|
|
engine->emit_breadcrumb_sz++;
|
2016-10-28 20:58:51 +08:00
|
|
|
}
|
2017-03-17 01:13:03 +08:00
|
|
|
|
|
|
|
engine->set_default_submission = i9xx_set_default_submission;
|
2016-07-01 16:18:12 +08:00
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6)
|
2016-08-03 05:50:27 +08:00
|
|
|
engine->emit_bb_start = gen6_emit_bb_start;
|
2016-07-01 16:18:12 +08:00
|
|
|
else if (INTEL_GEN(dev_priv) >= 4)
|
2016-08-03 05:50:27 +08:00
|
|
|
engine->emit_bb_start = i965_emit_bb_start;
|
2016-11-30 23:43:04 +08:00
|
|
|
else if (IS_I830(dev_priv) || IS_I845G(dev_priv))
|
2016-08-03 05:50:27 +08:00
|
|
|
engine->emit_bb_start = i830_emit_bb_start;
|
2016-07-01 16:18:12 +08:00
|
|
|
else
|
2016-08-03 05:50:27 +08:00
|
|
|
engine->emit_bb_start = i915_emit_bb_start;
|
2016-06-29 23:09:20 +08:00
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:37 +08:00
|
|
|
int intel_init_render_ring_buffer(struct intel_engine_cs *engine)
|
2010-09-16 10:43:11 +08:00
|
|
|
{
|
2016-07-13 23:03:37 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2014-07-01 00:53:37 +08:00
|
|
|
int ret;
|
2010-09-16 10:43:11 +08:00
|
|
|
|
2016-06-29 23:09:20 +08:00
|
|
|
intel_ring_default_vfuncs(dev_priv, engine);
|
|
|
|
|
2016-07-02 00:23:28 +08:00
|
|
|
if (HAS_L3_DPF(dev_priv))
|
|
|
|
engine->irq_keep_mask = GT_RENDER_L3_PARITY_ERROR_INTERRUPT;
|
2016-07-02 00:23:21 +08:00
|
|
|
|
2018-03-15 02:26:53 +08:00
|
|
|
engine->irq_enable_mask = GT_RENDER_USER_INTERRUPT;
|
|
|
|
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6) {
|
2016-03-16 19:00:36 +08:00
|
|
|
engine->init_context = intel_rcs_ctx_init;
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen7_render_ring_flush;
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN6(dev_priv))
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen6_render_ring_flush;
|
2016-05-06 22:40:21 +08:00
|
|
|
} else if (IS_GEN5(dev_priv)) {
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen4_render_ring_flush;
|
2012-04-12 04:12:48 +08:00
|
|
|
} else {
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(dev_priv) < 4)
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen2_render_ring_flush;
|
2012-04-18 18:12:11 +08:00
|
|
|
else
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen4_render_ring_flush;
|
2016-03-16 19:00:36 +08:00
|
|
|
engine->irq_enable_mask = I915_USER_INTERRUPT;
|
2010-12-04 19:30:53 +08:00
|
|
|
}
|
2014-07-01 00:53:36 +08:00
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_HASWELL(dev_priv))
|
2016-08-03 05:50:27 +08:00
|
|
|
engine->emit_bb_start = hsw_emit_bb_start;
|
2016-07-01 16:18:12 +08:00
|
|
|
|
2016-03-16 19:00:36 +08:00
|
|
|
engine->init_hw = init_render_ring;
|
2012-04-12 04:12:48 +08:00
|
|
|
|
2016-07-13 23:03:39 +08:00
|
|
|
ret = intel_init_ring_buffer(engine);
|
2014-11-20 07:33:06 +08:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
return 0;
|
2010-09-16 10:43:11 +08:00
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:37 +08:00
|
|
|
int intel_init_bsd_ring_buffer(struct intel_engine_cs *engine)
|
2010-09-16 10:43:11 +08:00
|
|
|
{
|
2016-07-13 23:03:37 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2012-04-12 04:12:49 +08:00
|
|
|
|
2016-06-29 23:09:20 +08:00
|
|
|
intel_ring_default_vfuncs(dev_priv, engine);
|
|
|
|
|
2016-05-06 22:40:21 +08:00
|
|
|
if (INTEL_GEN(dev_priv) >= 6) {
|
2012-04-12 04:12:55 +08:00
|
|
|
/* gen6 bsd needs a special wa for tail updates */
|
2016-05-06 22:40:21 +08:00
|
|
|
if (IS_GEN6(dev_priv))
|
2017-03-17 01:13:03 +08:00
|
|
|
engine->set_default_submission = gen6_bsd_set_default_submission;
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen6_bsd_ring_flush;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
engine->irq_enable_mask = GT_BSD_USER_INTERRUPT;
|
2012-04-12 04:12:49 +08:00
|
|
|
} else {
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = bsd_ring_flush;
|
2016-06-29 23:09:32 +08:00
|
|
|
if (IS_GEN5(dev_priv))
|
2016-03-16 19:00:36 +08:00
|
|
|
engine->irq_enable_mask = ILK_BSD_USER_INTERRUPT;
|
2016-06-29 23:09:32 +08:00
|
|
|
else
|
2016-03-16 19:00:36 +08:00
|
|
|
engine->irq_enable_mask = I915_BSD_USER_INTERRUPT;
|
2012-04-12 04:12:49 +08:00
|
|
|
}
|
|
|
|
|
2016-07-13 23:03:39 +08:00
|
|
|
return intel_init_ring_buffer(engine);
|
2010-09-16 10:43:11 +08:00
|
|
|
}
|
2010-10-19 18:19:32 +08:00
|
|
|
|
2016-07-13 23:03:37 +08:00
|
|
|
int intel_init_blt_ring_buffer(struct intel_engine_cs *engine)
|
2010-10-19 18:19:32 +08:00
|
|
|
{
|
2016-07-13 23:03:37 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-06-29 23:09:20 +08:00
|
|
|
|
|
|
|
intel_ring_default_vfuncs(dev_priv, engine);
|
|
|
|
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen6_ring_flush;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
engine->irq_enable_mask = GT_BLT_USER_INTERRUPT;
|
2010-10-19 18:19:32 +08:00
|
|
|
|
2016-07-13 23:03:39 +08:00
|
|
|
return intel_init_ring_buffer(engine);
|
2010-10-19 18:19:32 +08:00
|
|
|
}
|
2012-07-20 19:41:08 +08:00
|
|
|
|
2016-07-13 23:03:37 +08:00
|
|
|
int intel_init_vebox_ring_buffer(struct intel_engine_cs *engine)
|
2013-05-29 10:22:23 +08:00
|
|
|
{
|
2016-07-13 23:03:37 +08:00
|
|
|
struct drm_i915_private *dev_priv = engine->i915;
|
2016-06-29 23:09:20 +08:00
|
|
|
|
|
|
|
intel_ring_default_vfuncs(dev_priv, engine);
|
|
|
|
|
2016-08-03 05:50:24 +08:00
|
|
|
engine->emit_flush = gen6_ring_flush;
|
drm/i915: Remove obsolete ringbuffer emission for gen8+
Since removing the module parameter to force selection of ringbuffer
emission for gen8, the code is defunct. Remove it.
To put the difference into perspective, a couple of microbenchmarks
(bdw i7-5557u, 20170324):
ring execlists
exec continuous nops on all rings: 1.491us 2.223us
exec sequential nops on each ring: 12.508us 53.682us
single nop + sync: 9.272us 30.291us
vblank_mode=0 glxgears: ~11000fps ~9000fps
Since the earlier submission, gen8 ringbuffer submission has fallen
further and further behind in features. So while ringbuffer may hold the
throughput crown, in terms of interactive latency, execlists is much
better. Alas, we have no convenient metrics for such, other than
demonstrating things we can do with execlists but can not using
legacy ringbuffer submission.
We have made a few improvements to lowlevel execlists throughput,
and ringbuffer currently panics on boot! (bdw i7-5557u, 20171026):
ring execlists
exec continuous nops on all rings: n/a 1.921us
exec sequential nops on each ring: n/a 44.621us
single nop + sync: n/a 21.953us
vblank_mode=0 glxgears: n/a ~18500fps
References: https://bugs.freedesktop.org/show_bug.cgi?id=87725
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Once-upon-a-time-Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-2-chris@chris-wilson.co.uk
2017-11-21 04:55:01 +08:00
|
|
|
engine->irq_enable_mask = PM_VEBOX_USER_INTERRUPT;
|
|
|
|
engine->irq_enable = hsw_vebox_irq_enable;
|
|
|
|
engine->irq_disable = hsw_vebox_irq_disable;
|
2013-05-29 10:22:23 +08:00
|
|
|
|
2016-07-13 23:03:39 +08:00
|
|
|
return intel_init_ring_buffer(engine);
|
2013-05-29 10:22:23 +08:00
|
|
|
}
|