Skip to contentSkip to conversation

Revert "drm/amdgpu: Add unique_id for Arcturus"

PATCH In review Kent Russell 2 participants 3 messages May 7, 2020

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

PATCH 1/2 Revert "drm/amdgpu: Add unique_id for Arcturus"

This reverts commit b3abbca4eca6091e0e657baf9a5402e204e97d4c.

SMU does not support this on Arcturus right now

Change-Id Ia5f29f91a64005f68dbb9499b43789fe473cd00c
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 10 ----------
 1 file changed, 10 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -10
index f55f9b371bf2..e98d92ec1eac 100644
@@ -293,7 +293,6 @@ static int arcturus_get_workload_type(struct smu_context *smu, enum PP_SMC_POWER
 static int arcturus_tables_init(struct smu_context *smu, struct smu_table *tables)
 {
 	struct smu_table_context *smu_table = &smu->smu_table;
-	uint32_t top32, bottom32;
 
 	SMU_TABLE_INIT(tables, SMU_TABLE_PPTABLE, sizeof(PPTable_t),
 		       PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM);
@@ -316,15 +315,6 @@ static int arcturus_tables_init(struct smu_context *smu, struct smu_table *table
 		return -ENOMEM;
 	smu_table->metrics_time = 0;
 
-	if (smu->adev->asic_type == CHIP_ARCTURUS) {
-		/* Get the SN to turn into a Unique ID */
-		smu_send_smc_msg(smu, SMU_MSG_ReadSerialNumTop32,
-				 &top32);
-		smu_send_smc_msg(smu, SMU_MSG_ReadSerialNumBottom32,
-				 &bottom32);
-
-		smu->adev->unique_id = ((uint64_t)bottom32 << 32) | top32;
-	}
 	return 0;
 }
 
Signature · 6 lines
2.17.1

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

PATCH 2/2 Revert "drm/amdgpu: Add ReadSerial defines for Arcturus"

This reverts commit a0d4939d8616fab676699dab8ba3cbe519d4a8e9.

SMU does not support this on Arcturus right now

Change-Id I50efa3695570302231986d56c2351aac331726ca
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       | 2 --
 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 ---
 2 files changed, 5 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -2
index e98d92ec1eac..1c66b7d7139c 100644
@@ -128,8 +128,6 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT]
 	MSG_MAP(SetXgmiMode,			     PPSMC_MSG_SetXgmiMode),
 	MSG_MAP(SetMemoryChannelEnable,		     PPSMC_MSG_SetMemoryChannelEnable),
 	MSG_MAP(DFCstateControl,		     PPSMC_MSG_DFCstateControl),
-	MSG_MAP(ReadSerialNumTop32,		     PPSMC_MSG_ReadSerialNumTop32),
-	MSG_MAP(ReadSerialNumBottom32,		     PPSMC_MSG_ReadSerialNumBottom32),
 };
 
 static struct smu_11_0_cmn2aisc_mapping arcturus_clk_map[SMU_CLK_COUNT] = {
drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h +0 -3
index b426be7c76c6..f736d773f9d6 100644
@@ -116,9 +116,6 @@
 #define PPSMC_MSG_DFCstateControl		 0x3B
 #define PPSMC_Message_Count			 0x3C
 
-#define PPSMC_MSG_ReadSerialNumTop32		 0x49
-#define PPSMC_MSG_ReadSerialNumBottom32		 0x4A
-
 typedef uint32_t PPSMC_Result;
 typedef uint32_t PPSMC_Msg;
 #pragma pack(pop)
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] Revert "drm/amdgpu: Add ReadSerial defines for Arcturus"

[AMD Public Use]

Series is:

________________________________
From: amd-gfx <[email protected]> on behalf of Kent Russell <[email protected]>
Sent: Thursday, May 7, 2020 2:54 PM
To: [email protected] <[email protected]>
Cc: Russell, Kent <[email protected]>
Subject: [PATCH 2/2] Revert "drm/amdgpu: Add ReadSerial defines for Arcturus"

This reverts commit a0d4939d8616fab676699dab8ba3cbe519d4a8e9.

SMU does not support this on Arcturus right now

Change-Id I50efa3695570302231986d56c2351aac331726ca
---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c       | 2 --
 drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 ---
 2 files changed, 5 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -2
index e98d92ec1eac..1c66b7d7139c 100644
@@ -128,8 +128,6 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT]
         MSG_MAP(SetXgmiMode,                         PPSMC_MSG_SetXgmiMode),
         MSG_MAP(SetMemoryChannelEnable,              PPSMC_MSG_SetMemoryChannelEnable),
         MSG_MAP(DFCstateControl,                     PPSMC_MSG_DFCstateControl),
-       MSG_MAP(ReadSerialNumTop32,                  PPSMC_MSG_ReadSerialNumTop32),
-       MSG_MAP(ReadSerialNumBottom32,               PPSMC_MSG_ReadSerialNumBottom32),
 };
 
 static struct smu_11_0_cmn2aisc_mapping arcturus_clk_map[SMU_CLK_COUNT] = {
drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h +0 -3
index b426be7c76c6..f736d773f9d6 100644
@@ -116,9 +116,6 @@
 #define PPSMC_MSG_DFCstateControl                0x3B
 #define PPSMC_Message_Count                      0x3C
 
-#define PPSMC_MSG_ReadSerialNumTop32            0x49
-#define PPSMC_MSG_ReadSerialNumBottom32                 0x4A
-
 typedef uint32_t PPSMC_Result;
 typedef uint32_t PPSMC_Msg;
 #pragma pack(pop)

--
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Calexander.deucher%40amd.com%7C67572abb9c0c4048437508d7f2b80cdc%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637244744643483015&amp;sdata=C%2B1WKdorha3NIZHKxeNQTcD8krgBeP2I2crG0dCrRPk%3D&amp;reserved=0

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