Commit b1d83546 authored by David (Ming Qiang) Wu's avatar David (Ming Qiang) Wu Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: add instance number to VCN version message 



For multiple VCN instances case we get multiple lines of the same
message like below:

  amdgpu 0000:43:00.0: amdgpu: Found VCN firmware Version ENC: 1.24 DEC: 9 VEP: 0 Revision: 11
  amdgpu 0000:43:00.0: amdgpu: Found VCN firmware Version ENC: 1.24 DEC: 9 VEP: 0 Revision: 11

By adding instance number to the log message for multiple VCN instances,
each line will clearly indicate which VCN instance it refers to.

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDavid (Ming Qiang) Wu <David.Wu3@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 010219cc

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

+4 −4
Original line number Diff line number Diff line
@@ -185,16 +185,16 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev, int i) 
		dec_ver = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xf;

		vep = (le32_to_cpu(hdr->ucode_version) >> 28) & 0xf;

		dev_info(adev->dev,

			 "Found VCN firmware Version ENC: %u.%u DEC: %u VEP: %u Revision: %u\n",

			 enc_major, enc_minor, dec_ver, vep, fw_rev);

			 "[VCN instance %d] Found VCN firmware Version ENC: %u.%u DEC: %u VEP: %u Revision: %u\n",

			 i, enc_major, enc_minor, dec_ver, vep, fw_rev);

	} else {

		unsigned int version_major, version_minor, family_id;



		family_id = le32_to_cpu(hdr->ucode_version) & 0xff;

		version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;

		version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;

		dev_info(adev->dev, "Found VCN firmware Version: %u.%u Family ID: %u\n",

			 version_major, version_minor, family_id);

		dev_info(adev->dev, "[VCN instance %d] Found VCN firmware Version: %u.%u Family ID: %u\n",

			 i, version_major, version_minor, family_id);

	}



	bo_size = AMDGPU_VCN_STACK_SIZE + AMDGPU_VCN_CONTEXT_SIZE;