From 9e6df3dcba75029a65068f8acdaecd26ecedcc9b Mon Sep 17 00:00:00 2001 From: David Francis Date: Thu, 13 Sep 2018 15:36:27 -0400 Subject: [PATCH 0305/2940] drm/amd/display: Add DMCU firmware version Read the version number from the common firmware header and store it in the dm struct Signed-off-by: David Francis Reviewed-by: Huang Rui --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + 2 files changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index cad0c24c989a..50d83e048d84 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -590,6 +590,8 @@ static int load_dmcu_fw(struct amdgpu_device *adev) adev->firmware.fw_size += ALIGN(le32_to_cpu(hdr->intv_size_bytes), PAGE_SIZE); + adev->dm.dmcu_fw_version = le32_to_cpu(hdr->header.ucode_version); + DRM_DEBUG_KMS("PSP loading DMCU firmware\n"); return 0; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h index 006c70b53b1b..92ad5eb9f93f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -121,6 +121,7 @@ struct amdgpu_display_manager { struct dm_comressor_info compressor; const struct firmware *fw_dmcu; + uint32_t dmcu_fw_version; }; struct amdgpu_dm_connector { -- 2.17.1