All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: christian.koenig@amd.com, sroland@vmware.com, bskeggs@redhat.com,
	kraxel@redhat.com
Subject: [PATCH 05/49] drm/amdgpu/ttm: init managers from the driver side.
Date: Fri, 31 Jul 2020 14:04:36 +1000	[thread overview]
Message-ID: <20200731040520.3701599-6-airlied@gmail.com> (raw)
In-Reply-To: <20200731040520.3701599-1-airlied@gmail.com>

From: Dave Airlie <airlied@redhat.com>

Use new init calls to unwrap manager init

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c  | 19 ++++++----
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c      | 37 +++-----------------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h      |  4 +--
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 19 ++++++----
 4 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 77fae40197ab..5f58aa2eac4a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@ -76,6 +76,7 @@ static DEVICE_ATTR(mem_info_gtt_total, S_IRUGO,
 static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
 	           amdgpu_mem_info_gtt_used_show, NULL);
 
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
 /**
  * amdgpu_gtt_mgr_init - init GTT manager and DRM MM
  *
@@ -84,14 +85,20 @@ static DEVICE_ATTR(mem_info_gtt_used, S_IRUGO,
  *
  * Allocate and initialize the GTT manager.
  */
-static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
-			       unsigned long p_size)
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
 	struct amdgpu_gtt_mgr *mgr;
 	uint64_t start, size;
 	int ret;
 
+	man->use_tt = true;
+	man->func = &amdgpu_gtt_mgr_func;
+	man->available_caching = TTM_PL_MASK_CACHING;
+	man->default_caching = TTM_PL_FLAG_CACHED;
+
+	ttm_bo_init_mm_base(&adev->mman.bdev, man, gtt_size >> PAGE_SHIFT);
+
 	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
 	if (!mgr)
 		return -ENOMEM;
@@ -100,7 +107,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
 	size = (adev->gmc.gart_size >> PAGE_SHIFT) - start;
 	drm_mm_init(&mgr->mm, start, size);
 	spin_lock_init(&mgr->lock);
-	atomic64_set(&mgr->available, p_size);
+	atomic64_set(&mgr->available, gtt_size >> PAGE_SHIFT);
 	man->priv = mgr;
 
 	ret = device_create_file(adev->dev, &dev_attr_mem_info_gtt_total);
@@ -114,6 +121,7 @@ static int amdgpu_gtt_mgr_init(struct ttm_mem_type_manager *man,
 		return ret;
 	}
 
+	ttm_bo_use_mm(man);
 	return 0;
 }
 
@@ -298,8 +306,7 @@ static void amdgpu_gtt_mgr_debug(struct ttm_mem_type_manager *man,
 		   amdgpu_gtt_mgr_usage(man) >> 20);
 }
 
-const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
-	.init = amdgpu_gtt_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func = {
 	.takedown = amdgpu_gtt_mgr_fini,
 	.get_node = amdgpu_gtt_mgr_new,
 	.put_node = amdgpu_gtt_mgr_del,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index d3e3cad4d0cb..f1bf86b8de14 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -63,43 +63,16 @@
 
 #define AMDGPU_TTM_VRAM_MAX_DW_READ	(size_t)128
 
-static int amdgpu_ttm_init_vram(struct amdgpu_device *adev)
-{
-
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
-
-	man->func = &amdgpu_vram_mgr_func;
-	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
-	man->default_caching = TTM_PL_FLAG_WC;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_VRAM,
-			      adev->gmc.real_vram_size >> PAGE_SHIFT);
-}
-
-static int amdgpu_ttm_init_gtt(struct amdgpu_device *adev, uint64_t gtt_size)
-{
-	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_TT];
-
-	man->use_tt = true;
-	man->func = &amdgpu_gtt_mgr_func;
-	man->available_caching = TTM_PL_MASK_CACHING;
-	man->default_caching = TTM_PL_FLAG_CACHED;
-
-	return ttm_bo_init_mm(&adev->mman.bdev, TTM_PL_TT,
-			      gtt_size >> PAGE_SHIFT);
-}
-
 static int amdgpu_ttm_init_on_chip(struct amdgpu_device *adev,
-				   unsigned int type,
-				   uint64_t size)
+				    unsigned int type,
+				    uint64_t size)
 {
 	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[type];
 
-	man->func = &ttm_bo_manager_func;
 	man->available_caching = TTM_PL_FLAG_UNCACHED;
 	man->default_caching = TTM_PL_FLAG_UNCACHED;
 
-	return ttm_bo_init_mm(&adev->mman.bdev, type, size);
+	return ttm_bo_man_init(&adev->mman.bdev, man, size >> PAGE_SHIFT);
 }
 
 /**
@@ -1915,7 +1888,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
 	adev->mman.bdev.no_retry = true;
 
 	/* Initialize VRAM pool with all of VRAM divided into pages */
