]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amdgpu/umsch: fix missing stuff during rebase
authorLang Yu <Lang.Yu@amd.com>
Wed, 11 Oct 2023 09:08:34 +0000 (17:08 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 13 Oct 2023 15:33:49 +0000 (11:33 -0400)
These are missed during rebase.

Signed-off-by: Lang Yu <Lang.Yu@amd.com>
Reviewed-by: Veerabadhran Gopalakrishnan <Veerabadhran.Gopalakrishnan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c

index 606406c8867703a88666ba59864e2d6bb7593919..b14127429f3036e060afde459d8627734afd5a60 100644 (file)
@@ -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) {