From: Daniel Vetter <daniel@ffwll.ch>
To: "Christian König" <ckoenig.leichtzumerken@gmail.com>
Cc: daniel@ffwll.ch, dri-devel@lists.freedesktop.org,
sumit.semwal@linaro.org, linaro-mm-sig@lists.linaro.org,
linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 2/4] drm/ttm: use the parent resv for ghost objects v2
Date: Tue, 8 Oct 2019 11:25:52 +0200 [thread overview]
Message-ID: <20191008092552.GG16989@phenom.ffwll.local> (raw)
In-Reply-To: <20190829142917.13058-3-christian.koenig@amd.com>
On Thu, Aug 29, 2019 at 04:29:15PM +0200, Christian König wrote:
> This way we can even pipeline imported BO evictions.
>
> v2: Limit this to only cases when the parent object uses a separate
> reservation object as well. This fixes another OOM problem.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
Since I read quite a bit of ttm I figured I'll review this too, but I'm
totally lost. And git blame gives me at best commits with one-liner commit
messages, and the docs aren't explaining much at all either (and generally
they didn't get updated at all with all the changes in the past years).
I have a vague idea of what you're doing here, but not enough to do review
with any confidence. And from other ttm patches from amd it feels a lot
like we have essentially a bus factor of 1 for all things ttm :-/
-Daniel
> ---
> drivers/gpu/drm/ttm/ttm_bo_util.c | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
> index fe81c565e7ef..2ebe9fe7f6c8 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_util.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
> @@ -517,7 +517,9 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
> kref_init(&fbo->base.kref);
> fbo->base.destroy = &ttm_transfered_destroy;
> fbo->base.acc_size = 0;
> - fbo->base.base.resv = &fbo->base.base._resv;
> + if (bo->base.resv == &bo->base._resv)
> + fbo->base.base.resv = &fbo->base.base._resv;
> +
> dma_resv_init(fbo->base.base.resv);
> ret = dma_resv_trylock(fbo->base.base.resv);
> WARN_ON(!ret);
> @@ -716,7 +718,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
> if (ret)
> return ret;
>
> - dma_resv_add_excl_fence(ghost_obj->base.resv, fence);
> + dma_resv_add_excl_fence(&ghost_obj->base._resv, fence);
>
> /**
> * If we're not moving to fixed memory, the TTM object
> @@ -729,7 +731,7 @@ int ttm_bo_move_accel_cleanup(struct ttm_buffer_object *bo,
> else
> bo->ttm = NULL;
>
> - ttm_bo_unreserve(ghost_obj);
> + dma_resv_unlock(&ghost_obj->base._resv);
> ttm_bo_put(ghost_obj);
> }
>
> @@ -772,7 +774,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
> if (ret)
> return ret;
>
> - dma_resv_add_excl_fence(ghost_obj->base.resv, fence);
> + dma_resv_add_excl_fence(&ghost_obj->base._resv, fence);
>
> /**
> * If we're not moving to fixed memory, the TTM object
> @@ -785,7 +787,7 @@ int ttm_bo_pipeline_move(struct ttm_buffer_object *bo,
> else
> bo->ttm = NULL;
>
> - ttm_bo_unreserve(ghost_obj);
> + dma_resv_unlock(&ghost_obj->base._resv);
> ttm_bo_put(ghost_obj);
>
> } else if (from->flags & TTM_MEMTYPE_FLAG_FIXED) {
> @@ -841,7 +843,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
> if (ret)
> return ret;
>
> - ret = dma_resv_copy_fences(ghost->base.resv, bo->base.resv);
> + ret = dma_resv_copy_fences(&ghost->base._resv, bo->base.resv);
> /* Last resort, wait for the BO to be idle when we are OOM */
> if (ret)
> ttm_bo_wait(bo, false, false);
> @@ -850,7 +852,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)
> bo->mem.mem_type = TTM_PL_SYSTEM;
> bo->ttm = NULL;
>
> - ttm_bo_unreserve(ghost);
> + dma_resv_unlock(&ghost->base._resv);
> ttm_bo_put(ghost);
>
> return 0;
> --
> 2.17.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2019-10-08 9:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-29 14:29 Dynamic DMA-buf locking changes Christian König
2019-08-29 14:29 ` [PATCH 1/4] dma-buf: change DMA-buf locking convention Christian König
2019-09-03 8:05 ` Daniel Vetter
2019-09-11 10:53 ` Christian König
2019-09-16 12:23 ` Christian König
2019-09-17 12:31 ` Daniel Vetter
2019-09-17 12:40 ` Koenig, Christian
2019-09-17 13:13 ` Daniel Vetter
2019-09-17 13:24 ` Koenig, Christian
2019-09-17 13:45 ` Daniel Vetter
2019-09-17 14:47 ` Koenig, Christian
2019-09-17 14:56 ` Daniel Vetter
2019-09-24 9:51 ` Koenig, Christian
2019-10-02 8:37 ` Koenig, Christian
2019-10-08 8:55 ` Daniel Vetter
2019-10-16 13:46 ` Koenig, Christian
2019-10-16 14:23 ` Daniel Vetter
2019-10-17 9:04 ` Koenig, Christian
2019-10-08 8:55 ` Daniel Vetter
2019-08-29 14:29 ` [PATCH 2/4] drm/ttm: use the parent resv for ghost objects v2 Christian König
2019-10-08 9:25 ` Daniel Vetter [this message]
2019-10-09 13:10 ` Christian König
2019-10-09 14:09 ` Daniel Vetter
2019-08-29 14:29 ` [PATCH 3/4] drm/amdgpu: add independent DMA-buf export v7 Christian König
2019-08-29 14:29 ` [PATCH 4/4] drm/amdgpu: add independent DMA-buf import v8 Christian König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191008092552.GG16989@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=ckoenig.leichtzumerken@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-media@vger.kernel.org \
--cc=sumit.semwal@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).