Op 23-03-2021 om 18:30 schreef Matthew Auld:
On Tue, 23 Mar 2021 at 15:51, Maarten Lankhorst maarten.lankhorst@linux.intel.com wrote:
This will allow us to explicitly pass the ww to pin_pages, when it starts taking it.
This allows us to finally kill off the explicit passing of ww by retrieving it from the obj.
Signed-off-by: Maarten Lankhorst maarten.lankhorst@linux.intel.com
.../gpu/drm/i915/gem/i915_gem_execbuffer.c | 7 ++++--- drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_object.h | 1 + .../gpu/drm/i915/gem/i915_gem_object_blt.c | 4 ++-- drivers/gpu/drm/i915/gem/i915_gem_pages.c | 21 +++++++++++++++---- .../drm/i915/gem/selftests/i915_gem_context.c | 8 ++++--- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++-- drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- drivers/gpu/drm/i915/gt/intel_ring.c | 2 +- .../gpu/drm/i915/gt/intel_ring_submission.c | 2 +- drivers/gpu/drm/i915/gt/intel_timeline.c | 7 ++++--- drivers/gpu/drm/i915/gt/intel_timeline.h | 3 ++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 2 +- drivers/gpu/drm/i915/gt/mock_engine.c | 2 +- drivers/gpu/drm/i915/gt/selftest_lrc.c | 2 +- drivers/gpu/drm/i915/gt/selftest_rps.c | 10 ++++----- .../gpu/drm/i915/gt/selftest_workarounds.c | 6 +++--- drivers/gpu/drm/i915/gvt/cmd_parser.c | 4 ++-- drivers/gpu/drm/i915/i915_perf.c | 4 ++-- drivers/gpu/drm/i915/selftests/igt_spinner.c | 2 +- 24 files changed, 60 insertions(+), 43 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index dcfcae9c841b..73dd2a7673f5 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -1340,7 +1340,7 @@ static int __reloc_gpu_alloc(struct i915_execbuffer *eb, if (err) goto err_pool;
cmd = i915_gem_object_pin_map(pool->obj, pool->type);
cmd = i915_gem_object_pin_map(pool->obj, &eb->ww, pool->type); if (IS_ERR(cmd)) { err = PTR_ERR(cmd); goto err_pool;@@ -2489,7 +2489,8 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb, goto err_shadow; }
pw->shadow_map = i915_gem_object_pin_map(shadow->obj, I915_MAP_WB);
pw->shadow_map = i915_gem_object_pin_map(shadow->obj, &eb->ww,I915_MAP_WB); if (IS_ERR(pw->shadow_map)) { err = PTR_ERR(pw->shadow_map); goto err_trampoline;@@ -2500,7 +2501,7 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb,
pw->batch_map = ERR_PTR(-ENODEV); if (needs_clflush && i915_has_memcpy_from_wc())
pw->batch_map = i915_gem_object_pin_map(batch, I915_MAP_WC);
pw->batch_map = i915_gem_object_pin_map(batch, &eb->ww, I915_MAP_WC); if (IS_ERR(pw->batch_map)) { err = i915_gem_object_pin_pages(batch);diff --git a/drivers/gpu/drm/i915/gem/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/i915_gem_mman.c index 2561a2f1e54f..edac8ee3be9a 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c @@ -439,7 +439,7 @@ vm_access(struct vm_area_struct *area, unsigned long addr, goto out;
/* As this is primarily for debugging, let's focus on simplicity */
vaddr = i915_gem_object_pin_map(obj, I915_MAP_FORCE_WC);
vaddr = i915_gem_object_pin_map(obj, &ww, I915_MAP_FORCE_WC); if (IS_ERR(vaddr)) { err = PTR_ERR(vaddr); goto out;diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h index 1a8ec4035112..9bd9b47dcc8d 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h @@ -450,6 +450,7 @@ void i915_gem_object_writeback(struct drm_i915_gem_object *obj);
- ERR_PTR() on error.
*/ void *__must_check i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww, enum i915_map_type type);void *__must_check i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj, diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c index df8e8c18c6c9..fae18622d2da 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_blt.c @@ -58,7 +58,7 @@ struct i915_vma *intel_emit_vma_fill_blt(struct intel_context *ce, /* we pinned the pool, mark it as such */ intel_gt_buffer_pool_mark_used(pool);
cmd = i915_gem_object_pin_map(pool->obj, pool->type);
cmd = i915_gem_object_pin_map(pool->obj, ww, pool->type); if (IS_ERR(cmd)) { err = PTR_ERR(cmd); goto out_unpin;@@ -283,7 +283,7 @@ struct i915_vma *intel_emit_vma_copy_blt(struct intel_context *ce, /* we pinned the pool, mark it as such */ intel_gt_buffer_pool_mark_used(pool);
cmd = i915_gem_object_pin_map(pool->obj, pool->type);
cmd = i915_gem_object_pin_map(pool->obj, ww, pool->type); if (IS_ERR(cmd)) { err = PTR_ERR(cmd); goto out_unpin;diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c index 58e222030e10..232832398457 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c @@ -341,6 +341,7 @@ static void *i915_gem_object_map_pfn(struct drm_i915_gem_object *obj,
/* get, pin, and map the pages of the object into kernel space */ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
struct i915_gem_ww_ctx *ww, enum i915_map_type type){ enum i915_map_type has_type; @@ -408,13 +409,25 @@ void *i915_gem_object_pin_map(struct drm_i915_gem_object *obj, void *i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj, enum i915_map_type type) {
struct i915_gem_ww_ctx ww; void *ret;int err;
i915_gem_object_lock(obj, NULL);ret = i915_gem_object_pin_map(obj, type);i915_gem_object_unlock(obj);
i915_gem_ww_ctx_init(&ww, true);+retry:
err = i915_gem_object_lock(obj, &ww);if (!err)ret = i915_gem_object_pin_map(obj, &ww, type);if (IS_ERR(ret))This looks a little dodgy, since ret might not be initialized here, say if we encounter an error when grabbing the lock?
Also maybe s/ret/ptr/? Seeing ret makes me think it's a plain integer.
Ack, good catch!
Will send a new version to fix it.
~Maarten