On su, 2016-08-07 at 15:45 +0100, Chris Wilson wrote:
> static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size)
> {
> - int ret;
> + struct drm_i915_gem_object *obj;
> + struct i915_vma *vma;
> + int err;
>
> - engine->wa_ctx.obj = i915_gem_object_create(&engine->i915->drm,
> - PAGE_ALIGN(size));
> - if (IS_ERR(engine->wa_ctx.obj)) {
> - DRM_DEBUG_DRIVER("alloc LRC WA ctx backing obj failed.\n");
> - ret = PTR_ERR(engine->wa_ctx.obj);
> - engine->wa_ctx.obj = NULL;
> - return ret;
> + obj = i915_gem_object_create(&engine->i915->drm, PAGE_ALIGN(size));
> + if (IS_ERR(obj))
> + return PTR_ERR(obj);
> +
> + vma = i915_vma_create(obj, &engine->i915->ggtt.base, NULL);
> + if (IS_ERR(vma)) {
> + i915_gem_object_put(obj);
> + return PTR_ERR(vma);
Goto teardown; err = PTR_ERR(vma);
> }
>
> - ret = i915_gem_object_ggtt_pin(engine->wa_ctx.obj, NULL,
> - 0, PAGE_SIZE, PIN_HIGH);
> - if (ret) {
> - DRM_DEBUG_DRIVER("pin LRC WA ctx backing obj failed: %d\n",
> - ret);
> - i915_gem_object_put(engine->wa_ctx.obj);
> - return ret;
> + err = i915_vma_pin(vma, 0, PAGE_SIZE, PIN_GLOBAL | PIN_HIGH);
> + if (err) {
> + i915_gem_object_put(obj);
Goto teardown.
> + return err;
> }
>
> + engine->wa_ctx.vma = vma;
> return 0;
> }
>
> @@ -2019,9 +2023,9 @@ populate_lr_context(struct i915_gem_context *ctx,
> RING_INDIRECT_CTX(engine->mmio_base), 0);
> ASSIGN_CTX_REG(reg_state, CTX_RCS_INDIRECT_CTX_OFFSET,
> RING_INDIRECT_CTX_OFFSET(engine->mmio_base), 0);
> - if (engine->wa_ctx.obj) {
> + if (engine->wa_ctx.vma) {
> struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
> - uint32_t ggtt_offset = i915_gem_obj_ggtt_offset(wa_ctx->obj);
> + u32 ggtt_offset = wa_ctx->vma->node.start;
lower_32_bits()?
>
> reg_state[CTX_RCS_INDIRECT_CTX+1] =
> (ggtt_offset + wa_ctx->indirect_ctx.offset * sizeof(uint32_t)) |
With above addressed;
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx>
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
