Commit af81a920 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: save rlcv/rlcp ucode version in amdgpu_gfx 



cache rlcv/rlcvp ucode version info in amdgpu_gfx
structure

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 541540b9

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

+4 −0
Original line number Diff line number Diff line
@@ -304,6 +304,10 @@ struct amdgpu_gfx { 
	uint32_t			rlc_srlg_feature_version;

	uint32_t			rlc_srls_fw_version;

	uint32_t			rlc_srls_feature_version;

	uint32_t			rlcp_ucode_version;

	uint32_t			rlcp_ucode_feature_version;

	uint32_t			rlcv_ucode_version;

	uint32_t			rlcv_ucode_feature_version;

	uint32_t			mec_feature_version;

	uint32_t			mec2_feature_version;

	bool				mec_fw_write_wait;

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

+4 −0
Original line number Diff line number Diff line
@@ -260,8 +260,12 @@ struct rlc_firmware_header_v2_2 { 
/* version_major=2, version_minor=3 */

struct rlc_firmware_header_v2_3 {

    struct rlc_firmware_header_v2_2 v2_2;

    uint32_t rlcp_ucode_version;

    uint32_t rlcp_ucode_feature_version;

    uint32_t rlcp_ucode_size_bytes;

    uint32_t rlcp_ucode_offset_bytes;

    uint32_t rlcv_ucode_version;

    uint32_t rlcv_ucode_feature_version;

    uint32_t rlcv_ucode_size_bytes;

    uint32_t rlcv_ucode_offset_bytes;

};

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

+5 −0
Original line number Diff line number Diff line
@@ -511,8 +511,13 @@ static void gfx_v11_0_init_rlcp_rlcv_microcode(struct amdgpu_device *adev) 
	const struct rlc_firmware_header_v2_3 *rlc_hdr;



	rlc_hdr = (const struct rlc_firmware_header_v2_3 *)adev->gfx.rlc_fw->data;

	adev->gfx.rlcp_ucode_version = le32_to_cpu(rlc_hdr->rlcp_ucode_version);

	adev->gfx.rlcp_ucode_feature_version = le32_to_cpu(rlc_hdr->rlcp_ucode_feature_version);

	adev->gfx.rlc.rlcp_ucode_size_bytes = le32_to_cpu(rlc_hdr->rlcp_ucode_size_bytes);

	adev->gfx.rlc.rlcp_ucode = (u8 *)rlc_hdr + le32_to_cpu(rlc_hdr->rlcp_ucode_offset_bytes);



	adev->gfx.rlcv_ucode_version = le32_to_cpu(rlc_hdr->rlcv_ucode_version);

	adev->gfx.rlcv_ucode_feature_version = le32_to_cpu(rlc_hdr->rlcv_ucode_feature_version);

	adev->gfx.rlc.rlcv_ucode_size_bytes = le32_to_cpu(rlc_hdr->rlcv_ucode_size_bytes);

	adev->gfx.rlc.rlcv_ucode = (u8 *)rlc_hdr + le32_to_cpu(rlc_hdr->rlcv_ucode_offset_bytes);

}