This is a note to let you know that I've just added the patch titled
drm/amdgpu: make sure that BOs have a backing store
to the 6.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-make-sure-that-bos-have-a-backing-store.patch
and it can be found in the queue-6.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable-owner@xxxxxxxxxxxxxxx Fri Jul 7 17:08:17 2023
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Fri, 7 Jul 2023 11:07:27 -0400
Subject: drm/amdgpu: make sure that BOs have a backing store
To: <stable@xxxxxxxxxxxxxxx>
Cc: mario.limonciello@xxxxxxx, "Christian König" <christian.koenig@xxxxxxx>, "Alex Deucher" <alexander.deucher@xxxxxxx>, "Guchun Chen" <guchun.chen@xxxxxxx>, "Mikhail Gavrilov" <mikhail.v.gavrilov@xxxxxxxxx>
Message-ID: <20230707150734.746135-2-alexander.deucher@xxxxxxx>
From: Christian König <christian.koenig@xxxxxxx>
commit ca0b954a4315ca2228001c439ae1062561c81989 upstream
It's perfectly possible that the BO is about to be destroyed and doesn't
have a backing store associated with it.
Signed-off-by: Christian König <christian.koenig@xxxxxxx>
Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx>
Acked-by: Guchun Chen <guchun.chen@xxxxxxx>
Tested-by: Mikhail Gavrilov <mikhail.v.gavrilov@xxxxxxxxx>
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # 6.3.x
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -1266,8 +1266,12 @@ void amdgpu_bo_move_notify(struct ttm_bu
void amdgpu_bo_get_memory(struct amdgpu_bo *bo,
struct amdgpu_mem_stats *stats)
{
- unsigned int domain;
uint64_t size = amdgpu_bo_size(bo);
+ unsigned int domain;
+
+ /* Abort if the BO doesn't currently have a backing store */
+ if (!bo->tbo.resource)
+ return;
domain = amdgpu_mem_type_to_domain(bo->tbo.resource->mem_type);
switch (domain) {
Patches currently in stable-queue which might be from stable-owner@xxxxxxxxxxxxxxx are
queue-6.4/drm-amd-pm-revise-the-aspm-settings-for-thunderbolt-attached-scenario.patch
queue-6.4/drm-amdgpu-make-sure-that-bos-have-a-backing-store.patch
queue-6.4/drm-amd-pm-add-abnormal-fan-detection-for-smu-13.0.0.patch
queue-6.4/drm-amdgpu-check-ras-irq-existence-for-vcn-jpeg.patch
queue-6.4/drm-amdgpu-sdma4-set-align-mask-to-255.patch
queue-6.4/drm-amdgpu-make-sure-bos-are-locked-in-amdgpu_vm_get_memory.patch
queue-6.4/drm-amdgpu-skip-mark-offset-for-high-priority-rings.patch
