Commit 0e99e960 authored by Shirish S's avatar Shirish S Committed by Alex Deucher
Browse files

drm/amdgpu/display: fix DMUB firmware version info 



DMUB firmware info is printed before it gets initialized.
Correct this order to ensure true value is conveyed.

Signed-off-by: default avatarShirish S <shirish.s@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent c4152b29

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+1 −1
Original line number Diff line number Diff line
@@ -1548,6 +1548,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) 
	}



	hdr = (const struct dmcub_firmware_header_v1_0 *)adev->dm.dmub_fw->data;

	adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);



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

		adev->firmware.ucode[AMDGPU_UCODE_ID_DMCUB].ucode_id =
@@ -1561,7 +1562,6 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev) 
			 adev->dm.dmcub_fw_version);

	}



	adev->dm.dmcub_fw_version = le32_to_cpu(hdr->header.ucode_version);



	adev->dm.dmub_srv = kzalloc(sizeof(*adev->dm.dmub_srv), GFP_KERNEL);

	dmub_srv = adev->dm.dmub_srv;