<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=Windows-1252"> </head> <body text="#000000" bgcolor="#FFFFFF"> With this change in latest drm-next and related commit in latest FW i get [ 148.887374] [drm:psp_hw_init [amdgpu]] *ERROR* PSP firmware loading failed [ 148.887535] [drm:amdgpu_device_fw_loading [amdgpu]] *ERROR* hw_init of IP block <psp> failed -22 Had to revert to be able to boot. Andrey <div class="moz-cite-prefix">On 12/13/2018 10:05 AM, Deucher, Alexander wrote: </div> <blockquote type="cite" cite="mid:BN6PR12MB180900FC993E80DD7F22127AF7A00@BN6PR12MB1809.namprd12.prod.outlook.com"> <style type="text/css" style="display:none;"></style> <div id="divtagdefaultwrapper" style="font-size:12pt;color:#000000;font-family:Calibri,Helvetica,sans-serif;" dir="ltr"> Acked-by: Alex Deucher <a class="moz-txt-link-rfc2396E" href="mailto:alexander.deucher@amd.com"> <alexander.deucher@amd.com></a> </div> <hr style="display:inline-block;width:98%" tabindex="-1"> <div id="divRplyFwdMsg" dir="ltr">From: amd-gfx <a class="moz-txt-link-rfc2396E" href="mailto:amd-gfx-bounces@lists.freedesktop.org"> <amd-gfx-bounces@lists.freedesktop.org></a> on behalf of Evan Quan <a class="moz-txt-link-rfc2396E" href="mailto:evan.quan@amd.com"> <evan.quan@amd.com></a> Sent: Thursday, December 13, 2018 1:14:51 AM To: <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org"> amd-gfx@lists.freedesktop.org</a> Cc: Quan, Evan Subject: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">The new PSP SOS firmware can support both A0 and A1. Change-Id: I9bf85eb77b183a4403667c77e291e32689aed0af --- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c index 61cf2f6954e7..f3f5d4dd4631 100644 --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c @@ -34,14 +34,11 @@ #include "nbio/nbio_7_4_offset.h" MODULE_FIRMWARE("amdgpu/vega20_sos.bin"); -MODULE_FIRMWARE("amdgpu/vega20_sos_old.bin"); MODULE_FIRMWARE("amdgpu/vega20_ta.bin"); /* address block */ #define smnMP1_FIRMWARE_FLAGS 0x3010024 -#define VEGA20_BL_VERSION_VAR_NEW 0xA1 - static int psp_v11_0_get_fw_type(struct amdgpu_firmware_info *ucode, enum psp_gfx_fw_type *type) { @@ -104,7 +101,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) int err = 0; const struct psp_firmware_header_v1_0 *sos_hdr; const struct ta_firmware_header_v1_0 *ta_hdr; - uint32_t bl_version; DRM_DEBUG("\n"); @@ -116,13 +112,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) BUG(); } - bl_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_100); - bl_version = (bl_version & 0xFF0000) >> 16; - - if (bl_version == VEGA20_BL_VERSION_VAR_NEW) - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name); - else - snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos_old.bin", chip_name); + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name); err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev); if (err) goto out; -- 2.19.2 _______________________________________________ amd-gfx mailing list <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx" moz-do-not-send="true">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a> </div> </div> <fieldset class="mimeAttachmentHeader"></fieldset> <pre wrap="">_______________________________________________ amd-gfx mailing list <a class="moz-txt-link-abbreviated" href="mailto:amd-gfx@lists.freedesktop.org">amd-gfx@lists.freedesktop.org</a> <a class="moz-txt-link-freetext" href="https://lists.freedesktop.org/mailman/listinfo/amd-gfx">https://lists.freedesktop.org/mailman/listinfo/amd-gfx</a> </pre> </blockquote> </body> </html>