Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-gfx] [PATCH 1/4] drm/gem-vram: handle NULL bo->resource in move callback
@ 2023-02-08 14:53 Matthew Auld
  2023-02-08 14:53 ` [Intel-gfx] [PATCH 2/4] drm/qxl: " Matthew Auld
                   ` (6 more replies)
  0 siblings, 7 replies; 12+ messages in thread
From: Matthew Auld @ 2023-02-08 14:53 UTC (permalink / raw)
  To: intel-gfx; +Cc: Christian König, dri-devel

The ttm BO now initially has NULL bo->resource, and leaves the driver
the handle that. However it looks like we forgot to handle that for
ttm_bo_move_memcpy() users, like with vram-gem, since it just silently
returns zero. This seems to then trigger warnings like:

WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/drm_gem_vram_helper.c:255 drm_gem_vram_offset (??:?)

Fix this by calling move_null() if the new resource is TTM_PL_SYSTEM,
otherwise do the multi-hop sequence to ensure can safely call into
ttm_bo_move_memcpy(), since it might also need to clear the memory.
This should give the same behaviour as before.

While we are here let's also treat calling ttm_bo_move_memcpy() with
NULL bo->resource as programmer error, where expectation is that upper
layers should now handle it.

Fixes: 180253782038 ("drm/ttm: stop allocating dummy resources during BO creation")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++++++
 drivers/gpu/drm/ttm/ttm_bo_util.c     |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c
index d40b3edb52d0..0bea3df2a16d 100644
--- a/drivers/gpu/drm/drm_gem_vram_helper.c
+++ b/drivers/gpu/drm/drm_gem_vram_helper.c
@@ -916,6 +916,17 @@ static int bo_driver_move(struct ttm_buffer_object *bo,
 {
 	struct drm_gem_vram_object *gbo;
 
+	if (!bo->resource) {
+		if (new_mem->mem_type != TTM_PL_SYSTEM) {
+			hop->mem_type = TTM_PL_SYSTEM;
+			hop->flags = TTM_PL_FLAG_TEMPORARY;
+			return -EMULTIHOP;
+		}
+
+		ttm_bo_move_null(bo, new_mem);
+		return 0;
+	}
+
 	gbo = drm_gem_vram_of_bo(bo);
 
 	return drm_gem_vram_bo_driver_move(gbo, evict, ctx, new_mem);
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c
index d9d2b0903b22..fd9fd3d15101 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
@@ -157,8 +157,8 @@ int ttm_bo_move_memcpy(struct ttm_buffer_object *bo,
 	bool clear;
 	int ret = 0;
 
-	if (!src_mem)
-		return 0;
+	if (WARN_ON(!src_mem))
+		return -EINVAL;
 
 	src_man = ttm_manager_type(bdev, src_mem->mem_type);
 	if (ttm && ((ttm->page_flags & TTM_TT_FLAG_SWAPPED) ||
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-02-21 16:27 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-08 14:53 [Intel-gfx] [PATCH 1/4] drm/gem-vram: handle NULL bo->resource in move callback Matthew Auld
2023-02-08 14:53 ` [Intel-gfx] [PATCH 2/4] drm/qxl: " Matthew Auld
2023-02-08 14:53 ` [Intel-gfx] [PATCH 3/4] drm/vmwgfx: " Matthew Auld
2023-02-08 14:53 ` [Intel-gfx] [PATCH 4/4] drm/radeon: " Matthew Auld
2023-02-08 15:19 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/4] drm/gem-vram: " Patchwork
2023-02-08 19:01 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-02-09  8:47 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-02-10 11:03 ` [Intel-gfx] [PATCH 1/4] " Christian König
2023-02-21 16:13   ` Matthew Auld
2023-02-21 16:17     ` Christian König
2023-02-21 16:26       ` Matthew Auld
2023-02-21 16:27         ` Christian König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox