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

drm/amdgpu/umsch: fix missing stuff during rebase 



These are missed during rebase.

Signed-off-by: default avatarLang Yu <Lang.Yu@amd.com>
Reviewed-by: default avatarVeerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fb5b73ac

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

+3 −0
Original line number Diff line number Diff line
@@ -676,6 +676,8 @@ const char *amdgpu_ucode_name(enum AMDGPU_UCODE_ID ucode_id) 
		return "UMSCH_MM_UCODE";

	case AMDGPU_UCODE_ID_UMSCH_MM_DATA:

		return "UMSCH_MM_DATA";

	case AMDGPU_UCODE_ID_UMSCH_MM_CMD_BUFFER:

		return "UMSCH_MM_CMD_BUFFER";

	default:

		return "UNKNOWN UCODE";

	}
@@ -808,6 +810,7 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev, 
	sdma_hdr = (const struct sdma_firmware_header_v2_0 *)ucode->fw->data;

	imu_hdr = (const struct imu_firmware_header_v1_0 *)ucode->fw->data;

	vpe_hdr = (const struct vpe_firmware_header_v1_0 *)ucode->fw->data;

	umsch_mm_hdr = (const struct umsch_mm_firmware_header_v1_0 *)ucode->fw->data;



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

		switch (ucode->ucode_id) {