drm/i915/gt: Prevent use of engine->wa_ctx after error
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 18 Jan 2021 09:53:32 +0000 (09:53 +0000)
committerJani Nikula <jani.nikula@intel.com>
Mon, 18 Jan 2021 10:24:59 +0000 (12:24 +0200)
commit488751a0ef9b5ce572c47301ce62d54fc6b5a74d
tree27b544ec863ab3efac1a07ecbab94241ae8f724b
parent8662e1119a7d1baa1b2001689b2923e9050754bd
drm/i915/gt: Prevent use of engine->wa_ctx after error

On error we unpin and free the wa_ctx.vma, but do not clear any of the
derived flags. During lrc_init, we look at the flags and attempt to
dereference the wa_ctx.vma if they are set. To protect the error path
where we try to limp along without the wa_ctx, make sure we clear those
flags!

Reported-by: Matt Roper <matthew.d.roper@intel.com>
Fixes: 604a8f6f1e33 ("drm/i915/lrc: Only enable per-context and per-bb buffers if set")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Cc: <stable@vger.kernel.org> # v4.15+
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210108204026.20682-1-chris@chris-wilson.co.uk
(cherry-picked from 5b4dc95cf7f573e927fbbd406ebe54225d41b9b2)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210118095332.458813-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/gt/intel_lrc.c