drm/i915/bdw: Populate lrc with aliasing ppgtt if required
Subsystems (2)
PATCH 1/1 drm/i915/bdw: Populate lrc with aliasing ppgtt if required
In reply to a message not in the archiveA previous commit broke aliasing PPGTT for lrc, resulting in a kernel oops on boot. Add a check so that is full PPGTT is not in use the context is populated with the aliasing PPGTT.
Issue: VIZ-4278
--- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/intel_lrc.c +5 -0
@@ -1452,12 +1452,17 @@ static int populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_obj, struct intel_engine_cs *ring, struct intel_ringbuffer *ringbuf) { + struct drm_device *dev = ring->dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *ring_obj = ringbuf->obj;struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;struct page *page;uint32_t *reg_state;int ret; +if (!ppgtt) + ppgtt = dev_priv->mm.aliasing_ppgtt; + ret =i915_gem_object_set_to_cpu_domain (ctx_obj, true);if (ret) {DRM_DEBUG_DRIVER ("Could not set to CPU domain\n" );
Signature · 1 line
1.7.9.5
Quoted 3 lines · Thomas Daniel
A previous commit broke aliasing PPGTT for lrc, resulting in a kernel oops on boot. Add a check so that is full PPGTT is not in use the context is populated with the aliasing PPGTT.
Usually, we add a bit of history to the patch (even for trivial things) something like:
v2: blah blah blah blah
But doesn't really matter much this time.
Signature · 1 line
Damien
Quoted 35 lines
Issue: VIZ-4278
Signed-off-by Thomas Daniel <[email protected]>--- drivers/gpu/drm/i915/intel_lrc.c | 5 +++++ 1 file changed, 5 insertions(+)drivers/gpu/drm/i915/intel_lrc.c +5
-0@@ -1452,12 +1452,17 @@ static int populate_lr_context(struct intel_context *ctx, struct drm_i915_gem_object *ctx_obj, struct intel_engine_cs *ring, struct intel_ringbuffer *ringbuf) { + struct drm_device *dev = ring->dev; +struct drm_i915_private *dev_priv = dev->dev_private;struct drm_i915_gem_object *ring_obj = ringbuf->obj;struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;struct page *page;uint32_t *reg_state;int ret; +if (!ppgtt) + ppgtt = dev_priv->mm.aliasing_ppgtt; + ret =i915_gem_object_set_to_cpu_domain (ctx_obj, true);if (ret) {DRM_DEBUG_DRIVER ("Could not set to CPU domain\n" );Signature · 6 lines
1.7.9.5 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Daniel Vetter
AppliedQuoted 5 lines · Damien Lespiau
Quoted 3 lines · Thomas Daniel
A previous commit broke aliasing PPGTT for lrc, resulting in a kernel oops on boot. Add a check so that is full PPGTT is not in use the context is populated with the aliasing PPGTT.
Quoted 8 lines
Usually, we add a bit of history to the patch (even for trivial things) something like:
v2: blah blah blah blah
But doesn't really matter much this time.
Reviewed-by Damien Lespiau <[email protected]>
Queued for -next, thanks for the patch.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch