Commit b57b4774 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.18-2025-11-06' of... 

Merge tag 'amd-drm-fixes-6.18-2025-11-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.18-2025-11-06:

amdgpu:
- Reset fixes
- Misc fixes
- Panel scaling fixes
- HDMI fix
- S0ix fixes
- Hibernation fix
- Secure display fix
- Suspend fix
- MST fix

amdkfd:
- Process cleanup fix

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patch.msgid.link/20251106201326.807230-1-alexander.deucher@amd.com
parents 6ec8a47c 3c6a743c

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

+4 −0
Original line number Diff line number Diff line
@@ -1267,6 +1267,10 @@ static int unmap_bo_from_gpuvm(struct kgd_mem *mem, 


	(void)amdgpu_vm_bo_unmap(adev, bo_va, entry->va);



	/* VM entity stopped if process killed, don't clear freed pt bo */

	if (!amdgpu_vm_ready(vm))

		return 0;



	(void)amdgpu_vm_clear_freed(adev, vm, &bo_va->last_pt_update);



	(void)amdgpu_sync_fence(sync, bo_va->last_pt_update, GFP_KERNEL);

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

+0 −4
Original line number Diff line number Diff line
@@ -5243,10 +5243,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients) 
	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_release_full_gpu(adev, false);



	r = amdgpu_dpm_notify_rlc_state(adev, false);

	if (r)

		return r;



	return 0;

}

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

+7 −2
Original line number Diff line number Diff line
@@ -2632,9 +2632,14 @@ static int amdgpu_pmops_suspend_noirq(struct device *dev) 
{

	struct drm_device *drm_dev = dev_get_drvdata(dev);

	struct amdgpu_device *adev = drm_to_adev(drm_dev);

	int r;



	if (amdgpu_acpi_should_gpu_reset(adev))

		return amdgpu_asic_reset(adev);

	if (amdgpu_acpi_should_gpu_reset(adev)) {

		amdgpu_device_lock_reset_domain(adev->reset_domain);

		r = amdgpu_asic_reset(adev);

		amdgpu_device_unlock_reset_domain(adev->reset_domain);

		return r;

	}



	return 0;

}

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

+4 −1
Original line number Diff line number Diff line
@@ -2355,8 +2355,11 @@ static int psp_securedisplay_initialize(struct psp_context *psp) 
	if (!ret && !psp->securedisplay_context.context.resp_status) {

		psp->securedisplay_context.context.initialized = true;

		mutex_init(&psp->securedisplay_context.mutex);

	} else

	} else {

		/* don't try again */

		psp->securedisplay_context.context.bin_desc.size_bytes = 0;

		return ret;

	}



	mutex_lock(&psp->securedisplay_context.mutex);

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

+2 −1
Original line number Diff line number Diff line
@@ -407,7 +407,8 @@ static int aqua_vanjaram_switch_partition_mode(struct amdgpu_xcp_mgr *xcp_mgr, 
		return -EINVAL;

	}



	if (adev->kfd.init_complete && !amdgpu_in_reset(adev))

	if (adev->kfd.init_complete && !amdgpu_in_reset(adev) &&

		!adev->in_suspend)

		flags |= AMDGPU_XCP_OPS_KFD;



	if (flags & AMDGPU_XCP_OPS_KFD) {