summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_lrc.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-07-30 17:43:25 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2018-08-01 17:03:31 +0100
commitd0f5cc5db11470a160788c123cc67bdb0cad1904 (patch)
treeefc7571adc10dfe150b71b2798534cdca6fb67d3 /drivers/gpu/drm/i915/intel_lrc.c
parentc358514ba8da9e235876db1628cedd19a35803c6 (diff)
downloadlinux-stable-d0f5cc5db11470a160788c123cc67bdb0cad1904.tar.gz
linux-stable-d0f5cc5db11470a160788c123cc67bdb0cad1904.tar.bz2
linux-stable-d0f5cc5db11470a160788c123cc67bdb0cad1904.zip
drm/i915/execlists: Terminate the context image with BB_END
In the aub trace utility, the context images are terminated with a MI_BATCH_BUFFER_END; the simulator is reported as complaining otherwise. Do the same for our protocontext image for completeness, and in passing apply the magic bit for gen10 to mark the end of the context image. Reported-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180730164325.12770-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
-rw-r--r--drivers/gpu/drm/i915/intel_lrc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index fad689efb67a..b0be180c6294 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -2653,6 +2653,10 @@ static void execlists_init_reg_state(u32 *regs,
i915_oa_init_reg_state(engine, ctx, regs);
}
+
+ regs[CTX_END] = MI_BATCH_BUFFER_END;
+ if (INTEL_GEN(dev_priv) >= 10)
+ regs[CTX_END] |= BIT(0);
}
static int