Commit 68ad07df authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.17-2025-08-13' of... 

Merge tag 'amd-drm-fixes-6.17-2025-08-13' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.17-2025-08-13:

amdgpu:
- PSP fix
- VRAM reservation fix
- CSA fix
- Process kill fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://lore.kernel.org/r/20250813151905.2040816-1-alexander.deucher@amd.com
parents f858f63e aa5fc436

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+3 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,9 @@ static int amdgpu_cs_vm_handling(struct amdgpu_cs_parser *p) 
		}

	}



	if (!amdgpu_vm_ready(vm))

		return -EINVAL;



	r = amdgpu_vm_clear_freed(adev, vm, NULL);

	if (r)

		return r;

drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	}



	r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size,

			     AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |

			     AMDGPU_PTE_EXECUTABLE);

			     AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |

			     AMDGPU_VM_PAGE_EXECUTABLE);



	if (r) {

		DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

+16 −3
Original line number Diff line number Diff line
@@ -1039,15 +1039,28 @@ int psp_update_fw_reservation(struct psp_context *psp) 
{

	int ret;

	uint64_t reserv_addr, reserv_addr_ext;

	uint32_t reserv_size, reserv_size_ext;

	uint32_t reserv_size, reserv_size_ext, mp0_ip_ver;

	struct amdgpu_device *adev = psp->adev;



	mp0_ip_ver = amdgpu_ip_version(adev, MP0_HWIP, 0);



	if (amdgpu_sriov_vf(psp->adev))

		return 0;



	if ((amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 2)) &&

	    (amdgpu_ip_version(adev, MP0_HWIP, 0) != IP_VERSION(14, 0, 3)))

	switch (mp0_ip_ver) {

	case IP_VERSION(14, 0, 2):

		if (adev->psp.sos.fw_version < 0x3b0e0d)

			return 0;

		break;



	case IP_VERSION(14, 0, 3):

		if (adev->psp.sos.fw_version < 0x3a0e14)

			return 0;

		break;



	default:

		return 0;

	}



	ret = psp_get_fw_reservation_info(psp, GFX_CMD_ID_FB_FW_RESERV_ADDR, &reserv_addr, &reserv_size);

	if (ret)

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+11 −4
Original line number Diff line number Diff line
@@ -654,11 +654,10 @@ int amdgpu_vm_validate(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
 * Check if all VM PDs/PTs are ready for updates

 *

 * Returns:

 * True if VM is not evicting.

 * True if VM is not evicting and all VM entities are not stopped

 */

bool amdgpu_vm_ready(struct amdgpu_vm *vm)

{

	bool empty;

	bool ret;



	amdgpu_vm_eviction_lock(vm);
@@ -666,10 +665,18 @@ bool amdgpu_vm_ready(struct amdgpu_vm *vm) 
	amdgpu_vm_eviction_unlock(vm);



	spin_lock(&vm->status_lock);

	empty = list_empty(&vm->evicted);

	ret &= list_empty(&vm->evicted);

	spin_unlock(&vm->status_lock);



	return ret && empty;

	spin_lock(&vm->immediate.lock);

	ret &= !vm->immediate.stopped;

	spin_unlock(&vm->immediate.lock);



	spin_lock(&vm->delayed.lock);

	ret &= !vm->delayed.stopped;

	spin_unlock(&vm->delayed.lock);



	return ret;

}



/**

drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c

+1 −2
Original line number Diff line number Diff line
@@ -648,9 +648,8 @@ static void amdgpu_vram_mgr_del(struct ttm_resource_manager *man, 
	list_for_each_entry(block, &vres->blocks, link)

		vis_usage += amdgpu_vram_mgr_vis_size(adev, block);



	amdgpu_vram_mgr_do_reserve(man);



	drm_buddy_free_list(mm, &vres->blocks, vres->flags);

	amdgpu_vram_mgr_do_reserve(man);

	mutex_unlock(&mgr->lock);



	atomic64_sub(vis_usage, &mgr->vis_usage);