diff options
author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2018-01-19 11:00:04 +0100 |
---|---|---|
committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2018-01-22 18:15:31 +0100 |
commit | 10bde236eff901407bdbcad2e605edaf7ba23bdb (patch) | |
tree | 99b4c7815149934df642875e9b354b36a584c101 /drivers/gpu/drm | |
parent | drm/i915: Downgrade incorrect engine constructor usage warnings to development (diff) | |
download | linux-10bde236eff901407bdbcad2e605edaf7ba23bdb.tar.xz linux-10bde236eff901407bdbcad2e605edaf7ba23bdb.zip |
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 <tvrtko.ursulin@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Michel Thierry <michel.thierry@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180119100005.9072-2-tvrtko.ursulin@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 251311e41373..51e61b04a555 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)) { |