From: David Francis Date: Thu, 13 Sep 2018 19:36:27 +0000 (-0400) Subject: drm/amd/display: Add DMCU firmware version X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ee6e89c0f1d18fef9206e68747577d99bbf923ea;p=openwrt%2Fstaging%2Fblogic.git 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 Signed-off-by: Alex Deucher --- 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 1ff2e8fd5a22..985c6291dbfd 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -589,6 +589,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 9a57c654943a..b6fe9adf4b93 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h @@ -131,6 +131,7 @@ struct amdgpu_display_manager { struct dm_comressor_info compressor; const struct firmware *fw_dmcu; + uint32_t dmcu_fw_version; }; struct amdgpu_dm_connector {