From: "Christian König" <christian.koenig@amd.com>
To: Dave Airlie <airlied@gmail.com>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH 4/7] drm/ttm/drivers: call the bind function directly.
Date: Thu, 17 Sep 2020 09:49:04 +0200 [thread overview]
Message-ID: <926225ea-149c-1d35-6d30-96bb7a927b8f@amd.com> (raw)
In-Reply-To: <20200917043040.146575-5-airlied@gmail.com>
Am 17.09.20 um 06:30 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> Now the bind functions have all the protection explicitly the
> drivers can just call them directly, and the api can be unexported
>
> Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++++-
> drivers/gpu/drm/nouveau/nouveau_bo.c | 5 ++++-
> drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++++-
> drivers/gpu/drm/ttm/ttm_bo.c | 1 -
> 4 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 2028b9e4c25c..a57aaf666340 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -63,6 +63,10 @@
>
> #define AMDGPU_TTM_VRAM_MAX_DW_READ (size_t)128
>
> +static int amdgpu_ttm_backend_bind(struct ttm_bo_device *bdev,
> + struct ttm_tt *ttm,
> + struct ttm_resource *bo_mem);
> +
> static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
> unsigned int type,
> uint64_t size)
> @@ -552,7 +556,7 @@ static int amdgpu_move_vram_ram(struct ttm_buffer_object *bo, bool evict,
> goto out_cleanup;
>
> /* Bind the memory to the GTT space */
> - r = ttm_bo_tt_bind(bo, &tmp_mem);
> + r = amdgpu_ttm_backend_bind(bo->bdev, bo->ttm, &tmp_mem);
> if (unlikely(r)) {
> goto out_cleanup;
> }
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index 4a020a3da3dd..56f974c28eb5 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -44,6 +44,9 @@
> #include <nvif/if500b.h>
> #include <nvif/if900b.h>
>
> +static int nouveau_ttm_tt_bind(struct ttm_bo_device *bdev, struct ttm_tt *ttm,
> + struct ttm_resource *reg);
> +
> /*
> * NV10-NV40 tiling helpers
> */
> @@ -927,7 +930,7 @@ nouveau_bo_move_flipd(struct ttm_buffer_object *bo, bool evict, bool intr,
> if (ret)
> goto out;
>
> - ret = ttm_bo_tt_bind(bo, &tmp_reg);
> + ret = nouveau_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_reg);
> if (ret)
> goto out;
>
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index 03e5ae4e3bf6..99d9ca1087b7 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -56,6 +56,10 @@
> static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
> static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
>
> +static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev,
> + struct ttm_tt *ttm,
> + struct ttm_resource *bo_mem);
> +
> struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
> {
> struct radeon_mman *mman;
> @@ -238,7 +242,7 @@ static int radeon_move_vram_ram(struct ttm_buffer_object *bo,
> goto out_cleanup;
> }
>
> - r = ttm_bo_tt_bind(bo, &tmp_mem);
> + r = radeon_ttm_tt_bind(bo->bdev, bo->ttm, &tmp_mem);
> if (unlikely(r)) {
> goto out_cleanup;
> }
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 2c527cd20dfa..279a0e44a5ed 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1628,7 +1628,6 @@ int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem)
> {
> return bo->bdev->driver->ttm_tt_bind(bo->bdev, bo->ttm, mem);
> }
> -EXPORT_SYMBOL(ttm_bo_tt_bind);
>
> void ttm_bo_tt_unbind(struct ttm_buffer_object *bo)
> {
_______________________________________________
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-17 7:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 4:30 [PATCH 0/7] drm/ttm: bind/unbind + cleanups Dave Airlie
2020-09-17 4:30 ` [PATCH 1/7] drm/ttm: protect against reentrant bind in the drivers Dave Airlie
2020-09-17 7:45 ` Christian König
2020-09-17 4:30 ` [PATCH 2/7] drm/ttm: flip tt destroy ordering Dave Airlie
2020-09-17 7:47 ` Christian König
2020-09-17 4:30 ` [PATCH 3/7] drm/ttm: move unbind into the tt destroy Dave Airlie
2020-09-17 7:48 ` Christian König
2020-09-17 4:30 ` [PATCH 4/7] drm/ttm/drivers: call the bind function directly Dave Airlie
2020-09-17 7:49 ` Christian König [this message]
2020-09-17 4:30 ` [PATCH 5/7] drm/ttm: add a simple assign mem to bo wrapper Dave Airlie
2020-09-17 7:50 ` Christian König
2020-09-17 4:30 ` [PATCH 6/7] drm/ttm: move ghost object creation to a common function Dave Airlie
2020-09-17 7:55 ` Christian König
2020-09-17 4:30 ` [PATCH 7/7] drm/ttm: make common function for wait/free node path Dave Airlie
2020-09-17 7:57 ` 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=926225ea-149c-1d35-6d30-96bb7a927b8f@amd.com \
--to=christian.koenig@amd.com \
--cc=airlied@gmail.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