aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2018-09-14 08:35:03 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2018-09-14 09:23:33 -0400
commit37d7c9cc2eb6620bf1130de1ca28eb1da0b8ede8 (patch)
tree04288e93adf08b5062951422b10923d80c59fece /drivers/gpu/drm
parentdee60ca1f35234d890977c095410ed6ac1dcfc33 (diff)
drm/i915: Check engine->default_state mapping on module load
Check we can indeed acquire a WB mapping of the context image on module load. Later this will give us the opportunity to validate that we can switch from WC to WB as required. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180914123504.2062-2-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 89834ce19acd..d276fb302d4e 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -5416,6 +5416,7 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)
5416 5416
5417 for_each_engine(engine, i915, id) { 5417 for_each_engine(engine, i915, id) {
5418 struct i915_vma *state; 5418 struct i915_vma *state;
5419 void *vaddr;
5419 5420
5420 state = to_intel_context(ctx, engine)->state; 5421 state = to_intel_context(ctx, engine)->state;
5421 if (!state) 5422 if (!state)
@@ -5438,6 +5439,16 @@ static int __intel_engines_record_defaults(struct drm_i915_private *i915)
5438 goto err_active; 5439 goto err_active;
5439 5440
5440 engine->default_state = i915_gem_object_get(state->obj); 5441 engine->default_state = i915_gem_object_get(state->obj);
5442
5443 /* Check we can acquire the image of the context state */
5444 vaddr = i915_gem_object_pin_map(engine->default_state,
5445 I915_MAP_WB);
5446 if (IS_ERR(vaddr)) {
5447 err = PTR_ERR(vaddr);
5448 goto err_active;
5449 }
5450
5451 i915_gem_object_unpin_map(engine->default_state);
5441 } 5452 }
5442 5453
5443 if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) { 5454 if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) {