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

Merge tag 'amd-drm-fixes-6.3-2023-03-15' of... 

Merge tag 'amd-drm-fixes-6.3-2023-03-15' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.3-2023-03-15:

amdgpu:
- SMU 13 update
- RDNA2 suspend/resume fix when overclocking is enabled
- SRIOV VCN fixes
- HDCP suspend/resume fix
- Fix drm polling splat regression
- Fix dirty rectangle tracking for PSR
- Fix vangogh regression on certain BIOSes
- Misc display fixes
- Suspend/resume IOMMU regression fix

amdkfd:
- Fix BO offset for multi-VMA page migration
- Fix a possible double free
- Fix potential use after free
- Fix process cleanup on module exit

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230315224400.7558-1-alexander.deucher@amd.com
parents 2a210e6a f3921a9a

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

+0 −4
Original line number Diff line number Diff line
@@ -4145,8 +4145,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 
	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D3))

		DRM_WARN("smart shift update failed\n");



	drm_kms_helper_poll_disable(dev);



	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, true);
@@ -4243,8 +4241,6 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	if (fbcon)

		drm_fb_helper_set_suspend_unlocked(adev_to_drm(adev)->fb_helper, false);



	drm_kms_helper_poll_enable(dev);



	amdgpu_ras_resume(adev);



	if (adev->mode_info.num_crtc) {

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

+4 −0
Original line number Diff line number Diff line
@@ -1618,6 +1618,8 @@ int amdgpu_display_suspend_helper(struct amdgpu_device *adev) 
	struct drm_connector_list_iter iter;

	int r;



	drm_kms_helper_poll_disable(dev);



	/* turn off display hw */

	drm_modeset_lock_all(dev);

	drm_connector_list_iter_begin(dev, &iter);
@@ -1694,6 +1696,8 @@ int amdgpu_display_resume_helper(struct amdgpu_device *adev) 


	drm_modeset_unlock_all(dev);



	drm_kms_helper_poll_enable(dev);



	return 0;

}

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

+19 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include <linux/firmware.h>

#include <linux/module.h>

#include <linux/dmi.h>

#include <linux/pci.h>

#include <linux/debugfs.h>

#include <drm/drm_drv.h>
@@ -114,6 +115,24 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
	    (adev->pg_flags & AMD_PG_SUPPORT_VCN_DPG))

		adev->vcn.indirect_sram = true;



	/*

	 * Some Steam Deck's BIOS versions are incompatible with the

	 * indirect SRAM mode, leading to amdgpu being unable to get

	 * properly probed (and even potentially crashing the kernel).

	 * Hence, check for these versions here - notice this is

	 * restricted to Vangogh (Deck's APU).

	 */

	if (adev->ip_versions[UVD_HWIP][0] == IP_VERSION(3, 0, 2)) {

		const char *bios_ver = dmi_get_system_info(DMI_BIOS_VERSION);



		if (bios_ver && (!strncmp("F7A0113", bios_ver, 7) ||

		     !strncmp("F7A0114", bios_ver, 7))) {

			adev->vcn.indirect_sram = false;

			dev_info(adev->dev,

				"Steam Deck quirk: indirect SRAM disabled on BIOS %s\n", bios_ver);

		}

	}



	hdr = (const struct common_firmware_header *)adev->vcn.fw->data;

	adev->vcn.fw_version = le32_to_cpu(hdr->ucode_version);

drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h

+4 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ enum AMDGIM_FEATURE_FLAG { 
	AMDGIM_FEATURE_PP_ONE_VF = (1 << 4),

	/* Indirect Reg Access enabled */

	AMDGIM_FEATURE_INDIRECT_REG_ACCESS = (1 << 5),

	/* AV1 Support MODE*/

	AMDGIM_FEATURE_AV1_SUPPORT = (1 << 6),

};



enum AMDGIM_REG_ACCESS_FLAG {
@@ -322,6 +324,8 @@ static inline bool is_virtual_machine(void) 
	((!amdgpu_in_reset(adev)) && adev->virt.tdr_debug)

#define amdgpu_sriov_is_normal(adev) \

	((!amdgpu_in_reset(adev)) && (!adev->virt.tdr_debug))

#define amdgpu_sriov_is_av1_support(adev) \

	((adev)->virt.gim_feature & AMDGIM_FEATURE_AV1_SUPPORT)

bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev);

void amdgpu_virt_init_setting(struct amdgpu_device *adev);

void amdgpu_virt_kiq_reg_write_reg_wait(struct amdgpu_device *adev,

drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ union amd_sriov_msg_feature_flags { 
		uint32_t mm_bw_management  : 1;

		uint32_t pp_one_vf_mode	   : 1;

		uint32_t reg_indirect_acc  : 1;

		uint32_t reserved	   : 26;

		uint32_t av1_support       : 1;

		uint32_t reserved	   : 25;

	} flags;

	uint32_t all;

};