[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: 85230ee36d88e7a09fb062d43203035659dd10a5
WARNING: Author mismatch between patch and found commit:
Backport author: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@xxxxxxxxxxx>
Commit author: Michel Dänzer <mdaenzer@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Not found
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 85230ee36d88 ! 1: eb8466d83331 drm/amdgpu: Handle NULL bo->tbo.resource (again) in amdgpu_vm_bo_update
@@ Commit message
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
(cherry picked from commit 695c2c745e5dff201b75da8a1d237ce403600d04)
Cc: stable@xxxxxxxxxxxxxxx
+ (cherry picked from commit 85230ee36d88e7a09fb062d43203035659dd10a5)
## drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c ##
@@ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: int amdgpu_vm_bo_update(struct amdgpu_device *adev, struct amdgpu_bo_va *bo_va,
* next command submission.
*/
- if (amdgpu_vm_is_bo_always_valid(vm, bo)) {
+ if (bo && bo->tbo.base.resv == vm->root.bo->tbo.base.resv) {
- uint32_t mem_type = bo->tbo.resource->mem_type;
-
- if (!(bo->preferred_domains &
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
