[RFC,v3,14/17] drm/i915/vm_bind: Skip vma_lookup for persistent vmas

Message ID	20220827194403.6495-15-andi.shyti@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <intel-gfx-bounces@lists.freedesktop.org> From: Andi Shyti <andi.shyti@linux.intel.com> To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Date: Sat, 27 Aug 2022 21:44:00 +0200 Message-Id: <20220827194403.6495-15-andi.shyti@linux.intel.com> In-Reply-To: <20220827194403.6495-1-andi.shyti@linux.intel.com> References: <20220827194403.6495-1-andi.shyti@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-gfx] [RFC PATCH v3 14/17] drm/i915/vm_bind: Skip vma_lookup for persistent vmas Precedence: list Cc: Ramalingam C <ramalingampc2008@gmail.com>, Thomas Hellstrom <thomas.hellstrom@intel.com>, Matthew Auld <matthew.auld@intel.com> Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
Series	drm/i915/vm_bind: Add VM_BIND functionality \| expand [RFC,v3,00/17] drm/i915/vm_bind: Add VM_BIND functionality [RFC,v3,01/17] drm/i915: Expose vm_lookup in i915_gem_context.h [RFC,v3,02/17] drm/i915: Mark vm for vm_bind usage at creation [RFC,v3,03/17] drm/i915/gem: expose i915_gem_object_max_page_size() in i915_gem_object.h [RFC,v3,04/17] drm/i915: Implement bind and unbind of object [RFC,v3,05/17] drm/i915: Support for VM private BOs [RFC,v3,06/17] drm/i915/dmabuf: Deny the dmabuf export for VM private BOs [RFC,v3,07/17] drm/i915/vm_bind: Handle persistent vmas [RFC,v3,08/17] drm/i915/vm_bind: Add out fence support [RFC,v3,09/17] drm/i915: Do not support vm_bind mode in execbuf2 [RFC,v3,10/17] drm/i915/vm_bind: Implement I915_GEM_EXECBUFFER3 ioctl [RFC,v3,11/17] drm/i915: Add i915_vma_is_bind_complete() [RFC,v3,12/17] drm/i915/vm_bind: Handle persistent vmas in execbuf3 [RFC,v3,13/17] drm/i915/vm_bind: userptr dma-resv changes [RFC,v3,14/17] drm/i915/vm_bind: Skip vma_lookup for persistent vmas [RFC,v3,15/17] drm/i915: Extend getparm for VM_BIND capability [RFC,v3,16/17] drm/i915/ioctl: Enable the vm_bind/unbind ioctls [RFC,v3,17/17] drm/i915: Enable execbuf3 ioctl for vm_bind

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c index bd6e7c98e751d..d4b5cd4d1038c 100644 --- a/drivers/gpu/drm/i915/display/intel_fb_pin.c +++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c @@ -47,7 +47,7 @@ intel_pin_fb_obj_dpt(struct drm_framebuffer *fb, goto err; } - vma = i915_vma_instance(obj, vm, view); + vma = i915_vma_instance(obj, vm, view, false); if (IS_ERR(vma)) goto err; diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c index d10f27d0b7b09..ce034351b0c9c 100644 --- a/drivers/gpu/drm/i915/display/intel_plane_initial.c +++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c @@ -136,7 +136,7 @@ initial_plane_vma(struct drm_i915_private *i915, goto err_obj; } - vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL, false); if (IS_ERR(vma)) goto err_obj; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c index f85f10cf9c34b..a53e19fc48584 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c @@ -880,7 +880,7 @@ static struct i915_vma *eb_lookup_vma(struct i915_execbuffer *eb, u32 handle) } } - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; @@ -2212,7 +2212,7 @@ shadow_batch_pin(struct i915_execbuffer *eb, struct i915_vma *vma; int err; - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) return vma; diff --git a/drivers/gpu/drm/i915/gem/i915_gem_vm_bind_object.c b/drivers/gpu/drm/i915/gem/i915_gem_vm_bind_object.c index e6216f49e7d58..3dc5af4600a28 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_vm_bind_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_vm_bind_object.c @@ -254,7 +254,7 @@ static struct i915_vma *vm_bind_get_vma(struct i915_address_space *vm, view.type = I915_GGTT_VIEW_PARTIAL; view.partial.offset = va->offset >> PAGE_SHIFT; view.partial.size = va->length >> PAGE_SHIFT; - vma = i915_vma_instance(obj, vm, &view); + vma = i915_vma_instance(obj, vm, &view, true); if (IS_ERR(vma)) return vma; diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c index c570cf780079a..6e13a83d0e363 100644 --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c @@ -454,7 +454,7 @@ static int igt_mock_exhaust_device_supported_pages(void *arg) goto out_put; } - vma = i915_vma_instance(obj, &ppgtt->vm, NULL); + vma = i915_vma_instance(obj, &ppgtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put; @@ -522,7 +522,7 @@ static int igt_mock_memory_region_huge_pages(void *arg) goto out_region; } - vma = i915_vma_instance(obj, &ppgtt->vm, NULL); + vma = i915_vma_instance(obj, &ppgtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put; @@ -614,7 +614,7 @@ static int igt_mock_ppgtt_misaligned_dma(void *arg) /* Force the page size for this object */ obj->mm.page_sizes.sg = page_size; - vma = i915_vma_instance(obj, &ppgtt->vm, NULL); + vma = i915_vma_instance(obj, &ppgtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_unpin; @@ -746,7 +746,7 @@ static int igt_mock_ppgtt_huge_fill(void *arg) list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, &ppgtt->vm, NULL); + vma = i915_vma_instance(obj, &ppgtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); break; @@ -924,7 +924,7 @@ static int igt_mock_ppgtt_64K(void *arg) */ obj->mm.page_sizes.sg &= ~I915_GTT_PAGE_SIZE_2M; - vma = i915_vma_instance(obj, &ppgtt->vm, NULL); + vma = i915_vma_instance(obj, &ppgtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_object_unpin; @@ -1092,7 +1092,7 @@ static int __igt_write_huge(struct intel_context *ce, struct i915_vma *vma; int err; - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) return PTR_ERR(vma); @@ -1587,7 +1587,7 @@ static int igt_tmpfs_fallback(void *arg) __i915_gem_object_flush_map(obj, 0, 64); i915_gem_object_unpin_map(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put; @@ -1654,7 +1654,7 @@ static int igt_shrink_thp(void *arg) goto out_vm; } - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put; diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c index 3cfc621ef363d..0feae9fc7e81d 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c @@ -282,7 +282,7 @@ __create_vma(struct tiled_blits *t, size_t size, bool lmem) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, t->ce->vm, NULL); + vma = i915_vma_instance(obj, t->ce->vm, NULL, false); if (IS_ERR(vma)) i915_gem_object_put(obj); diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c index c6ad67b90e8af..570f74df9bef5 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c @@ -426,7 +426,7 @@ static int gpu_fill(struct intel_context *ce, GEM_BUG_ON(obj->base.size > ce->vm->total); GEM_BUG_ON(!intel_engine_can_store_dword(ce->engine)); - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) return PTR_ERR(vma); @@ -930,7 +930,7 @@ emit_rpcs_query(struct drm_i915_gem_object *obj, if (GRAPHICS_VER(i915) < 8) return -EINVAL; - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) return PTR_ERR(vma); @@ -938,7 +938,7 @@ emit_rpcs_query(struct drm_i915_gem_object *obj, if (IS_ERR(rpcs)) return PTR_ERR(rpcs); - batch = i915_vma_instance(rpcs, ce->vm, NULL); + batch = i915_vma_instance(rpcs, ce->vm, NULL, false); if (IS_ERR(batch)) { err = PTR_ERR(batch); goto err_put; @@ -1522,7 +1522,7 @@ static int write_to_scratch(struct i915_gem_context *ctx, intel_gt_chipset_flush(engine->gt); vm = i915_gem_context_get_eb_vm(ctx); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_vm; @@ -1599,7 +1599,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, const u32 GPR0 = engine->mmio_base + 0x600; vm = i915_gem_context_get_eb_vm(ctx); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_vm; @@ -1635,7 +1635,7 @@ static int read_from_scratch(struct i915_gem_context *ctx, /* hsw: register access even to 3DPRIM! is protected */ vm = i915_vm_get(&engine->gt->ggtt->vm); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_vm; diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c index fe6c37fd7859a..fc235e1e6c122 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c @@ -201,7 +201,7 @@ static int __igt_lmem_pages_migrate(struct intel_gt *gt, return PTR_ERR(obj); if (vm) { - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put; diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c index 3cff08f04f6ce..10ffa52aad8d4 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -546,7 +546,8 @@ static int make_obj_busy(struct drm_i915_gem_object *obj) struct i915_gem_ww_ctx ww; int err; - vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, + NULL, false); if (IS_ERR(vma)) return PTR_ERR(vma); @@ -1587,7 +1588,8 @@ static int __igt_mmap_gpu(struct drm_i915_private *i915, struct i915_vma *vma; struct i915_gem_ww_ctx ww; - vma = i915_vma_instance(obj, engine->kernel_context->vm, NULL); + vma = i915_vma_instance(obj, engine->kernel_context->vm, + NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_unmap; diff --git a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c index 3c55e77b0f1b0..4184e198c824a 100644 --- a/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c +++ b/drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c @@ -91,7 +91,7 @@ igt_emit_store_dw(struct i915_vma *vma, intel_gt_chipset_flush(vma->vm->gt); - vma = i915_vma_instance(obj, vma->vm, NULL); + vma = i915_vma_instance(obj, vma->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err; diff --git a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c index 1bb766c79dcbe..a0af2aa50533f 100644 --- a/drivers/gpu/drm/i915/gt/gen6_ppgtt.c +++ b/drivers/gpu/drm/i915/gt/gen6_ppgtt.c @@ -395,7 +395,7 @@ gen6_alloc_top_pd(struct gen6_ppgtt *ppgtt) pd->pt.base->base.resv = i915_vm_resv_get(&ppgtt->base.vm); pd->pt.base->shares_resv_from = &ppgtt->base.vm; - ppgtt->vma = i915_vma_instance(pd->pt.base, &ggtt->vm, NULL); + ppgtt->vma = i915_vma_instance(pd->pt.base, &ggtt->vm, NULL, false); if (IS_ERR(ppgtt->vma)) { err = PTR_ERR(ppgtt->vma); ppgtt->vma = NULL; diff --git a/drivers/gpu/drm/i915/gt/intel_engine_cs.c b/drivers/gpu/drm/i915/gt/intel_engine_cs.c index 275ad72940c15..52f8295b85a2b 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_cs.c @@ -991,7 +991,7 @@ static int init_status_page(struct intel_engine_cs *engine) i915_gem_object_set_cache_coherency(obj, I915_CACHE_LLC); - vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { ret = PTR_ERR(vma); goto err_put; diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index e4bac2431e416..d9ddaecdd5b48 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -423,7 +423,7 @@ static int intel_gt_init_scratch(struct intel_gt *gt, unsigned int size) return PTR_ERR(obj); } - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { ret = PTR_ERR(vma); goto err_unref; diff --git a/drivers/gpu/drm/i915/gt/intel_gtt.c b/drivers/gpu/drm/i915/gt/intel_gtt.c index f1db8310de4a6..59ed3a822483f 100644 --- a/drivers/gpu/drm/i915/gt/intel_gtt.c +++ b/drivers/gpu/drm/i915/gt/intel_gtt.c @@ -628,7 +628,7 @@ __vm_create_scratch_for_read(struct i915_address_space *vm, unsigned long size) i915_gem_object_set_cache_coherency(obj, I915_CACHING_CACHED); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 070cec4ff8a48..71fc27df858d4 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -1009,7 +1009,7 @@ __lrc_alloc_state(struct intel_context *ce, struct intel_engine_cs *engine) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; @@ -1662,7 +1662,7 @@ static int lrc_create_wa_ctx(struct intel_engine_cs *engine) if (IS_ERR(obj)) return PTR_ERR(obj); - vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err; diff --git a/drivers/gpu/drm/i915/gt/intel_renderstate.c b/drivers/gpu/drm/i915/gt/intel_renderstate.c index 5121e6dc2fa53..bc7a2d4421dbc 100644 --- a/drivers/gpu/drm/i915/gt/intel_renderstate.c +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.c @@ -157,7 +157,7 @@ int intel_renderstate_init(struct intel_renderstate *so, if (IS_ERR(obj)) return PTR_ERR(obj); - so->vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + so->vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(so->vma)) { err = PTR_ERR(so->vma); goto err_obj; diff --git a/drivers/gpu/drm/i915/gt/intel_ring.c b/drivers/gpu/drm/i915/gt/intel_ring.c index 15ec64d881c44..24c8b738a3945 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring.c +++ b/drivers/gpu/drm/i915/gt/intel_ring.c @@ -130,7 +130,7 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) if (vm->has_read_only) i915_gem_object_set_readonly(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) goto err; diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c index d5d6f1fadcae3..5e93a4052140a 100644 --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c @@ -551,7 +551,7 @@ alloc_context_vma(struct intel_engine_cs *engine) if (IS_IVYBRIDGE(i915)) i915_gem_object_set_cache_coherency(obj, I915_CACHE_L3_LLC); - vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -1291,7 +1291,7 @@ static struct i915_vma *gen7_ctx_vma(struct intel_engine_cs *engine) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, engine->gt->vm, NULL); + vma = i915_vma_instance(obj, engine->gt->vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return ERR_CAST(vma); diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c index b9640212d6595..31f56996f1002 100644 --- a/drivers/gpu/drm/i915/gt/intel_timeline.c +++ b/drivers/gpu/drm/i915/gt/intel_timeline.c @@ -28,7 +28,7 @@ static struct i915_vma *hwsp_alloc(struct intel_gt *gt) i915_gem_object_set_cache_coherency(obj, I915_CACHE_LLC); - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) i915_gem_object_put(obj); diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c index c0637bf799a33..6f35783083953 100644 --- a/drivers/gpu/drm/i915/gt/mock_engine.c +++ b/drivers/gpu/drm/i915/gt/mock_engine.c @@ -46,7 +46,7 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) goto err; diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_cs.c b/drivers/gpu/drm/i915/gt/selftest_engine_cs.c index 1b75f478d1b83..16fcaba7c9806 100644 --- a/drivers/gpu/drm/i915/gt/selftest_engine_cs.c +++ b/drivers/gpu/drm/i915/gt/selftest_engine_cs.c @@ -85,7 +85,7 @@ static struct i915_vma *create_empty_batch(struct intel_context *ce) i915_gem_object_flush_map(obj); - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_unpin; @@ -222,7 +222,7 @@ static struct i915_vma *create_nop_batch(struct intel_context *ce) i915_gem_object_flush_map(obj); - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_unpin; diff --git a/drivers/gpu/drm/i915/gt/selftest_execlists.c b/drivers/gpu/drm/i915/gt/selftest_execlists.c index 1e08b2473b993..643ffcb3964a8 100644 --- a/drivers/gpu/drm/i915/gt/selftest_execlists.c +++ b/drivers/gpu/drm/i915/gt/selftest_execlists.c @@ -1000,7 +1000,7 @@ static int live_timeslice_preempt(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -1307,7 +1307,7 @@ static int live_timeslice_queue(void *arg) if (IS_ERR(obj)) return PTR_ERR(obj); - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -1562,7 +1562,7 @@ static int live_busywait_preempt(void *arg) goto err_obj; } - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_map; @@ -2716,7 +2716,7 @@ static int create_gang(struct intel_engine_cs *engine, goto err_ce; } - vma = i915_vma_instance(obj, ce->vm, NULL); + vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -3060,7 +3060,7 @@ create_gpr_user(struct intel_engine_cs *engine, if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, result->vm, NULL); + vma = i915_vma_instance(obj, result->vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; @@ -3130,7 +3130,7 @@ static struct i915_vma *create_global(struct intel_gt *gt, size_t sz) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; @@ -3159,7 +3159,7 @@ create_gpr_client(struct intel_engine_cs *engine, if (IS_ERR(ce)) return ERR_CAST(ce); - vma = i915_vma_instance(global->obj, ce->vm, NULL); + vma = i915_vma_instance(global->obj, ce->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_ce; @@ -3501,7 +3501,7 @@ static int smoke_submit(struct preempt_smoke *smoke, struct i915_address_space *vm; vm = i915_gem_context_get_eb_vm(ctx); - vma = i915_vma_instance(batch, vm, NULL); + vma = i915_vma_instance(batch, vm, NULL, false); i915_vm_put(vm); if (IS_ERR(vma)) return PTR_ERR(vma); diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c index 7f3bb1d34dfbf..0b021a32d0e03 100644 --- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c +++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c @@ -147,13 +147,13 @@ hang_create_request(struct hang *h, struct intel_engine_cs *engine) h->obj = obj; h->batch = vaddr; - vma = i915_vma_instance(h->obj, vm, NULL); + vma = i915_vma_instance(h->obj, vm, NULL, false); if (IS_ERR(vma)) { i915_vm_put(vm); return ERR_CAST(vma); } - hws = i915_vma_instance(h->hws, vm, NULL); + hws = i915_vma_instance(h->hws, vm, NULL, false); if (IS_ERR(hws)) { i915_vm_put(vm); return ERR_CAST(hws); @@ -1474,7 +1474,7 @@ static int __igt_reset_evict_vma(struct intel_gt *gt, } } - arg.vma = i915_vma_instance(obj, vm, NULL); + arg.vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(arg.vma)) { err = PTR_ERR(arg.vma); pr_err("[%s] VMA instance failed: %d!\n", engine->name, err); diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c index 1109088fe8f63..2ddcefffcfd4d 100644 --- a/drivers/gpu/drm/i915/gt/selftest_lrc.c +++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c @@ -930,7 +930,7 @@ create_user_vma(struct i915_address_space *vm, unsigned long size) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; diff --git a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c index 70f9ac1ec2c76..7e9361104620c 100644 --- a/drivers/gpu/drm/i915/gt/selftest_ring_submission.c +++ b/drivers/gpu/drm/i915/gt/selftest_ring_submission.c @@ -17,7 +17,7 @@ static struct i915_vma *create_wally(struct intel_engine_cs *engine) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, engine->gt->vm, NULL); + vma = i915_vma_instance(obj, engine->gt->vm, NULL, false); if (IS_ERR(vma)) { i915_gem_object_put(obj); return vma; diff --git a/drivers/gpu/drm/i915/gt/selftest_rps.c b/drivers/gpu/drm/i915/gt/selftest_rps.c index cfb4708dd62e6..327558828bef6 100644 --- a/drivers/gpu/drm/i915/gt/selftest_rps.c +++ b/drivers/gpu/drm/i915/gt/selftest_rps.c @@ -78,7 +78,7 @@ create_spin_counter(struct intel_engine_cs *engine, end = obj->base.size / sizeof(u32) - 1; - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_put; diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c index 67a9aab801ddf..d893ea763ac61 100644 --- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c +++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c @@ -122,7 +122,7 @@ read_nonprivs(struct intel_context *ce) i915_gem_object_flush_map(result); i915_gem_object_unpin_map(result); - vma = i915_vma_instance(result, &engine->gt->ggtt->vm, NULL); + vma = i915_vma_instance(result, &engine->gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -389,7 +389,7 @@ static struct i915_vma *create_batch(struct i915_address_space *vm) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 24451d000a6a6..cd3e52fa5ea50 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -737,7 +737,7 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &gt->ggtt->vm, NULL, false); if (IS_ERR(vma)) goto err; diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 4b76051312dd7..00773b78d71f8 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -930,7 +930,7 @@ i915_gem_object_ggtt_pin_ww(struct drm_i915_gem_object *obj, } new_vma: - vma = i915_vma_instance(obj, &ggtt->vm, view); + vma = i915_vma_instance(obj, &ggtt->vm, view, false); if (IS_ERR(vma)) return vma; diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c index f3c23fe9ad9ce..a7aa03b79ac47 100644 --- a/drivers/gpu/drm/i915/i915_perf.c +++ b/drivers/gpu/drm/i915/i915_perf.c @@ -1919,7 +1919,7 @@ alloc_oa_config_buffer(struct i915_perf_stream *stream, oa_bo->vma = i915_vma_instance(obj, &stream->engine->gt->ggtt->vm, - NULL); + NULL, false); if (IS_ERR(oa_bo->vma)) { err = PTR_ERR(oa_bo->vma); goto out_ww; diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index 4b8ae58cd886b..81b8e33ac085f 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -110,7 +110,8 @@ static void __i915_vma_retire(struct i915_active *ref) static struct i915_vma * vma_create(struct drm_i915_gem_object *obj, struct i915_address_space *vm, - const struct i915_ggtt_view *view) + const struct i915_ggtt_view *view, + bool persistent) { struct i915_vma *pos = ERR_PTR(-E2BIG); struct i915_vma *vma; @@ -197,6 +198,9 @@ vma_create(struct drm_i915_gem_object *obj, __set_bit(I915_VMA_GGTT_BIT, __i915_vma_flags(vma)); } + if (persistent) + goto skip_rb_insert; + rb = NULL; p = &obj->vma.tree.rb_node; while (*p) { @@ -221,6 +225,7 @@ vma_create(struct drm_i915_gem_object *obj, rb_link_node(&vma->obj_node, rb, p); rb_insert_color(&vma->obj_node, &obj->vma.tree); +skip_rb_insert: if (i915_vma_is_ggtt(vma)) /* * We put the GGTT vma at the start of the vma-list, followed @@ -279,6 +284,7 @@ i915_vma_lookup(struct drm_i915_gem_object *obj, * @obj: parent &struct drm_i915_gem_object to be mapped * @vm: address space in which the mapping is located * @view: additional mapping requirements + * @persistent: Whether the vma is persistent * * i915_vma_instance() looks up an existing VMA of the @obj in the @vm with * the same @view characteristics. If a match is not found, one is created. @@ -290,19 +296,22 @@ i915_vma_lookup(struct drm_i915_gem_object *obj, struct i915_vma * i915_vma_instance(struct drm_i915_gem_object *obj, struct i915_address_space *vm, - const struct i915_ggtt_view *view) + const struct i915_ggtt_view *view, + bool persistent) { - struct i915_vma *vma; + struct i915_vma *vma = NULL; GEM_BUG_ON(!kref_read(&vm->ref)); - spin_lock(&obj->vma.lock); - vma = i915_vma_lookup(obj, vm, view); - spin_unlock(&obj->vma.lock); + if (!persistent) { + spin_lock(&obj->vma.lock); + vma = i915_vma_lookup(obj, vm, view); + spin_unlock(&obj->vma.lock); + } /* vma_create() will resolve the race if another creates the vma */ if (unlikely(!vma)) - vma = vma_create(obj, vm, view); + vma = vma_create(obj, vm, view, persistent); GEM_BUG_ON(!IS_ERR(vma) && i915_vma_compare(vma, vm, view)); return vma; @@ -1728,7 +1737,8 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt, spin_lock(&obj->vma.lock); list_del(&vma->obj_link); - if (!RB_EMPTY_NODE(&vma->obj_node)) + if (!i915_vma_is_persistent(vma) && + !RB_EMPTY_NODE(&vma->obj_node)) rb_erase(&vma->obj_node, &obj->vma.tree); spin_unlock(&obj->vma.lock); diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h index 9f8c369c3b466..028d063731aa2 100644 --- a/drivers/gpu/drm/i915/i915_vma.h +++ b/drivers/gpu/drm/i915/i915_vma.h @@ -43,7 +43,8 @@ struct i915_vma * i915_vma_instance(struct drm_i915_gem_object *obj, struct i915_address_space *vm, - const struct i915_ggtt_view *view); + const struct i915_ggtt_view *view, + bool persistent); void i915_vma_unpin_and_release(struct i915_vma **p_vma, unsigned int flags); #define I915_VMA_RELEASE_MAP BIT(0) diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c index fb5e619634792..8552be3820308 100644 --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c @@ -390,7 +390,7 @@ static void close_object_list(struct list_head *objects, list_for_each_entry_safe(obj, on, objects, st_link) { struct i915_vma *vma; - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (!IS_ERR(vma)) ignored = i915_vma_unbind_unlocked(vma); @@ -452,7 +452,7 @@ static int fill_hole(struct i915_address_space *vm, u64 aligned_size = round_up(obj->base.size, min_alignment); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) continue; @@ -492,7 +492,7 @@ static int fill_hole(struct i915_address_space *vm, u64 aligned_size = round_up(obj->base.size, min_alignment); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) continue; @@ -531,7 +531,7 @@ static int fill_hole(struct i915_address_space *vm, u64 aligned_size = round_up(obj->base.size, min_alignment); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) continue; @@ -571,7 +571,7 @@ static int fill_hole(struct i915_address_space *vm, u64 aligned_size = round_up(obj->base.size, min_alignment); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) continue; @@ -653,7 +653,7 @@ static int walk_hole(struct i915_address_space *vm, if (IS_ERR(obj)) break; - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_put; @@ -728,7 +728,7 @@ static int pot_hole(struct i915_address_space *vm, if (IS_ERR(obj)) return PTR_ERR(obj); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -837,7 +837,7 @@ static int drunk_hole(struct i915_address_space *vm, break; } - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_obj; @@ -920,7 +920,7 @@ static int __shrink_hole(struct i915_address_space *vm, list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); break; @@ -1018,7 +1018,7 @@ static int shrink_boom(struct i915_address_space *vm, if (IS_ERR(purge)) return PTR_ERR(purge); - vma = i915_vma_instance(purge, vm, NULL); + vma = i915_vma_instance(purge, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_purge; @@ -1041,7 +1041,7 @@ static int shrink_boom(struct i915_address_space *vm, vm->fault_attr.interval = 1; atomic_set(&vm->fault_attr.times, -1); - vma = i915_vma_instance(explode, vm, NULL); + vma = i915_vma_instance(explode, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_explode; @@ -1088,7 +1088,7 @@ static int misaligned_case(struct i915_address_space *vm, struct intel_memory_re return PTR_ERR(obj); } - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err_put; @@ -1560,7 +1560,7 @@ static int igt_gtt_reserve(void *arg) } list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1606,7 +1606,7 @@ static int igt_gtt_reserve(void *arg) list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1636,7 +1636,7 @@ static int igt_gtt_reserve(void *arg) struct i915_vma *vma; u64 offset; - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1783,7 +1783,7 @@ static int igt_gtt_insert(void *arg) list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1809,7 +1809,7 @@ static int igt_gtt_insert(void *arg) list_for_each_entry(obj, &objects, st_link) { struct i915_vma *vma; - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1829,7 +1829,7 @@ static int igt_gtt_insert(void *arg) struct i915_vma *vma; u64 offset; - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -1882,7 +1882,7 @@ static int igt_gtt_insert(void *arg) list_add(&obj->st_link, &objects); - vma = i915_vma_instance(obj, &ggtt->vm, NULL); + vma = i915_vma_instance(obj, &ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out; @@ -2091,7 +2091,7 @@ static int igt_cs_tlb(void *arg) } i915_gem_object_set_cache_coherency(out, I915_CACHING_CACHED); - vma = i915_vma_instance(out, vm, NULL); + vma = i915_vma_instance(out, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_put_out; @@ -2131,7 +2131,7 @@ static int igt_cs_tlb(void *arg) memset32(result, STACK_MAGIC, PAGE_SIZE / sizeof(u32)); - vma = i915_vma_instance(bbe, vm, NULL); + vma = i915_vma_instance(bbe, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto end; @@ -2203,7 +2203,7 @@ static int igt_cs_tlb(void *arg) goto end; } - vma = i915_vma_instance(act, vm, NULL); + vma = i915_vma_instance(act, vm, NULL, false); if (IS_ERR(vma)) { kfree(vma_res); err = PTR_ERR(vma); diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c index 818a4909c1f35..297c1d4ebf44c 100644 --- a/drivers/gpu/drm/i915/selftests/i915_request.c +++ b/drivers/gpu/drm/i915/selftests/i915_request.c @@ -961,7 +961,7 @@ static struct i915_vma *empty_batch(struct drm_i915_private *i915) intel_gt_chipset_flush(to_gt(i915)); - vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL); + vma = i915_vma_instance(obj, &to_gt(i915)->ggtt->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err; @@ -1100,7 +1100,7 @@ static struct i915_vma *recursive_batch(struct drm_i915_private *i915) if (IS_ERR(obj)) return ERR_CAST(obj); - vma = i915_vma_instance(obj, to_gt(i915)->vm, NULL); + vma = i915_vma_instance(obj, to_gt(i915)->vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto err; diff --git a/drivers/gpu/drm/i915/selftests/i915_vma.c b/drivers/gpu/drm/i915/selftests/i915_vma.c index e3821398a5b09..ecf2d4abf9290 100644 --- a/drivers/gpu/drm/i915/selftests/i915_vma.c +++ b/drivers/gpu/drm/i915/selftests/i915_vma.c @@ -68,7 +68,7 @@ checked_vma_instance(struct drm_i915_gem_object *obj, struct i915_vma *vma; bool ok = true; - vma = i915_vma_instance(obj, vm, view); + vma = i915_vma_instance(obj, vm, view, false); if (IS_ERR(vma)) return vma; diff --git a/drivers/gpu/drm/i915/selftests/igt_spinner.c b/drivers/gpu/drm/i915/selftests/igt_spinner.c index 0c22594ae2746..6901f94ff0764 100644 --- a/drivers/gpu/drm/i915/selftests/igt_spinner.c +++ b/drivers/gpu/drm/i915/selftests/igt_spinner.c @@ -47,7 +47,7 @@ static void *igt_spinner_pin_obj(struct intel_context *ce, void *vaddr; int ret; - *vma = i915_vma_instance(obj, ce->vm, NULL); + *vma = i915_vma_instance(obj, ce->vm, NULL, false); if (IS_ERR(*vma)) return ERR_CAST(*vma); diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c index 3b18e5905c86b..551d0c958a3bc 100644 --- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c +++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c @@ -745,7 +745,7 @@ static int igt_gpu_write(struct i915_gem_context *ctx, if (!order) return -ENOMEM; - vma = i915_vma_instance(obj, vm, NULL); + vma = i915_vma_instance(obj, vm, NULL, false); if (IS_ERR(vma)) { err = PTR_ERR(vma); goto out_free;

[RFC,v3,14/17] drm/i915/vm_bind: Skip vma_lookup for persistent vmas

Commit Message

Patch