Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1de1ed3 authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amdgpu: add SMC firmware into global ucode list for psp loading 



Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a7ed07e

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

+11 −0
Original line number Diff line number Diff line
@@ -837,6 +837,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
		uint32_t ucode_start_address;

		const uint8_t *src;

		const struct smc_firmware_header_v1_0 *hdr;

		const struct common_firmware_header *header;

		struct amdgpu_firmware_info *ucode = NULL;



		if (CGS_UCODE_ID_SMU_SK == type)

			amdgpu_cgs_rel_firmware(cgs_device, CGS_UCODE_ID_SMU);
@@ -919,6 +921,15 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device, 
				adev->pm.fw = NULL;

				return err;

			}



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

				ucode = &adev->firmware.ucode[AMDGPU_UCODE_ID_SMC];

				ucode->ucode_id = AMDGPU_UCODE_ID_SMC;

				ucode->fw = adev->pm.fw;

				header = (const struct common_firmware_header *)ucode->fw->data;

				adev->firmware.fw_size +=

					ALIGN(le32_to_cpu(header->ucode_size_bytes), PAGE_SIZE);

			}

		}



		hdr = (const struct smc_firmware_header_v1_0 *)	adev->pm.fw->data;