From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CEC5C433EF for ; Fri, 8 Apr 2022 09:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232505AbiDHJHx (ORCPT ); Fri, 8 Apr 2022 05:07:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232512AbiDHJHw (ORCPT ); Fri, 8 Apr 2022 05:07:52 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91192E339B for ; Fri, 8 Apr 2022 02:05:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649408749; x=1680944749; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=HE5ya599/m4i90H4CX8I9ScGFfMT0hMXWCfl6N8prG4=; b=LxBuujcw6rXOAfAE602OYEvQKVoDv5bo7Bh80WCY1qlRZ1aX9OCzJxVA zgMy3rsD/upKiBPG4AsxB/AHgcKnTeCsRcnW1zH2VFEb/ztSKWOhY8g4E +YaGRezYFFNwJUq1dWQwxwvVOKmwydYavqab+4n5aq+KKPDQ45notzWLi aRcafo+KAqcwN8AI9ydVcJR6Bu0re7KhaJ71JuLYclSjJ9so8SMGARMhS XODQtjPdQnkS5ax0yaTZj+7Y/Qc4OSxuY2epodwvIQGSVI7FolwBLKwMT uFgHr8ncVHButHy1LBvVzf1llUAmO1ZqC4gBr4UV8LNzlIvMkYWXz0adz A==; X-IronPort-AV: E=McAfee;i="6400,9594,10310"; a="286538817" X-IronPort-AV: E=Sophos;i="5.90,244,1643702400"; d="scan'208";a="286538817" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 02:05:34 -0700 X-IronPort-AV: E=Sophos;i="5.90,244,1643702400"; d="scan'208";a="525305398" Received: from mionica-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.148.41]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 02:05:30 -0700 From: Jani Nikula To: Christian =?utf-8?Q?K=C3=B6nig?= , daniel.vetter@ffwll.ch, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, intel-gfx@lists.freedesktop.org Cc: Christian =?utf-8?Q?K=C3=B6nig?= , Joonas Lahtinen , "Ursulin, Tvrtko" , Rodrigo Vivi Subject: Re: [PATCH 12/15] drm/i915: drop bo->moving dependency In-Reply-To: <20220407085946.744568-13-christian.koenig@amd.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220407085946.744568-1-christian.koenig@amd.com> <20220407085946.744568-13-christian.koenig@amd.com> Date: Fri, 08 Apr 2022 12:05:25 +0300 Message-ID: <87y20ghrmy.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Thu, 07 Apr 2022, "Christian K=C3=B6nig" wrote: > That should now be handled by the common dma_resv framework. > > Signed-off-by: Christian K=C3=B6nig > Reviewed-by: Daniel Vetter > Cc: intel-gfx@lists.freedesktop.org So, where are the i915 maintainer acks for merging this (and the other patches in the series touching i915) via drm-misc-next? Daniel's Reviewed-by is not an ack to merge outside drm-intel-next. We don't merge i915 stuff without passing CI results. Apparently this one failed enough machines that the CI had to be stopped entirely. BR, Jani. > --- > drivers/gpu/drm/i915/gem/i915_gem_object.c | 41 ++++--------------- > drivers/gpu/drm/i915/gem/i915_gem_object.h | 8 +--- > drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 15 +------ > .../drm/i915/gem/selftests/i915_gem_migrate.c | 3 +- > .../drm/i915/gem/selftests/i915_gem_mman.c | 3 +- > drivers/gpu/drm/i915/i915_vma.c | 9 +++- > 6 files changed, 21 insertions(+), 58 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm= /i915/gem/i915_gem_object.c > index 372bc220faeb..ffde7bc0a95d 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c > @@ -741,30 +741,19 @@ static const struct drm_gem_object_funcs i915_gem_o= bject_funcs =3D { > /** > * i915_gem_object_get_moving_fence - Get the object's moving fence if a= ny > * @obj: The object whose moving fence to get. > + * @fence: The resulting fence > * > * A non-signaled moving fence means that there is an async operation > * pending on the object that needs to be waited on before setting up > * any GPU- or CPU PTEs to the object's pages. > * > - * Return: A refcounted pointer to the object's moving fence if any, > - * NULL otherwise. > + * Return: Negative error code or 0 for success. > */ > -struct dma_fence * > -i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj) > +int i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj, > + struct dma_fence **fence) > { > - return dma_fence_get(i915_gem_to_ttm(obj)->moving); > -} > - > -void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, > - struct dma_fence *fence) > -{ > - struct dma_fence **moving =3D &i915_gem_to_ttm(obj)->moving; > - > - if (*moving =3D=3D fence) > - return; > - > - dma_fence_put(*moving); > - *moving =3D dma_fence_get(fence); > + return dma_resv_get_singleton(obj->base.resv, DMA_RESV_USAGE_KERNEL, > + fence); > } >=20=20 > /** > @@ -782,23 +771,9 @@ void i915_gem_object_set_moving_fence(struct drm_i91= 5_gem_object *obj, > int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, > bool intr) > { > - struct dma_fence *fence =3D i915_gem_to_ttm(obj)->moving; > - int ret; > - > assert_object_held(obj); > - if (!fence) > - return 0; > - > - ret =3D dma_fence_wait(fence, intr); > - if (ret) > - return ret; > - > - if (fence->error) > - return fence->error; > - > - i915_gem_to_ttm(obj)->moving =3D NULL; > - dma_fence_put(fence); > - return 0; > + return dma_resv_wait_timeout(obj->base. resv, DMA_RESV_USAGE_KERNEL, > + intr, MAX_SCHEDULE_TIMEOUT); > } >=20=20 > #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm= /i915/gem/i915_gem_object.h > index 02c37fe4a535..e11d82a9f7c3 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h > @@ -520,12 +520,8 @@ i915_gem_object_finish_access(struct drm_i915_gem_ob= ject *obj) > i915_gem_object_unpin_pages(obj); > } >=20=20 > -struct dma_fence * > -i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj); > - > -void i915_gem_object_set_moving_fence(struct drm_i915_gem_object *obj, > - struct dma_fence *fence); > - > +int i915_gem_object_get_moving_fence(struct drm_i915_gem_object *obj, > + struct dma_fence **fence); > int i915_gem_object_wait_moving_fence(struct drm_i915_gem_object *obj, > bool intr); >=20=20 > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c b/drivers/gpu/d= rm/i915/gem/i915_gem_ttm_move.c > index 438b8a95b3d1..a10716f4e717 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c > @@ -467,19 +467,6 @@ __i915_ttm_move(struct ttm_buffer_object *bo, > return fence; > } >=20=20 > -static int > -prev_deps(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx, > - struct i915_deps *deps) > -{ > - int ret; > - > - ret =3D i915_deps_add_dependency(deps, bo->moving, ctx); > - if (!ret) > - ret =3D i915_deps_add_resv(deps, bo->base.resv, ctx); > - > - return ret; > -} > - > /** > * i915_ttm_move - The TTM move callback used by i915. > * @bo: The buffer object. > @@ -534,7 +521,7 @@ int i915_ttm_move(struct ttm_buffer_object *bo, bool = evict, > struct i915_deps deps; >=20=20 > i915_deps_init(&deps, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN); > - ret =3D prev_deps(bo, ctx, &deps); > + ret =3D i915_deps_add_resv(&deps, bo->base.resv, ctx); > if (ret) { > i915_refct_sgt_put(dst_rsgt); > return ret; > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/driv= ers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > index 4997ed18b6e4..0ad443a90c8b 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c > @@ -219,8 +219,7 @@ static int __igt_lmem_pages_migrate(struct intel_gt *= gt, > err =3D dma_resv_reserve_fences(obj->base.resv, 1); > if (!err) > dma_resv_add_fence(obj->base.resv, &rq->fence, > - DMA_RESV_USAGE_WRITE); > - i915_gem_object_set_moving_fence(obj, &rq->fence); > + DMA_RESV_USAGE_KERNEL); > i915_request_put(rq); > } > if (err) > 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 3a6e3f6d239f..dfc34cc2ef8c 100644 > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c > @@ -1221,8 +1221,7 @@ static int __igt_mmap_migrate(struct intel_memory_r= egion **placements, > i915_gem_object_unpin_pages(obj); > if (rq) { > dma_resv_add_fence(obj->base.resv, &rq->fence, > - DMA_RESV_USAGE_WRITE); > - i915_gem_object_set_moving_fence(obj, &rq->fence); > + DMA_RESV_USAGE_KERNEL); > i915_request_put(rq); > } > i915_gem_object_unlock(obj); > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_= vma.c > index 524477d8939e..d077f7b9eaad 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -1357,10 +1357,17 @@ int i915_vma_pin_ww(struct i915_vma *vma, struct = i915_gem_ww_ctx *ww, > if (err) > return err; >=20=20 > + if (vma->obj) { > + err =3D i915_gem_object_get_moving_fence(vma->obj, &moving); > + if (err) > + return err; > + } else { > + moving =3D NULL; > + } > + > if (flags & PIN_GLOBAL) > wakeref =3D intel_runtime_pm_get(&vma->vm->i915->runtime_pm); >=20=20 > - moving =3D vma->obj ? i915_gem_object_get_moving_fence(vma->obj) : NULL; > if (flags & vma->vm->bind_async_flags || moving) { > /* lock VM */ > err =3D i915_vm_lock_objects(vma->vm, ww); --=20 Jani Nikula, Intel Open Source Graphics Center