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: drop unbind callback.
Date: Tue, 20 Oct 2020 14:04:50 +0200 [thread overview]
Message-ID: <1e1bae36-abce-c5c2-a845-b09155601f86@amd.com> (raw)
In-Reply-To: <20201020010319.1692445-5-airlied@gmail.com>
Am 20.10.20 um 03:03 schrieb Dave Airlie:
> From: Dave Airlie <airlied@redhat.com>
>
> The drivers now control this, so drop unbinding.
>
> 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 | 1 -
> drivers/gpu/drm/nouveau/nouveau_bo.c | 1 -
> drivers/gpu/drm/qxl/qxl_ttm.c | 7 -------
> drivers/gpu/drm/radeon/radeon_ttm.c | 1 -
> drivers/gpu/drm/ttm/ttm_bo.c | 5 -----
> drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 -
> include/drm/ttm/ttm_bo_driver.h | 18 ------------------
> 7 files changed, 34 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index fcec99aea019..ac93a537f2e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@ -1722,7 +1722,6 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
> .ttm_tt_populate = &amdgpu_ttm_tt_populate,
> .ttm_tt_unpopulate = &amdgpu_ttm_tt_unpopulate,
> .ttm_tt_bind = &amdgpu_ttm_backend_bind,
> - .ttm_tt_unbind = &amdgpu_ttm_backend_unbind,
> .ttm_tt_destroy = &amdgpu_ttm_backend_destroy,
> .eviction_valuable = amdgpu_ttm_bo_eviction_valuable,
> .evict_flags = &amdgpu_evict_flags,
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c
> index c58c8951f72f..7fb65b87f815 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
> @@ -1394,7 +1394,6 @@ struct ttm_bo_driver nouveau_bo_driver = {
> .ttm_tt_populate = &nouveau_ttm_tt_populate,
> .ttm_tt_unpopulate = &nouveau_ttm_tt_unpopulate,
> .ttm_tt_bind = &nouveau_ttm_tt_bind,
> - .ttm_tt_unbind = &nouveau_ttm_tt_unbind,
> .ttm_tt_destroy = &nouveau_ttm_tt_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = nouveau_bo_evict_flags,
> diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
> index e3ed20215f18..95c4f2c7ab79 100644
> --- a/drivers/gpu/drm/qxl/qxl_ttm.c
> +++ b/drivers/gpu/drm/qxl/qxl_ttm.c
> @@ -113,12 +113,6 @@ static int qxl_ttm_backend_bind(struct ttm_bo_device *bdev,
> return -1;
> }
>
> -static void qxl_ttm_backend_unbind(struct ttm_bo_device *bdev,
> - struct ttm_tt *ttm)
> -{
> - /* Not implemented */
> -}
> -
> static void qxl_ttm_backend_destroy(struct ttm_bo_device *bdev,
> struct ttm_tt *ttm)
> {
> @@ -180,7 +174,6 @@ static struct ttm_bo_driver qxl_bo_driver = {
> .ttm_tt_create = &qxl_ttm_tt_create,
> .ttm_tt_bind = &qxl_ttm_backend_bind,
> .ttm_tt_destroy = &qxl_ttm_backend_destroy,
> - .ttm_tt_unbind = &qxl_ttm_backend_unbind,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = &qxl_evict_flags,
> .move = &qxl_bo_move,
> diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> index d3d39823b69f..7fe4a98ece54 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -817,7 +817,6 @@ static struct ttm_bo_driver radeon_bo_driver = {
> .ttm_tt_populate = &radeon_ttm_tt_populate,
> .ttm_tt_unpopulate = &radeon_ttm_tt_unpopulate,
> .ttm_tt_bind = &radeon_ttm_tt_bind,
> - .ttm_tt_unbind = &radeon_ttm_tt_unbind,
> .ttm_tt_destroy = &radeon_ttm_tt_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = &radeon_evict_flags,
> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
> index 7602d7734d38..358d09ef852a 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo.c
> @@ -1493,8 +1493,3 @@ 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);
> }
> -
> -void ttm_bo_tt_unbind(struct ttm_buffer_object *bo)
> -{
> - bo->bdev->driver->ttm_tt_unbind(bo->bdev, bo->ttm);
> -}
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> index 1d220a9794e6..6e07ea982961 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c
> @@ -760,7 +760,6 @@ struct ttm_bo_driver vmw_bo_driver = {
> .ttm_tt_populate = &vmw_ttm_populate,
> .ttm_tt_unpopulate = &vmw_ttm_unpopulate,
> .ttm_tt_bind = &vmw_ttm_bind,
> - .ttm_tt_unbind = &vmw_ttm_unbind,
> .ttm_tt_destroy = &vmw_ttm_destroy,
> .eviction_valuable = ttm_bo_eviction_valuable,
> .evict_flags = vmw_evict_flags,
> diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
> index 81a1618b9535..fbbcf10670c1 100644
> --- a/include/drm/ttm/ttm_bo_driver.h
> +++ b/include/drm/ttm/ttm_bo_driver.h
> @@ -104,17 +104,6 @@ struct ttm_bo_driver {
> */
> int (*ttm_tt_bind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm, struct ttm_resource *bo_mem);
>
> - /**
> - * ttm_tt_unbind
> - *
> - * @bdev: Pointer to a ttm device
> - * @ttm: Pointer to a struct ttm_tt.
> - *
> - * Unbind previously bound backend pages. This function should be
> - * able to handle differences between aperture and system page sizes.
> - */
> - void (*ttm_tt_unbind)(struct ttm_bo_device *bdev, struct ttm_tt *ttm);
> -
> /**
> * ttm_tt_destroy
> *
> @@ -647,13 +636,6 @@ pgprot_t ttm_io_prot(struct ttm_buffer_object *bo, struct ttm_resource *res,
> */
> int ttm_bo_tt_bind(struct ttm_buffer_object *bo, struct ttm_resource *mem);
>
> -/**
> - * ttm_bo_tt_bind
> - *
> - * Unbind the object tt from a memory resource.
> - */
> -void ttm_bo_tt_unbind(struct ttm_buffer_object *bo);
> -
> /**
> * ttm_bo_tt_destroy.
> */
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-20 12:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 1:03 [PATCH 0/7] drm/ttm: get rid of bind/unbind Dave Airlie
2020-10-20 1:03 ` [PATCH 1/7] drm/ttm: move some move binds into the drivers Dave Airlie
2020-10-20 10:20 ` Christian König
2020-10-20 1:03 ` [PATCH 2/7] drm/ttm: minor cleanup to move to system Dave Airlie
2020-10-20 10:22 ` Christian König
2020-10-20 1:03 ` [PATCH 3/7] drm/ttm: add move to system into drivers Dave Airlie
2020-10-20 12:03 ` Christian König
2020-10-20 1:03 ` [PATCH 4/7] drm/ttm: drop unbind callback Dave Airlie
2020-10-20 12:04 ` Christian König [this message]
2020-10-20 1:03 ` [PATCH 5/7] drm/ttm: remove move to new and inline into remainging place Dave Airlie
2020-10-20 12:06 ` Christian König
2020-10-20 1:03 ` [PATCH 6/7] drm/ttm: drop move notify around move Dave Airlie
2020-10-20 12:15 ` Christian König
2020-10-20 1:03 ` [PATCH 7/7] drm/ttm: move last binding into the drivers Dave Airlie
2020-10-20 12:16 ` 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=1e1bae36-abce-c5c2-a845-b09155601f86@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