Commit 908f6064 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-6.7-2023-11-30' of... 

Merge tag 'amd-drm-fixes-6.7-2023-11-30' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.7-2023-11-30:

amdgpu:
- DMUB fix
- DCN 3.5 fixes
- XGMI fix
- DCN 3.2 fixes
- Vangogh suspend fix
- NBIO 7.9 fix
- GFX11 golden register fix
- Backlight fix
- NBIO 7.11 fix
- IB test overflow fix
- DCN 3.1.4 fixes
- fix a runtime pm ref count
- Retimer fix
- ABM fix
- DCN 3.1.5 fix
- Fix AGP addressing
- Fix possible memory leak in SMU error path
- Make sure PME is enabled in D3
- Fix possible NULL pointer dereference in debugfs
- EEPROM fix
- GC 9.4.3 fix

amdkfd:
- IP version check fix
- Fix memory leak in pqm_uninit()

drm:
- Revert unexport of prime helpers for fd/handle conversion

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

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231130213135.5083-1-alexander.deucher@amd.com
parents a74229bc 0514f63c

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

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ int amdgpu_amdkfd_get_xgmi_bandwidth_mbytes(struct amdgpu_device *dst, 
	struct amdgpu_device *adev = dst, *peer_adev;

	int num_links;



	if (adev->asic_type != CHIP_ALDEBARAN)

	if (amdgpu_ip_version(adev, GC_HWIP, 0) < IP_VERSION(9, 4, 2))

		return 0;



	if (src)

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

+6 −0
Original line number Diff line number Diff line
@@ -638,6 +638,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, 
	if (size & 0x3 || *pos & 0x3)

		return -EINVAL;



	if (!adev->didt_rreg)

		return -EOPNOTSUPP;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);

	if (r < 0) {

		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
@@ -694,6 +697,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user 
	if (size & 0x3 || *pos & 0x3)

		return -EINVAL;



	if (!adev->didt_wreg)

		return -EOPNOTSUPP;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);

	if (r < 0) {

		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);

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

+4 −0
Original line number Diff line number Diff line
@@ -4538,6 +4538,10 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
	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_display.c

+3 −6
Original line number Diff line number Diff line
@@ -340,14 +340,11 @@ int amdgpu_display_crtc_set_config(struct drm_mode_set *set, 
		adev->have_disp_power_ref = true;

		return ret;

	}

	/* if we have no active crtcs, then drop the power ref

	 * we got before

	/* if we have no active crtcs, then go to

	 * drop the power ref we got before

	 */

	if (!active && adev->have_disp_power_ref) {

		pm_runtime_put_autosuspend(dev->dev);

	if (!active && adev->have_disp_power_ref)

		adev->have_disp_power_ref = false;

	}



out:

	/* drop the power reference we got coming in here */

	pm_runtime_put_autosuspend(dev->dev);

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

+2 −0
Original line number Diff line number Diff line
@@ -2263,6 +2263,8 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, 
		pm_runtime_mark_last_busy(ddev->dev);

		pm_runtime_put_autosuspend(ddev->dev);



		pci_wake_from_d3(pdev, TRUE);



		/*

		 * For runpm implemented via BACO, PMFW will handle the

		 * timing for BACO in and out: