Commit 1c7916af authored by Lang Yu's avatar Lang Yu Committed by Alex Deucher
Browse files

drm/amdgpu: enable psp v11.0.8 for cyan_skillfish 



Add psp v11.0.8 to ip block initialization.

v2: use APU flags (Alex)

Signed-off-by: default avatarLang Yu <lang.yu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3188fd07

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

+8 −0
Original line number Diff line number Diff line
@@ -3440,6 +3440,14 @@ const struct amdgpu_ip_block_version psp_v11_0_ip_block = 
	.funcs = &psp_ip_funcs,

};



const struct amdgpu_ip_block_version psp_v11_0_8_ip_block = {

	.type = AMD_IP_BLOCK_TYPE_PSP,

	.major = 11,

	.minor = 0,

	.rev = 8,

	.funcs = &psp_ip_funcs,

};



const struct amdgpu_ip_block_version psp_v12_0_ip_block =

{

	.type = AMD_IP_BLOCK_TYPE_PSP,

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

+1 −0
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ extern const struct amd_ip_funcs psp_ip_funcs; 
extern const struct amdgpu_ip_block_version psp_v3_1_ip_block;

extern const struct amdgpu_ip_block_version psp_v10_0_ip_block;

extern const struct amdgpu_ip_block_version psp_v11_0_ip_block;

extern const struct amdgpu_ip_block_version psp_v11_0_8_ip_block;

extern const struct amdgpu_ip_block_version psp_v12_0_ip_block;

extern const struct amdgpu_ip_block_version psp_v13_0_ip_block;

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

+4 −0
Original line number Diff line number Diff line
@@ -899,6 +899,10 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) 
		amdgpu_device_ip_block_add(adev, &nv_common_ip_block);

                amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block);

                amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block);

		if (likely(adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)) {

			if (adev->apu_flags & AMD_APU_IS_CYAN_SKILLFISH2)

				amdgpu_device_ip_block_add(adev, &psp_v11_0_8_ip_block);

		}

                if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))

                        amdgpu_device_ip_block_add(adev, &dce_virtual_ip_block);

                amdgpu_device_ip_block_add(adev, &gfx_v10_0_ip_block);