Skip to contentSkip to conversation

drm/amdgpu: remove unnecessary smc sk firmware for polaris12

PATCH In review Junwei Zhang 4 participants 4 messages Dec 23, 2016 – Dec 29, 2016 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu: remove unnecessary smc sk firmware for polaris12

Change-Id I8b08dcb352f20f277cbad1ffdad900118ec8a384
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c       | 5 +----
 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1 -4
index f13497a..d0e8710 100755
@@ -845,10 +845,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 					strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
 				break;
 			case CHIP_POLARIS12:
-				if (type == CGS_UCODE_ID_SMU)
-					strcpy(fw_name, "amdgpu/polaris12_smc.bin");
-				else if (type == CGS_UCODE_ID_SMU_SK)
-					strcpy(fw_name, "amdgpu/polaris12_smc_sk.bin");
+				strcpy(fw_name, "amdgpu/polaris12_smc.bin");
 				break;
 			default:
 				DRM_ERROR("SMC firmware not supported\n");
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +0 -1
index 1412f30..45737cd 100644
@@ -40,7 +40,6 @@ MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");
-MODULE_FIRMWARE("amdgpu/polaris12_smc_sk.bin");
 
 int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
 {
Signature · 6 lines
1.9.1

_______________________________________________
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): 1482457719-31191-1-git-send-email-Jerry.Zhang-5C7GfCeVMHo@public.gmane.org

Reviewed-by Chunming Zhou
#2 lore raw
Quoted 2 lines · Junwei Zhang
Change-Id I8b08dcb352f20f277cbad1ffdad900118ec8a384
Quoted 26 lines
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c       | 5 +----
  drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 -
  2 files changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1 -4
index f13497a..d0e8710 100755
@@ -845,10 +845,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
  					strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
  				break;
  			case CHIP_POLARIS12:
-				if (type == CGS_UCODE_ID_SMU)
-					strcpy(fw_name, "amdgpu/polaris12_smc.bin");
-				else if (type == CGS_UCODE_ID_SMU_SK)
-					strcpy(fw_name, "amdgpu/polaris12_smc_sk.bin");
+				strcpy(fw_name, "amdgpu/polaris12_smc.bin");
  				break;
  			default:
  				DRM_ERROR("SMC firmware not supported\n");
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +0 -0
index 1412f30..45737cd 100644

drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin"); · line 45

Quoted 7 lines
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +0 -1
@@ -40,7 +40,6 @@ MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");
  MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");
  MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");
  MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");
-MODULE_FIRMWARE("amdgpu/polaris12_smc_sk.bin");
 
  int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
  {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Acked-by
#3 lore raw
In reply to a message not in the archive
Quoted 2 lines · Junwei Zhang
Change-Id I8b08dcb352f20f277cbad1ffdad900118ec8a384
Quoted 40 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c       | 5 +----
 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1 -4
index f13497a..d0e8710 100755
@@ -845,10 +845,7 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
 					strcpy(fw_name, "amdgpu/polaris10_smc_sk.bin");
 				break;
 			case CHIP_POLARIS12:
-				if (type == CGS_UCODE_ID_SMU)
-					strcpy(fw_name, "amdgpu/polaris12_smc.bin");
-				else if (type == CGS_UCODE_ID_SMU_SK)
-					strcpy(fw_name, "amdgpu/polaris12_smc_sk.bin");
+				strcpy(fw_name, "amdgpu/polaris12_smc.bin");
 				break;
 			default:
 				DRM_ERROR("SMC firmware not supported\n");
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +0 -1
index 1412f30..45737cd 100644
@@ -40,7 +40,6 @@ MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");
-MODULE_FIRMWARE("amdgpu/polaris12_smc_sk.bin");
 
 int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)
 {
Signature · 6 lines
1.9.1

_______________________________________________
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

Reviewed-by Alex Deucher
#4 lore raw
In reply to a message not in the archive
Quoted 11 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Junwei Zhang
Sent: Thursday, December 22, 2016 8:49 PM
To: [email protected]
Cc: Zhang, Jerry
Subject: [PATCH 1/1] drm/amdgpu: remove unnecessary smc sk firmware for polaris12

Change-Id I8b08dcb352f20f277cbad1ffdad900118ec8a384
Quoted 45 lines
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c       | 5 +----
 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0 -4
index f13497a..d0e8710 100755
@@ -845,10 +845,7 @@ static int amdgpu_cgs_get_firmware_info(struct
 cgs_device *cgs_device,
 					strcpy(fw_name,
 "amdgpu/polaris10_smc_sk.bin");
 				break;
 			case CHIP_POLARIS12:
-				if (type == CGS_UCODE_ID_SMU)
-					strcpy(fw_name,
 "amdgpu/polaris12_smc.bin");
-				else if (type == CGS_UCODE_ID_SMU_SK)
-					strcpy(fw_name,

"amdgpu/polaris12_smc_sk.bin");

drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +1 -0
+				strcpy(fw_name,

"amdgpu/polaris12_smc.bin");

drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +0 -0
 				break;
 			default:
 				DRM_ERROR("SMC firmware not

supported\n");

drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +0 -1
index 1412f30..45737cd 100644
@@ -40,7 +40,6 @@
 MODULE_FIRMWARE("amdgpu/polaris10_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc.bin");
 MODULE_FIRMWARE("amdgpu/polaris11_smc_sk.bin");
 MODULE_FIRMWARE("amdgpu/polaris12_smc.bin");
-MODULE_FIRMWARE("amdgpu/polaris12_smc_sk.bin");
 
 int smum_init(struct amd_pp_init *pp_init, struct pp_instance *handle)

{
--
1.9.1

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