From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH 3/5] drm/ttm: stop allocating a dummy resource for pipelined gutting Date: Tue, 24 Jan 2023 13:57:24 +0100 [thread overview] Message-ID: <20230124125726.13323-3-christian.koenig@amd.com> (raw) In-Reply-To: <20230124125726.13323-1-christian.koenig@amd.com> That should not be necessary any more when drivers should at least be able to handle a move without a resource. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/ttm/ttm_bo_util.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 7635d7d6b13b..d9d2b0903b22 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -704,30 +704,23 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup); */ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) { - static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM }; struct ttm_buffer_object *ghost; - struct ttm_resource *sys_res; struct ttm_tt *ttm; int ret; - ret = ttm_resource_alloc(bo, &sys_mem, &sys_res); - if (ret) - return ret; - /* If already idle, no need for ghost object dance. */ if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) { if (!bo->ttm) { /* See comment below about clearing. */ ret = ttm_tt_create(bo, true); if (ret) - goto error_free_sys_mem; + return ret; } else { ttm_tt_unpopulate(bo->bdev, bo->ttm); if (bo->type == ttm_bo_type_device) ttm_tt_mark_for_clear(bo->ttm); } ttm_resource_free(bo, &bo->resource); - ttm_bo_assign_mem(bo, sys_res); return 0; } @@ -744,7 +737,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ret = ttm_tt_create(bo, true); swap(bo->ttm, ttm); if (ret) - goto error_free_sys_mem; + return ret; ret = ttm_buffer_object_transfer(bo, &ghost); if (ret) @@ -760,13 +753,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) dma_resv_unlock(&ghost->base._resv); ttm_bo_put(ghost); bo->ttm = ttm; - ttm_bo_assign_mem(bo, sys_res); return 0; error_destroy_tt: ttm_tt_destroy(bo->bdev, ttm); - -error_free_sys_mem: - ttm_resource_free(bo, &sys_res); return ret; } -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <ckoenig.leichtzumerken@gmail.com> To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 3/5] drm/ttm: stop allocating a dummy resource for pipelined gutting Date: Tue, 24 Jan 2023 13:57:24 +0100 [thread overview] Message-ID: <20230124125726.13323-3-christian.koenig@amd.com> (raw) In-Reply-To: <20230124125726.13323-1-christian.koenig@amd.com> That should not be necessary any more when drivers should at least be able to handle a move without a resource. Signed-off-by: Christian König <christian.koenig@amd.com> --- drivers/gpu/drm/ttm/ttm_bo_util.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 7635d7d6b13b..d9d2b0903b22 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c @@ -704,30 +704,23 @@ EXPORT_SYMBOL(ttm_bo_move_sync_cleanup); */ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) { - static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM }; struct ttm_buffer_object *ghost; - struct ttm_resource *sys_res; struct ttm_tt *ttm; int ret; - ret = ttm_resource_alloc(bo, &sys_mem, &sys_res); - if (ret) - return ret; - /* If already idle, no need for ghost object dance. */ if (dma_resv_test_signaled(bo->base.resv, DMA_RESV_USAGE_BOOKKEEP)) { if (!bo->ttm) { /* See comment below about clearing. */ ret = ttm_tt_create(bo, true); if (ret) - goto error_free_sys_mem; + return ret; } else { ttm_tt_unpopulate(bo->bdev, bo->ttm); if (bo->type == ttm_bo_type_device) ttm_tt_mark_for_clear(bo->ttm); } ttm_resource_free(bo, &bo->resource); - ttm_bo_assign_mem(bo, sys_res); return 0; } @@ -744,7 +737,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ret = ttm_tt_create(bo, true); swap(bo->ttm, ttm); if (ret) - goto error_free_sys_mem; + return ret; ret = ttm_buffer_object_transfer(bo, &ghost); if (ret) @@ -760,13 +753,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) dma_resv_unlock(&ghost->base._resv); ttm_bo_put(ghost); bo->ttm = ttm; - ttm_bo_assign_mem(bo, sys_res); return 0; error_destroy_tt: ttm_tt_destroy(bo->bdev, ttm); - -error_free_sys_mem: - ttm_resource_free(bo, &sys_res); return ret; } -- 2.34.1
next prev parent reply other threads:[~2023-01-24 12:57 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-01-24 12:57 [PATCH 1/5] drm/i915: audit bo->resource usage v3 Christian König 2023-01-24 12:57 ` [Intel-gfx] " Christian König 2023-01-24 12:57 ` [PATCH 2/5] drm/ttm: stop allocating dummy resources during BO creation Christian König 2023-01-24 12:57 ` [Intel-gfx] " Christian König 2023-01-24 13:49 ` Matthew Auld 2023-01-24 13:49 ` [Intel-gfx] " Matthew Auld 2023-01-24 12:57 ` Christian König [this message] 2023-01-24 12:57 ` [Intel-gfx] [PATCH 3/5] drm/ttm: stop allocating a dummy resource for pipelined gutting Christian König 2023-01-24 13:50 ` Matthew Auld 2023-01-24 13:50 ` [Intel-gfx] " Matthew Auld 2023-01-24 12:57 ` [PATCH 4/5] drm/ttm: prevent moving of pinned BOs Christian König 2023-01-24 12:57 ` [Intel-gfx] " Christian König 2023-01-24 14:01 ` Matthew Auld 2023-01-24 14:01 ` [Intel-gfx] " Matthew Auld 2023-01-24 12:57 ` [PATCH 5/5] drm/ttm: replace busy placement with flags v2 Christian König 2023-01-24 12:57 ` [Intel-gfx] " Christian König 2023-01-24 17:11 ` Matthew Auld 2023-01-25 11:31 ` kernel test robot 2023-01-24 13:48 ` [Intel-gfx] [PATCH 1/5] drm/i915: audit bo->resource usage v3 Matthew Auld 2023-01-24 17:15 ` Matthew Auld 2023-01-25 9:56 ` Matthew Auld 2023-01-25 10:07 ` Christian König 2023-01-25 10:21 ` Matthew Auld 2023-01-25 11:35 ` Christian König 2023-01-25 12:53 ` Matthew Auld 2023-01-25 14:20 ` Christian König 2023-01-25 15:46 ` Matthew Auld 2023-01-24 19:28 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] " Patchwork 2023-01-24 19:58 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2023-01-24 22:48 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
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=20230124125726.13323-3-christian.koenig@amd.com \ --to=ckoenig.leichtzumerken@gmail.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@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: linkBe 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.