From: Tvrtko Ursulin Date: Fri, 19 Jan 2018 10:00:04 +0000 (+0000) Subject: drm/i915: Per-engine scratch VMA is mandatory X-Git-Tag: v4.19~298^2~46^2~775 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10bde236eff901407bdbcad2e605edaf7ba23bdb;p=platform%2Fkernel%2Flinux-rpi3.git drm/i915: Per-engine scratch VMA is mandatory We fail engine initialization if the scratch VMA cannot be created so there is no point in error handle it later. If the initialization ordering gets messed up, we can explode during development just as well. Signed-off-by: Tvrtko Ursulin Reviewed-by: Chris Wilson Reviewed-by: Michel Thierry Link: https://patchwork.freedesktop.org/patch/msgid/20180119100005.9072-2-tvrtko.ursulin@linux.intel.com --- diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 251311e..51e61b0 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1414,7 +1414,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine) unsigned int i; int ret; - if (GEM_WARN_ON(engine->id != RCS || !engine->scratch)) + if (GEM_WARN_ON(engine->id != RCS)) return -EINVAL; switch (INTEL_GEN(engine->i915)) {