All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <ckoenig.leichtzumerken@gmail.com>
To: bob.beckett@collabora.com, dri-devel@lists.freedesktop.org,
	daniel@ffwll.ch
Cc: "Christian König" <christian.koenig@amd.com>
Subject: [PATCH 07/11] drm/amdgpu: audit bo->resource usage
Date: Mon,  9 May 2022 15:09:47 +0200	[thread overview]
Message-ID: <20220509130951.486344-8-christian.koenig@amd.com> (raw)
In-Reply-To: <20220509130951.486344-1-christian.koenig@amd.com>

Make sure we can at least move and release BOs without backing store.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 116c8d31e646..5cf3a58bc925 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1302,7 +1302,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)
 	if (bo->base.resv == &bo->base._resv)
 		amdgpu_amdkfd_remove_fence_on_pt_pd_bos(abo);
 
-	if (bo->resource->mem_type != TTM_PL_VRAM ||
+	if (!bo->resource || bo->resource->mem_type != TTM_PL_VRAM ||
 	    !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE) ||
 	    adev->in_suspend || adev->shutdown)
 		return;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index ec26edd4f4d8..b79c93812342 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -471,7 +471,8 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict,
 
 	adev = amdgpu_ttm_adev(bo->bdev);
 
-	if (old_mem->mem_type == TTM_PL_SYSTEM && bo->ttm == NULL) {
+	if (!old_mem || (old_mem->mem_type == TTM_PL_SYSTEM &&
+			 bo->ttm == NULL)) {
 		ttm_bo_move_null(bo, new_mem);
 		goto out;
 	}
-- 
2.25.1


  parent reply	other threads:[~2022-05-09 13:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-09 13:09 Improve TTMs empty object handling Christian König
2022-05-09 13:09 ` [PATCH 01/11] drm/radeon: switch over to ttm_bo_init_reserved Christian König
2022-05-09 13:09 ` [PATCH 02/11] drm/nouveau: " Christian König
2022-05-09 13:09 ` [PATCH 03/11] drm/vram-helper: " Christian König
2022-05-09 13:09 ` [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX Christian König
2022-05-09 13:09 ` [PATCH 05/11] drm/ttm: drop ttm_bo_init Christian König
2022-05-09 13:09 ` [PATCH 06/11] drm/ttm: rename and cleanup ttm_bo_init_reserved Christian König
2022-05-09 13:09 ` Christian König [this message]
2022-05-09 13:09 ` [PATCH 08/11] drm/nouveau: audit bo->resource usage Christian König
2022-05-09 13:09 ` [PATCH 09/11] drm/ttm: " Christian König
2022-05-09 13:09 ` [PATCH 10/11] drm/ttm: stop allocating dummy resources during BO creation Christian König
2022-05-09 13:09 ` [PATCH 11/11] drm/ttm: stop allocating a dummy resource for pipelined gutting Christian König
2022-05-11 19:49 ` Improve TTMs empty object handling Daniel Vetter
2022-05-13  3:43 ` Luben Tuikov
2022-05-13  9:21 ` Matthew Auld
2022-05-13 13:03   ` Christian König
2022-05-13 13:27     ` Matthew Auld
  -- strict thread matches above, loose matches on Subject: below --
2022-05-19  9:54 Christian König
2022-05-19  9:55 ` [PATCH 07/11] drm/amdgpu: audit bo->resource usage Christian König
2022-03-29 11:02 Allow ttm_buffer_object without resource Christian König
2022-03-29 11:02 ` [PATCH 07/11] drm/amdgpu: audit bo->resource usage 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=20220509130951.486344-8-christian.koenig@amd.com \
    --to=ckoenig.leichtzumerken@gmail.com \
    --cc=bob.beckett@collabora.com \
    --cc=christian.koenig@amd.com \
    --cc=daniel@ffwll.ch \
    --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.