From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: bob.beckett@collabora.com, dri-devel@lists.freedesktop.org
Cc: "Christian König" <christian.koenig@amd.com>
Subject: [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX
Date: Tue, 29 Mar 2022 13:02:36 +0200 [thread overview]
Message-ID: <20220329110243.6335-5-christian.koenig@amd.com> (raw)
In-Reply-To: <20220329110243.6335-1-christian.koenig@amd.com>
It's the only driver using this.
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/ttm/ttm_bo.c | 9 +--------
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 11 ++++++++++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index e5fd0f2c0299..7598d59423bf 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -44,12 +44,6 @@
#include "ttm_module.h"
-/* default destructor */
-static void ttm_bo_default_destroy(struct ttm_buffer_object *bo)
-{
- kfree(bo);
-}
-
static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,
struct ttm_placement *placement)
{
@@ -938,8 +932,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev,
bool locked;
int ret;
- bo->destroy = destroy ? destroy : ttm_bo_default_destroy;
-
+ bo->destroy = destroy;
kref_init(&bo->kref);
INIT_LIST_HEAD(&bo->ddestroy);
bo->bdev = bdev;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
index 31aecc46624b..60dcc6a75248 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_bo.c
@@ -378,6 +378,12 @@ void vmw_bo_bo_free(struct ttm_buffer_object *bo)
kfree(vmw_bo);
}
+/* default destructor */
+static void vmw_bo_default_destroy(struct ttm_buffer_object *bo)
+{
+ kfree(bo);
+}
+
/**
* vmw_bo_create_kernel - Create a pinned BO for internal kernel use.
*
@@ -410,7 +416,7 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size,
ret = ttm_bo_init_reserved(&dev_priv->bdev, bo, size,
ttm_bo_type_kernel, placement, 0,
- &ctx, NULL, NULL, NULL);
+ &ctx, NULL, NULL, vmw_bo_default_destroy);
if (unlikely(ret))
goto error_free;
@@ -439,6 +445,9 @@ int vmw_bo_create(struct vmw_private *vmw,
return -ENOMEM;
}
+ if (!bo_free)
+ bo_free = vmw_bo_default_destroy;
+
ret = vmw_bo_init(vmw, *p_bo, size,
placement, interruptible, pin,
bo_free);
--
2.25.1
next prev parent reply other threads:[~2022-03-29 11:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 11:02 Allow ttm_buffer_object without resource Christian König
2022-03-29 11:02 ` [PATCH 01/11] drm/radeon: switch over to ttm_bo_init_reserved Christian König
2022-03-29 11:02 ` [PATCH 02/11] drm/nouveau: " Christian König
2022-03-29 11:02 ` [PATCH 03/11] drm/vram-helper: " Christian König
2022-03-29 11:02 ` Christian König [this message]
2022-04-18 19:45 ` [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX Zack Rusin
2022-03-29 11:02 ` [PATCH 05/11] drm/ttm: drop ttm_bo_init Christian König
2022-03-29 11:02 ` [PATCH 06/11] drm/ttm: rename and cleanup ttm_bo_init_reserved Christian König
2022-03-29 11:02 ` [PATCH 07/11] drm/amdgpu: audit bo->resource usage Christian König
2022-03-29 11:02 ` [PATCH 08/11] drm/nouveau: " Christian König
2022-03-29 11:02 ` [PATCH 09/11] drm/ttm: " Christian König
2022-03-29 11:02 ` [PATCH 10/11] drm/ttm: stop allocating dummy resources during BO creation Christian König
2022-03-29 11:02 ` [PATCH 11/11] drm/ttm: stop allocating a dummy resource for pipelined gutting Christian König
2022-03-29 14:02 ` Allow ttm_buffer_object without resource Daniel Vetter
2022-03-30 10:49 ` Christian König
2022-05-09 13:09 Improve TTMs empty object handling Christian König
2022-05-09 13:09 ` [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX Christian König
2022-05-19 9:54 Christian König
2022-05-19 9:55 ` [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX Christian König
2022-05-19 13:36 ` Ruhl, Michael J
2022-05-20 7:14 ` 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=20220329110243.6335-5-christian.koenig@amd.com \
--to=ckoenig.leichtzumerken@gmail.com \
--cc=bob.beckett@collabora.com \
--cc=christian.koenig@amd.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.