drm/amd/powerplay: fix request smc_sk firmware case
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: fix request smc_sk firmware case
This patch fixes firmware request error on polaris protection mode. Because we need load smc_sk instead of smc under security protection mode.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +4 -0
@@ -713,6 +713,7 @@ static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucodeCGS_FUNC_ADEV ;if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {release_firmware (adev->pm.fw); + adev->pm.fw =NULL ;return 0 ; }/* cannot release other firmware because they are not created by cgs */
@@ -808,6 +809,9 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,const uint8_t *src;const struct smc_firmware_header_v1_0 *hdr; +if (CGS_UCODE_ID_SMU_SK == type) +amdgpu_cgs_rel_firmware (cgs_device,CGS_UCODE_ID_SMU ); +if (!adev->pm.fw) {switch (adev->asic_type) {case CHIP_TOPAZ :
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1482131735-9092-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org
Quan, Evan
Tested-by Evan QuanQuoted 46 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Monday, December 19, 2016 3:16 PM
To: [email protected]
Cc: Huang, Ray <[email protected]>
Subject: [PATCH] drm/amd/powerplay: fix requestsmc_skfirmware caseThis patch fixes firmware request error on polaris protection mode. Because we need load
smc_skinstead of smc under security protection mode.Signed-off-by Huang Rui <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1
-0@@ -713,6 +713,7 @@ static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucodeCGS_FUNC_ADEV ;if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {release_firmware (adev->pm.fw); + adev->pm.fw =NULL ;return 0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0
-0}/* cannot release other firmware because they are not created by cgs */ @@ -808,6 +809,9 @@ static int amdgpu_cgs_get_firmware_info(struct
cgs_device*cgs_device,drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +2
-0const uint8_t *src;const struct smc_firmware_header_v1_0 *hdr; +if (CGS_UCODE_ID_SMU_SK == type) + amdgpu_cgs_rel_firmware(cgs_device,
CGS_UCODE_ID_SMU);drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1
-1+if (!adev->pm.fw) {switch (adev->asic_type) {case CHIP_TOPAZ : --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Huang Rui
Sent: Monday, December 19, 2016 2:16 AM
To: [email protected]
Cc: Huang, Ray
Subject: [PATCH] drm/amd/powerplay: fix requestsmc_skfirmware case
Quoted 5 lines
This patch fixes firmware request error on polaris protection mode. Because we need load
smc_skinstead of smc under security protection mode.Signed-off-by Huang Rui <[email protected]>
Quoted 35 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1
-0@@ -713,6 +713,7 @@ static int amdgpu_cgs_rel_firmware(struct cgs_device *cgs_device, enum cgs_ucodeCGS_FUNC_ADEV ;if ((CGS_UCODE_ID_SMU == type) || (CGS_UCODE_ID_SMU_SK == type)) {release_firmware (adev->pm.fw); + adev->pm.fw =NULL ;return 0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0
-0}/* cannot release other firmware because they are not created by cgs */
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +3
-0@@ -808,6 +809,9 @@ static int amdgpu_cgs_get_firmware_info(structcgs_device *cgs_device, const uint8_t *src;const struct smc_firmware_header_v1_0 *hdr; +if (CGS_UCODE_ID_SMU_SK == type) +amdgpu_cgs_rel_firmware (cgs_device,CGS_UCODE_ID_SMU ); +if (!adev->pm.fw) {drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0
-1switch (adev->asic_type) {case CHIP_TOPAZ : --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx