mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-06 02:50:43 +00:00
Code Issues Releases Wiki Activity

drm/i915: Use VMA for wa_ctx tracking

Browse source 
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1471254551-25805-25-git-send-email-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2016-08-15 10:49:04 +01:00
parent a5e85c8a4d
commit 48bb74e48b
3 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/gpu/drm/i915/i915_gpu_error.c
View file

@ -1134,7 +1134,7 @@ static void i915_gem_record_rings(struct drm_i915_private *dev_priv,
engine->status_page.vma->obj); engine->status_page.vma->obj);
ee->wa_ctx = i915_error_ggtt_object_create(dev_priv, ee->wa_ctx = i915_error_ggtt_object_create(dev_priv,
engine->wa_ctx.obj); engine->wa_ctx.vma->obj);
count = 0; count = 0;
list_for_each_entry(request, &engine->request_list, link) list_for_each_entry(request, &engine->request_list, link)

58
drivers/gpu/drm/i915/intel_lrc.c
View file

@ -1165,45 +1165,51 @@ static int gen9_init_perctx_bb(struct intel_engine_cs *engine,
static int lrc_setup_wa_ctx_obj(struct intel_engine_cs *engine, u32 size) 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, obj = i915_gem_object_create(&engine->i915->drm, PAGE_ALIGN(size));
PAGE_ALIGN(size)); if (IS_ERR(obj))
if (IS_ERR(engine->wa_ctx.obj)) { return PTR_ERR(obj);
DRM_DEBUG_DRIVER("alloc LRC WA ctx backing obj failed.\n");
ret = PTR_ERR(engine->wa_ctx.obj); vma = i915_vma_create(obj, &engine->i915->ggtt.base, NULL);
engine->wa_ctx.obj = NULL; if (IS_ERR(vma)) {
return ret; err = PTR_ERR(vma);
goto err;
} }
ret = i915_gem_object_ggtt_pin(engine->wa_ctx.obj, NULL, err = i915_vma_pin(vma, 0, PAGE_SIZE, PIN_GLOBAL | PIN_HIGH);
0, PAGE_SIZE, PIN_HIGH); if (err)
if (ret) { goto err;
DRM_DEBUG_DRIVER("pin LRC WA ctx backing obj failed: %d\n",
ret);
i915_gem_object_put(engine->wa_ctx.obj);
return ret;
}
engine->wa_ctx.vma = vma;
return 0; return 0;
err:
i915_gem_object_put(obj);
return err;
} }
static void lrc_destroy_wa_ctx_obj(struct intel_engine_cs *engine) static void lrc_destroy_wa_ctx_obj(struct intel_engine_cs *engine)
{ {
if (engine->wa_ctx.obj) { struct i915_vma *vma;
i915_gem_object_ggtt_unpin(engine->wa_ctx.obj);
i915_gem_object_put(engine->wa_ctx.obj); vma = fetch_and_zero(&engine->wa_ctx.vma);
engine->wa_ctx.obj = NULL; if (!vma)
} return;
i915_vma_unpin(vma);
i915_vma_put(vma);
} }
static int intel_init_workaround_bb(struct intel_engine_cs *engine) static int intel_init_workaround_bb(struct intel_engine_cs *engine)
{ {
int ret; struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx;
uint32_t *batch; uint32_t *batch;
uint32_t offset; uint32_t offset;
struct page *page; struct page *page;
struct i915_ctx_workarounds *wa_ctx = &engine->wa_ctx; int ret;
WARN_ON(engine->id != RCS); WARN_ON(engine->id != RCS);
@ -1226,7 +1232,7 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)
return ret; return ret;
} }
page = i915_gem_object_get_dirty_page(wa_ctx->obj, 0); page = i915_gem_object_get_dirty_page(wa_ctx->vma->obj, 0);
batch = kmap_atomic(page); batch = kmap_atomic(page);
offset = 0; offset = 0;
@ -2019,9 +2025,9 @@ populate_lr_context(struct i915_gem_context *ctx,
RING_INDIRECT_CTX(engine->mmio_base), 0); RING_INDIRECT_CTX(engine->mmio_base), 0);
ASSIGN_CTX_REG(reg_state, CTX_RCS_INDIRECT_CTX_OFFSET, ASSIGN_CTX_REG(reg_state, CTX_RCS_INDIRECT_CTX_OFFSET,
RING_INDIRECT_CTX_OFFSET(engine->mmio_base), 0); 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; 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;
reg_state[CTX_RCS_INDIRECT_CTX+1] = reg_state[CTX_RCS_INDIRECT_CTX+1] =
(ggtt_offset + wa_ctx->indirect_ctx.offset * sizeof(uint32_t)) | (ggtt_offset + wa_ctx->indirect_ctx.offset * sizeof(uint32_t)) |

4
drivers/gpu/drm/i915/intel_ringbuffer.h
View file

@ -123,12 +123,12 @@ struct drm_i915_reg_table;
* an option for future use. * an option for future use.
* size: size of the batch in DWORDS * size: size of the batch in DWORDS
*/ */
struct i915_ctx_workarounds { struct i915_ctx_workarounds {
struct i915_wa_ctx_bb { struct i915_wa_ctx_bb {
u32 offset; u32 offset;
u32 size; u32 size;
} indirect_ctx, per_ctx; } indirect_ctx, per_ctx;
struct drm_i915_gem_object *obj; struct i915_vma *vma;
}; };
struct drm_i915_gem_request; struct drm_i915_gem_request;