diff options
| author | Chris Wilson <[email protected]> | 2019-04-18 13:27:19 +0000 |
|---|---|---|
| committer | Chris Wilson <[email protected]> | 2019-04-18 16:33:48 +0000 |
| commit | dfe2c8ed23d7524dd363e1941039da63e3982e98 (patch) | |
| tree | df05671c39ee39e1c9ea16471d0ccf2dd3bd8af0 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | drm/i915: Avoid use-after-free in reporting create.size (diff) | |
| download | kernel-dfe2c8ed23d7524dd363e1941039da63e3982e98.tar.gz kernel-dfe2c8ed23d7524dd363e1941039da63e3982e98.zip | |
drm/i915: Stop overwriting RING_IMR in rcs resume
We store the engine->imr mask and set up the RING_IMR register on
restarting the engine. We do not then want to overwrite it with
an incomplete mask later as we may then lose interrupts!
Reported-by: Tvrtko Ursulin <[email protected]>
Signed-off-by: Chris Wilson <[email protected]>
Cc: Tvrtko Ursulin <[email protected]>
Reviewed-by: Tvrtko Ursulin <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 029fd8ec1857..00bd9eeb053d 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -873,9 +873,6 @@ static int init_render_ring(struct intel_engine_cs *engine) if (IS_GEN_RANGE(dev_priv, 6, 7)) I915_WRITE(INSTPM, _MASKED_BIT_ENABLE(INSTPM_FORCE_ORDERING)); - if (INTEL_GEN(dev_priv) >= 6) - ENGINE_WRITE(engine, RING_IMR, ~engine->irq_keep_mask); - return 0; } |