-	r = amdgpu_ttm_init_vram(adev);
+	r = amdgpu_vram_mgr_init(adev);
 	if (r) {
 		DRM_ERROR("Failed initializing VRAM heap.\n");
 		return r;
@@ -1982,7 +1955,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
 		gtt_size = (uint64_t)amdgpu_gtt_size << 20;
 
 	/* Initialize GTT memory pool */
-	r = amdgpu_ttm_init_gtt(adev, gtt_size);
+	r = amdgpu_gtt_mgr_init(adev, gtt_size);
 	if (r) {
 		DRM_ERROR("Failed initializing GTT heap.\n");
 		return r;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
index 17c8d0d7bcc3..fb45c0a323b0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
@@ -67,8 +67,8 @@ struct amdgpu_copy_mem {
 	unsigned long			offset;
 };
 
-extern const struct ttm_mem_type_manager_func amdgpu_gtt_mgr_func;
-extern const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size);
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev);
 
 bool amdgpu_gtt_mgr_has_gart_addr(struct ttm_mem_reg *mem);
 uint64_t amdgpu_gtt_mgr_usage(struct ttm_mem_type_manager *man);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
index 134cc36e30c5..1bc04835c24f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
@@ -158,6 +158,8 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
 	NULL
 };
 
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func;
+
 /**
  * amdgpu_vram_mgr_init - init VRAM manager and DRM MM
  *
@@ -166,18 +168,23 @@ static const struct attribute *amdgpu_vram_mgr_attributes[] = {
  *
  * Allocate and initialize the VRAM manager.
  */
-static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
-				unsigned long p_size)
+int amdgpu_vram_mgr_init(struct amdgpu_device *adev)
 {
-	struct amdgpu_device *adev = amdgpu_ttm_adev(man->bdev);
+	struct ttm_mem_type_manager *man = &adev->mman.bdev.man[TTM_PL_VRAM];
 	struct amdgpu_vram_mgr *mgr;
 	int ret;
 
+	man->available_caching = TTM_PL_FLAG_UNCACHED | TTM_PL_FLAG_WC;
+	man->default_caching = TTM_PL_FLAG_WC;
+
+	ttm_bo_init_mm_base(&adev->mman.bdev, man, adev->gmc.real_vram_size >> PAGE_SHIFT);
+
+	man->func = &amdgpu_vram_mgr_func;
 	mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
 	if (!mgr)
 		return -ENOMEM;
 
-	drm_mm_init(&mgr->mm, 0, p_size);
+	drm_mm_init(&mgr->mm, 0, man->size);
 	spin_lock_init(&mgr->lock);
 	man->priv = mgr;
 
@@ -186,6 +193,7 @@ static int amdgpu_vram_mgr_init(struct ttm_mem_type_manager *man,
 	if (ret)
 		DRM_ERROR("Failed to register sysfs\n");
 
+	ttm_bo_use_mm(man);
 	return 0;
 }
 
@@ -587,8 +595,7 @@ static void amdgpu_vram_mgr_debug(struct ttm_mem_type_manager *man,
 		   amdgpu_vram_mgr_vis_usage(man) >> 20);
 }
 
-const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
-	.init		= amdgpu_vram_mgr_init,
+static const struct ttm_mem_type_manager_func amdgpu_vram_mgr_func = {
 	.takedown	= amdgpu_vram_mgr_fini,
 	.get_node	= amdgpu_vram_mgr_new,
 	.put_node	= amdgpu_vram_mgr_del,
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-07-31  4:05 UTC|newest]

