* [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1
@ 2018-12-13 6:14 Evan Quan
[not found] ` <20181213061451.29038-1-evan.quan-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Evan Quan @ 2018-12-13 6:14 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Evan Quan
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
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <20181213061451.29038-1-evan.quan-5C7GfCeVMHo@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 [not found] ` <20181213061451.29038-1-evan.quan-5C7GfCeVMHo@public.gmane.org> @ 2018-12-13 15:05 ` Deucher, Alexander [not found] ` <BN6PR12MB180900FC993E80DD7F22127AF7A00-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Deucher, Alexander @ 2018-12-13 15:05 UTC (permalink / raw) To: Quan, Evan, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1: Type: text/plain, Size: 2495 bytes --] Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org> ________________________________ From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Evan Quan <evan.quan-5C7GfCeVMHo@public.gmane.org> Sent: Thursday, December 13, 2018 1:14:51 AM To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: Quan, Evan Subject: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 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 amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 4566 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <BN6PR12MB180900FC993E80DD7F22127AF7A00-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>]
* Re: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 [not found] ` <BN6PR12MB180900FC993E80DD7F22127AF7A00-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org> @ 2018-12-14 19:29 ` Grodzovsky, Andrey 0 siblings, 0 replies; 3+ messages in thread From: Grodzovsky, Andrey @ 2018-12-14 19:29 UTC (permalink / raw) To: Deucher, Alexander, Quan, Evan, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW [-- Attachment #1.1: Type: text/plain, Size: 3381 bytes --] 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 On 12/13/2018 10:05 AM, Deucher, Alexander wrote: Acked-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org><mailto:alexander.deucher@amd.com> ________________________________ From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org><mailto:amd-gfx-bounces@lists.freedesktop.org> on behalf of Evan Quan <evan.quan-5C7GfCeVMHo@public.gmane.org><mailto:evan.quan-5C7GfCeVMHo@public.gmane.org> Sent: Thursday, December 13, 2018 1:14:51 AM To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> Cc: Quan, Evan Subject: [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 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 amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org<mailto:amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> https://lists.freedesktop.org/mailman/listinfo/amd-gfx [-- Attachment #1.2: Type: text/html, Size: 6269 bytes --] [-- Attachment #2: Type: text/plain, Size: 154 bytes --] _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-14 19:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-13 6:14 [PATCH] drm/amdgpu: unify Vega20 PSP SOS firmwares for A0 and A1 Evan Quan
[not found] ` <20181213061451.29038-1-evan.quan-5C7GfCeVMHo@public.gmane.org>
2018-12-13 15:05 ` Deucher, Alexander
[not found] ` <BN6PR12MB180900FC993E80DD7F22127AF7A00-/b2+HYfkarSEx6ez0IUAagdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2018-12-14 19:29 ` Grodzovsky, Andrey
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.