Commit 218da120 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.20-2026-02-06' of... 

Merge tag 'amd-drm-next-6.20-2026-02-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-6.20-2026-02-06:

amdgpu:
- DML 2.1 fixes
- Panel replay fixes
- Display writeback fixes
- MES 11 old firmware compat fix
- DC CRC improvements
- DPIA fixes
- XGMI fixes
- ASPM fix
- SMU feature bit handling fixes
- DC LUT fixes
- RAS fixes
- Misc memory leak in error path fixes
- SDMA queue reset fixes
- PG handling fixes
- 5 level GPUVM page table fix
- SR-IOV fix
- Queue reset fix

amdkfd:
- Fix possible double deletion of validate list
- Event setup fix
- Device disconnect regression fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20260206192706.59396-1-alexander.deucher@amd.com
parents 2f5db9b4 5028a24a

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

+3 −1
Original line number Diff line number Diff line
@@ -1186,8 +1186,10 @@ int amdgpu_acpi_enumerate_xcc(void) 
		if (!dev_info)

			ret = amdgpu_acpi_dev_init(&dev_info, xcc_info, sbdf);



		if (ret == -ENOMEM)

		if (ret == -ENOMEM) {

			kfree(xcc_info);

			return ret;

		}



		if (!dev_info) {

			kfree(xcc_info);

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

+3 −5
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ int amdgpu_amdkfd_post_reset(struct amdgpu_device *adev) 
void amdgpu_amdkfd_gpu_reset(struct amdgpu_device *adev)

{

	if (amdgpu_device_should_recover_gpu(adev))

		amdgpu_reset_domain_schedule(adev->reset_domain,

					     &adev->kfd.reset_work);

		(void)amdgpu_reset_domain_schedule(adev->reset_domain, &adev->kfd.reset_work);

}



int amdgpu_amdkfd_alloc_kernel_mem(struct amdgpu_device *adev, size_t size,
@@ -720,9 +719,8 @@ void amdgpu_amdkfd_set_compute_idle(struct amdgpu_device *adev, bool idle) 
		if (gfx_block != NULL)

			gfx_block->version->funcs->set_powergating_state((void *)gfx_block, state);

	}

	amdgpu_dpm_switch_power_profile(adev,

					PP_SMC_POWER_PROFILE_COMPUTE,

					!idle);

	(void)amdgpu_dpm_switch_power_profile(adev, PP_SMC_POWER_PROFILE_COMPUTE, !idle);



}



bool amdgpu_amdkfd_is_kfd_vmid(struct amdgpu_device *adev, u32 vmid)

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

+7 −7
Original line number Diff line number Diff line
@@ -1924,21 +1924,21 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 


	/* Make sure restore workers don't access the BO any more */

	mutex_lock(&process_info->lock);

	list_del(&mem->validate_list);

	if (!list_empty(&mem->validate_list))

		list_del_init(&mem->validate_list);

	mutex_unlock(&process_info->lock);



	ret = reserve_bo_and_cond_vms(mem, NULL, BO_VM_ALL, &ctx);

	if (unlikely(ret))

		return ret;



	/* Cleanup user pages and MMU notifiers */

	if (amdgpu_ttm_tt_get_usermm(mem->bo->tbo.ttm)) {

		amdgpu_hmm_unregister(mem->bo);

		mutex_lock(&process_info->notifier_lock);

		amdgpu_hmm_range_free(mem->range);

		mutex_unlock(&process_info->notifier_lock);

		mem->range = NULL;

	}



	ret = reserve_bo_and_cond_vms(mem, NULL, BO_VM_ALL, &ctx);

	if (unlikely(ret))

		return ret;



	amdgpu_amdkfd_remove_eviction_fence(mem->bo,

					process_info->eviction_fence);

	pr_debug("Release VA 0x%llx - 0x%llx\n", mem->va,

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

+4 −2
Original line number Diff line number Diff line
@@ -892,8 +892,10 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
		struct amdgpu_bo *bo = e->bo;



		e->range = amdgpu_hmm_range_alloc(NULL);

		if (unlikely(!e->range))

			return -ENOMEM;

		if (unlikely(!e->range)) {

			r = -ENOMEM;

			goto out_free_user_pages;

		}



		r = amdgpu_ttm_tt_get_user_pages(bo, e->range);

		if (r)

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

+11 −5
Original line number Diff line number Diff line
@@ -3504,9 +3504,6 @@ static int amdgpu_device_ip_fini_early(struct amdgpu_device *adev) 
		}

	}



	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_amdkfd_suspend(adev, true);

	amdgpu_amdkfd_teardown_processes(adev);

	amdgpu_userq_suspend(adev);
@@ -4902,6 +4899,9 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
		amdgpu_virt_fini_data_exchange(adev);

	}



	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	/* disable all interrupts */

	amdgpu_irq_disable_all(adev);

	if (adev->mode_info.mode_config_initialized) {
@@ -4924,7 +4924,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	 * before ip_fini_early to prevent kfd locking refcount issues by calling

	 * amdgpu_amdkfd_suspend()

	 */

	if (drm_dev_is_unplugged(adev_to_drm(adev)))

	if (pci_dev_is_disconnected(adev->pdev))

		amdgpu_amdkfd_device_fini_sw(adev);



	amdgpu_device_ip_fini_early(adev);
@@ -4936,7 +4936,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 


	amdgpu_gart_dummy_page_fini(adev);



	if (drm_dev_is_unplugged(adev_to_drm(adev)))

	if (pci_dev_is_disconnected(adev->pdev))

		amdgpu_device_unmap_mmio(adev);



}
@@ -5733,6 +5733,9 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev) 
	/* enable mmio access after mode 1 reset completed */

	adev->no_hw_access = false;



	/* ensure no_hw_access is updated before we access hw */

	smp_mb();



	amdgpu_device_load_pci_state(adev->pdev);

	ret = amdgpu_psp_wait_for_bootloader(adev);

	if (ret)
@@ -7357,6 +7360,9 @@ void amdgpu_device_halt(struct amdgpu_device *adev) 
	amdgpu_xcp_dev_unplug(adev);

	drm_dev_unplug(ddev);



	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE);

	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE);



	amdgpu_irq_disable_all(adev);



	amdgpu_fence_driver_hw_fini(adev);