Thread overview: 99+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31  4:04 [PATCH 00/49] ttm mem manager refactoring Dave Airlie
2020-07-31  4:04 ` [PATCH 01/49] drm/qxl/ttm: call ttm manager debug Dave Airlie
2020-07-31  4:04 ` [PATCH 02/49] drm/vram-helper: call the ttm manager debug function Dave Airlie
2020-07-31  6:43   ` Thomas Zimmermann
2020-07-31  4:04 ` [PATCH 03/49] drm/ttm: split the mm manager init code Dave Airlie
2020-07-31  5:44   ` Sam Ravnborg
2020-07-31  5:51     ` Dave Airlie
2020-07-31  6:26       ` Dave Airlie
2020-07-31  6:43         ` Sam Ravnborg
2020-07-31  9:12   ` Christian König
2020-07-31  4:04 ` [PATCH 04/49] drm/ttm: provide a driver-led init path for generic mm manager Dave Airlie
2020-07-31  6:57   ` Thomas Zimmermann
2020-07-31  7:03     ` Thomas Zimmermann
2020-07-31  7:20     ` Dave Airlie
2020-07-31 13:00   ` Christian König
2020-07-31  4:04 ` Dave Airlie [this message]
2020-07-31  4:04 ` [PATCH 06/49] drm/radeon: use new ttm man init path Dave Airlie
2020-07-31  4:04 ` [PATCH 07/49] drm/qxl/ttm: use new init path for manager Dave Airlie
2020-07-31  4:04 ` [PATCH 08/49] drm/vram_helper: use new ttm manager init function Dave Airlie
2020-07-31  4:04 ` [PATCH 09/49] drm/nouveau: use new memory manager init paths Dave Airlie
2020-07-31  4:04 ` [PATCH 10/49] drm/vmwgfx/ttm: convert vram mm init to new code paths Dave Airlie
2020-07-31  4:04 ` [PATCH 11/49] drm/vmwgfx/ttm: switch gmrid allocator to new init paths Dave Airlie
2020-07-31  4:04 ` [PATCH 12/49] drm/ttm: convert system manager init to new code Dave Airlie
2020-07-31 12:57   ` Christian König
2020-07-31  4:04 ` [PATCH 13/49] drm/ttm: purge old manager init path Dave Airlie
2020-07-31 12:58   ` Christian König
2020-07-31  4:04 ` [PATCH 14/49] drm/ttm: pass man around instead of mem_type in some places Dave Airlie
2020-07-31 13:04   ` Christian König
2020-07-31  4:04 ` [PATCH 15/49] drm/ttm: make some inline helper functions for cleanup paths Dave Airlie
2020-07-31 13:07   ` Christian König
2020-08-04  2:28     ` Dave Airlie
2020-07-31  4:04 ` [PATCH 16/49] drm/ttm: start allowing drivers to use new takedown path Dave Airlie
2020-07-31 13:09   ` Christian König
2020-07-31  4:04 ` [PATCH 17/49] drm/amdgpu/ttm: " Dave Airlie
2020-07-31 13:08   ` Christian König
2020-07-31  4:04 ` [PATCH 18/49] drm/vmwgfx: takedown vram manager Dave Airlie
2020-07-31  4:04 ` [PATCH 19/49] drm/vram_helper: call explicit mm takedown Dave Airlie
2020-07-31  4:04 ` [PATCH 20/49] drm/nouveau: use new cleanup paths Dave Airlie
2020-07-31  4:04 ` [PATCH 21/49] drm/radeon/ttm: use new takedown paths Dave Airlie
2020-07-31 13:10   ` Christian König
2020-07-31  4:04 ` [PATCH 22/49] drm/qxl/ttm: use new takedown path Dave Airlie
2020-07-31  4:04 ` [PATCH 23/49] drm/vmwgfx: fix gmrid takedown paths to new interface Dave Airlie
2020-07-31  4:04 ` [PATCH 24/49] drm/ttm: remove range manager legacy takedown path Dave Airlie
2020-07-31 13:11   ` Christian König
2020-07-31  4:04 ` [PATCH 25/49] drm/ttm: make TTM responsible for cleaning system only Dave Airlie
2020-07-31 13:19   ` Christian König
2020-07-31  4:04 ` [PATCH 26/49] drm/ttm: add wrapper to get manager from bdev Dave Airlie
2020-07-31  7:14   ` Thomas Zimmermann
2020-07-31  7:21     ` Dave Airlie
2020-07-31 13:18       ` daniel
2020-07-31 13:23   ` Christian König
2020-07-31 21:06     ` Dave Airlie
2020-07-31  4:04 ` [PATCH 27/49] drm/amdgfx/ttm: use wrapper to get ttm memory managers Dave Airlie
2020-07-31  4:04 ` [PATCH 28/49] drm/vram-helper: use wrapper to access " Dave Airlie
2020-07-31  4:05 ` [PATCH 29/49] drm/nouveau/ttm: " Dave Airlie
2020-07-31  4:05 ` [PATCH 30/49] drm/qxl/ttm: use wrapper to access memory manager Dave Airlie
2020-07-31  4:05 ` [PATCH 31/49] drm/radeon/ttm: " Dave Airlie
2020-07-31  4:05 ` [PATCH 32/49] drm/vmwgfx/ttm: " Dave Airlie
2020-07-31  4:05 ` [PATCH 33/49] drm/ttm: rename manager variable to make sure wrapper is used Dave Airlie
2020-07-31  4:05 ` [PATCH 34/49] drm/ttm: make manager debug function optional Dave Airlie
2020-07-31  9:46   ` daniel
2020-07-31 13:03     ` Christian König
2020-07-31 13:24   ` Christian König
2020-07-31  4:05 ` [PATCH 35/49] drm/nouveau/ttm: don't fill in blank ttm debug callback Dave Airlie
2020-07-31 13:25   ` Christian König
2020-07-31  4:05 ` [PATCH 36/49] drm/vmwgfx/gmrid: don't provide pointless " Dave Airlie
2020-07-31 13:26   ` Christian König
2020-07-31  4:05 ` [PATCH 37/49] drm/ttm: allow drivers to provide their own manager subclasses Dave Airlie
2020-07-31  4:05 ` [PATCH 38/49] drm/amdgpu/ttm: use bo manager subclassing for vram/gtt mgrs Dave Airlie
2020-07-31 13:29   ` Christian König
2020-07-31  4:05 ` [PATCH 39/49] drm/ttm: make ttm_bo_man_init/takedown take type + args Dave Airlie
2020-07-31 13:32   ` Christian König
2020-08-04  1:42     ` Dave Airlie
2020-08-04 10:26       ` Christian König
2020-08-06  3:46         ` Dave Airlie
2020-08-06  8:24           ` Christian König
2020-07-31  4:05 ` [PATCH 40/49] drm/ttm: move range manager to subclassed driver allocation Dave Airlie
2020-07-31 13:33   ` Christian König
2020-07-31  4:05 ` [PATCH 41/49] drm/vmwgfx/ttm: move thp to driver managed Dave Airlie
2020-07-31  4:05 ` [PATCH 42/49] drm/vmwgfx/gmrid: convert to driver controlled allocation Dave Airlie
2020-07-31  4:05 ` [PATCH 43/49] drm/nouveau/ttm: move to driver allocated manager Dave Airlie
2020-07-31  4:05 ` [PATCH 44/49] drm/ttm: drop priv pointer in memory manager Dave Airlie
2020-07-31 13:33   ` Christian König
2020-07-31  4:05 ` [PATCH 45/49] drm/amdgpu/ttm: remove man->bdev references Dave Airlie
2020-07-31 14:55   ` Christian König
2020-07-31  4:05 ` [PATCH 46/49] drm/ttm: drop man->bdev link Dave Airlie
2020-07-31 14:54   ` Christian König
2020-07-31  4:05 ` [PATCH 47/49] drm/ttm: drop list of memory managers from device Dave Airlie
2020-07-31  9:55   ` daniel
2020-07-31 14:57   ` Christian König
2020-07-31  4:05 ` [PATCH 48/49] drm/ttm: drop type manager has_type Dave Airlie
2020-07-31  4:05 ` [PATCH 49/49] drm/ttm: consolidate manager used apis into a set and get Dave Airlie
2020-07-31  9:51   ` daniel
2020-07-31 14:59   ` Christian König
2020-07-31  9:17 ` [PATCH 00/49] ttm mem manager refactoring Christian König
2020-07-31  9:29   ` daniel
2020-07-31 13:01     ` Christian König
2020-08-03  7:12   ` Dave Airlie
2020-08-03 11:13     ` 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=20200731040520.3701599-6-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=bskeggs@redhat.com \
    --cc=christian.koenig@amd.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kraxel@redhat.com \
    --cc=sroland@vmware.com \
    /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.