From: "Christian König" <christian.koenig@amd.com>
To: Dave Airlie <airlied@gmail.com>, dri-devel@lists.freedesktop.org
Cc: bskeggs@redhat.com
Subject: Re: [PATCH 04/10] drm/nouveau/ttm: plumb ctx through move functions.
Date: Wed, 23 Sep 2020 16:39:22 +0200 [thread overview]
Message-ID: <dddc02ee-1efc-4339-1b97-5bb0ada3706c@amd.com> (raw)
In-Reply-To: <20200923030454.362731-5-airlied@gmail.com>
Am 23.09.20 um 05:04 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> This just uses the ctx instead of passing bools and recreating it.
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/nouveau/nouveau_bo.c | 48 +++++++++++++---------------
> 1 file changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index bcae4514952f..8a90b07f17a4 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -772,8 +772,9 @@ nouveau_bo_move_prep(struct nouveau_drm *drm, struct ttm_buffer_object *bo,
> }
>
> static int
> -nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
> - bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict,
> + struct ttm_operation_ctx *ctx,
> + struct ttm_resource *new_reg)
> {
> struct nouveau_drm *drm = nouveau_bdev(bo->bdev);
> struct nouveau_channel *chan = drm->ttm.chan;
> @@ -792,7 +793,7 @@ nouveau_bo_move_m2mf(struct ttm_buffer_object *bo, int evict, bool intr,
> }
>
> mutex_lock_nested(&cli->mutex, SINGLE_DEPTH_NESTING);
> - ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, intr);
> + ret = nouveau_fence_sync(nouveau_bo(bo), chan, true, ctx->interruptible);
> if (ret == 0) {
> ret = drm->ttm.move(chan, bo, &bo->mem, new_reg);
> if (ret == 0) {
> @@ -879,10 +880,10 @@ nouveau_bo_move_init(struct nouveau_drm *drm)
> }
>
> static int
> -nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
> - bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict,
> + struct ttm_operation_ctx *ctx,
> + struct ttm_resource *new_reg)
> {
> - struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
> struct ttm_place placement_memtype = {
> .fpfn = 0,
> .lpfn = 0,
> @@ -898,11 +899,11 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
>
> tmp_reg = *new_reg;
> tmp_reg.mm_node = NULL;
> - ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
> + ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
> if (ret)
> return ret;
>
> - ret = ttm_tt_populate(bo->bdev, bo->ttm, &ctx);
> + ret = ttm_tt_populate(bo->bdev, bo->ttm, ctx);
> if (ret)
> goto out;
>
> @@ -910,21 +911,21 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
> if (ret)
> goto out;
>
> - ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, &tmp_reg);
> + ret = nouveau_bo_move_m2mf(bo, true, ctx, &tmp_reg);
> if (ret)
> goto out;
>
> - ret = ttm_bo_move_ttm(bo, &ctx, new_reg);
> + ret = ttm_bo_move_ttm(bo, ctx, new_reg);
> out:
> ttm_resource_free(bo, &tmp_reg);
> return ret;
> }
>
> static int
> -nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
> - bool no_wait_gpu, struct ttm_resource *new_reg)
> +nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict,
> + struct ttm_operation_ctx *ctx,
> + struct ttm_resource *new_reg)
> {
> - struct ttm_operation_ctx ctx = { intr, no_wait_gpu };
> struct ttm_place placement_memtype = {
> .fpfn = 0,
> .lpfn = 0,
> @@ -940,15 +941,15 @@ nouveau_bo_move_flips(struct ttm_buffer_object *bo, bool evict, bool intr,
>
> tmp_reg = *new_reg;
> tmp_reg.mm_node = NULL;
> - ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, &ctx);
> + ret = ttm_bo_mem_space(bo, &placement, &tmp_reg, ctx);
> if (ret)
> return ret;
>
> - ret = ttm_bo_move_ttm(bo, &ctx, &tmp_reg);
> + ret = ttm_bo_move_ttm(bo, ctx, &tmp_reg);
> if (ret)
> goto out;
>
> - ret = nouveau_bo_move_m2mf(bo, true, intr, no_wait_gpu, new_reg);
> + ret = nouveau_bo_move_m2mf(bo, true, ctx, new_reg);
> if (ret)
> goto out;
>
> @@ -1059,17 +1060,14 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict,
> /* Hardware assisted copy. */
> if (drm->ttm.move) {
> if (new_reg->mem_type == TTM_PL_SYSTEM)
> - ret = nouveau_bo_move_flipd(bo, evict,
> - ctx->interruptible,
> - ctx->no_wait_gpu, new_reg);
> + ret = nouveau_bo_move_flipd(bo, evict, ctx,
> + new_reg);
> else if (old_reg->mem_type == TTM_PL_SYSTEM)
> - ret = nouveau_bo_move_flips(bo, evict,
> - ctx->interruptible,
> - ctx->no_wait_gpu, new_reg);
> + ret = nouveau_bo_move_flips(bo, evict, ctx,
> + new_reg);
> else
> - ret = nouveau_bo_move_m2mf(bo, evict,
> - ctx->interruptible,
> - ctx->no_wait_gpu, new_reg);
> + ret = nouveau_bo_move_m2mf(bo, evict, ctx,
> + new_reg);
> if (!ret)
> goto out;
> }
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-09-23 14:39 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 3:04 [PATCH 00/10] ttm driver cleanups and invert move Dave Airlie
2020-09-23 3:04 ` [PATCH 01/10] drm/radeon: kill radeon_bo_wait Dave Airlie
2020-09-23 14:34 ` Christian König
2020-09-23 3:04 ` [PATCH 02/10] drm/qxl: kill unused bo wait wrapper Dave Airlie
2020-09-23 14:35 ` Christian König
2020-09-23 3:04 ` [PATCH 03/10] drm/radeon: cleanup ttm operation ctx usage Dave Airlie
2020-09-23 14:38 ` Christian König
2020-09-23 3:04 ` [PATCH 04/10] drm/nouveau/ttm: plumb ctx through move functions Dave Airlie
2020-09-23 14:39 ` Christian König [this message]
2020-09-23 3:04 ` [PATCH 05/10] drm/ttm: add bo wait that takes a ctx wrapper Dave Airlie
2020-09-23 14:40 ` Christian König
2020-09-23 3:04 ` [PATCH 06/10] drm/ttm: handle the SYSTEM->TT path in same place as others Dave Airlie
2020-09-23 3:04 ` [PATCH 07/10] drm/amdgpu/ttm: handle tt moves properly Dave Airlie
2020-09-23 14:45 ` Christian König
2020-09-24 0:46 ` Dave Airlie
2020-09-24 2:35 ` Dave Airlie
2020-09-24 9:48 ` Christian König
2020-09-23 3:04 ` [PATCH 08/10] drm/radeon/ttm: handle ttm " Dave Airlie
2020-09-23 3:04 ` [PATCH 09/10] drm/nouveau/ttm: " Dave Airlie
2020-09-23 3:04 ` [PATCH 10/10] drm/ttm: reverse move calling pattern Dave Airlie
2020-09-23 14:45 ` Christian König
2020-09-23 20:43 ` Dave Airlie
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=dddc02ee-1efc-4339-1b97-5bb0ada3706c@amd.com \
--to=christian.koenig@amd.com \
--cc=airlied@gmail.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.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