Commit 9989a924 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: Add sdma fw v3 structure 



Add sdma firmware struct version 3 to support
sdma v7_0 firmware.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9d0532c8

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

+6 −0
Original line number Diff line number Diff line
@@ -323,6 +323,12 @@ void amdgpu_ucode_print_sdma_hdr(const struct common_firmware_header *hdr) 
		DRM_DEBUG("ctl_ucode_offset: %u\n", le32_to_cpu(sdma_hdr->ctl_ucode_offset));

		DRM_DEBUG("ctl_jt_offset: %u\n", le32_to_cpu(sdma_hdr->ctl_jt_offset));

		DRM_DEBUG("ctl_jt_size: %u\n", le32_to_cpu(sdma_hdr->ctl_jt_size));

	} else if (version_major == 3) {

		const struct sdma_firmware_header_v3_0 *sdma_hdr =

			container_of(hdr, struct sdma_firmware_header_v3_0, header);



		DRM_DEBUG("ucode_reversion: %u\n",

			  le32_to_cpu(sdma_hdr->ucode_feature_version));

	} else {

		DRM_ERROR("Unknown SDMA ucode version: %u.%u\n",

			  version_major, version_minor);

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

+9 −0
Original line number Diff line number Diff line
@@ -346,6 +346,14 @@ struct umsch_mm_firmware_header_v1_0 { 
	uint32_t umsch_mm_data_start_addr_hi;

};



/* version_major=3, version_minor=0 */

struct sdma_firmware_header_v3_0 {

    struct common_firmware_header header;

    uint32_t ucode_feature_version;

    uint32_t ucode_offset_bytes;

    uint32_t ucode_size_bytes;

};



/* gpu info payload */

struct gpu_info_firmware_v1_0 {

	uint32_t gc_num_se;
@@ -431,6 +439,7 @@ union amdgpu_firmware_header { 
	struct sdma_firmware_header_v1_0 sdma;

	struct sdma_firmware_header_v1_1 sdma_v1_1;

	struct sdma_firmware_header_v2_0 sdma_v2_0;

	struct sdma_firmware_header_v3_0 sdma_v3_0;

	struct gpu_info_firmware_header_v1_0 gpu_info;

	struct dmcu_firmware_header_v1_0 dmcu;

	struct dmcub_firmware_header_v1_0 dmcub;