Skip to contentSkip to conversation

drm/amd/powerplay: allocate fb for avfs fuse table on vega10.

PATCH In review Rex Zhu 2 participants 6 messages Apr 20, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/5 drm/amd/powerplay: allocate fb for avfs fuse table on vega10.

Change-Id I1faf3fda843c032a3bba6d6a82df23fb5cab478b
---
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c   | 36 ++++++++++++++++++++++
 .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h   |  1 +
 2 files changed, 37 insertions(+)
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +36 -0
index a3b7986..d626dd9 100644
@@ -512,6 +512,40 @@ static int vega10_smu_init(struct pp_smumgr *smumgr)
 		}
 	}
 
+	/* allocate space for AVFS Fuse table */
+	smu_allocate_memory(smumgr->device,
+			sizeof(AvfsFuseOverride_t),
+			CGS_GPU_MEM_TYPE__VISIBLE_CONTIG_FB,
+			PAGE_SIZE,
+			&mc_addr,
+			&kaddr,
+			&handle);
+
+	PP_ASSERT_WITH_CODE(kaddr,
+			"[vega10_smu_init] Out of memory for avfs fuse table.",
+			kfree(smumgr->backend);
+			cgs_free_gpu_mem(smumgr->device,
+			(cgs_handle_t)priv->smu_tables.entry[PPTABLE].handle);
+			cgs_free_gpu_mem(smumgr->device,
+			(cgs_handle_t)priv->smu_tables.entry[WMTABLE].handle);
+			cgs_free_gpu_mem(smumgr->device,
+			(cgs_handle_t)priv->smu_tables.entry[AVFSTABLE].handle);
+			cgs_free_gpu_mem(smumgr->device,
+			(cgs_handle_t)priv->smu_tables.entry[TOOLSTABLE].handle);
+			cgs_free_gpu_mem(smumgr->device,
+			(cgs_handle_t)handle);
+			return -1);
+
+	priv->smu_tables.entry[AVFSFUSETABLE].version = 0x01;
+	priv->smu_tables.entry[AVFSFUSETABLE].size = sizeof(AvfsFuseOverride_t);
+	priv->smu_tables.entry[AVFSFUSETABLE].table_id = TABLE_AVFS_FUSE_OVERRIDE;
+	priv->smu_tables.entry[AVFSFUSETABLE].table_addr_high =
+			smu_upper_32_bits(mc_addr);
+	priv->smu_tables.entry[AVFSFUSETABLE].table_addr_low =
+			smu_lower_32_bits(mc_addr);
+	priv->smu_tables.entry[AVFSFUSETABLE].table = kaddr;
+	priv->smu_tables.entry[AVFSFUSETABLE].handle = handle;
+
 	return 0;
 }
 
@@ -530,6 +564,8 @@ static int vega10_smu_fini(struct pp_smumgr *smumgr)
 		if (priv->smu_tables.entry[TOOLSTABLE].table)
 			cgs_free_gpu_mem(smumgr->device,
 					(cgs_handle_t)priv->smu_tables.entry[TOOLSTABLE].handle);
+		cgs_free_gpu_mem(smumgr->device,
+				(cgs_handle_t)priv->smu_tables.entry[AVFSFUSETABLE].handle);
 		kfree(smumgr->backend);
 		smumgr->backend = NULL;
 	}
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h +1 -0
index 71e9b64..821425c 100644
@@ -30,6 +30,7 @@ enum smu_table_id {
 	WMTABLE,
 	AVFSTABLE,
 	TOOLSTABLE,
+	AVFSFUSETABLE,
 	MAX_SMU_TABLE,
 };
 
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): 1492677872-20232-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

author
#2 lore raw

PATCH 2/5 drm/amd/powerplay: enable pcie dpm on Vega10.

Change-Id I82867244a510612dca06ea21b12de46338f34245
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +2 -1
index deb1124..ee40378 100644
@@ -111,6 +111,8 @@ static void vega10_set_default_registry_data(struct pp_hwmgr *hwmgr)
 			hwmgr->feature_mask & PP_SOCCLK_DPM_MASK ? false : true;
 	data->registry_data.mclk_dpm_key_disabled =
 			hwmgr->feature_mask & PP_MCLK_DPM_MASK ? false : true;
+	data->registry_data.pcie_dpm_key_disabled =
+			hwmgr->feature_mask & PP_PCIE_DPM_MASK ? false : true;
 
 	data->registry_data.dcefclk_dpm_key_disabled =
 			hwmgr->feature_mask & PP_DCEFCLK_DPM_MASK ? false : true;
@@ -121,7 +123,6 @@ static void vega10_set_default_registry_data(struct pp_hwmgr *hwmgr)
 		data->registry_data.enable_tdc_limit_feature = 1;
 	}
 
-	data->registry_data.pcie_dpm_key_disabled = 1;
 	data->registry_data.disable_water_mark = 0;
 
 	data->registry_data.fan_control_support = 1;
Signature · 6 lines
1.9.1

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

PATCH 3/5 drm/amd/powerplay: enable clock stretch feature on Vega10.

In reply to a message not in the archive

1. Correctly calculate CKSVidOffset

Change-Id I03b4a88297e49139572f3ba659b76b3a14e45792
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +7 -5
index ee40378..0042c33 100644
@@ -123,6 +123,9 @@ static void vega10_set_default_registry_data(struct pp_hwmgr *hwmgr)
 		data->registry_data.enable_tdc_limit_feature = 1;
 	}
 
+	data->registry_data.clock_stretcher_support =
+			hwmgr->feature_mask & PP_CLOCK_STRETCH_MASK ? true : false;
+
 	data->registry_data.disable_water_mark = 0;
 
 	data->registry_data.fan_control_support = 1;
@@ -2045,10 +2048,10 @@ static int vega10_populate_clock_stretcher_table(struct pp_hwmgr *hwmgr)
 			table_info->vdd_dep_on_sclk;
 	uint32_t i;
 
-	for (i = 0; dep_table->count; i++) {
+	for (i = 0; i < dep_table->count; i++) {
 		pp_table->CksEnable[i] = dep_table->entries[i].cks_enable;
-		pp_table->CksVidOffset[i] = convert_to_vid(
-				dep_table->entries[i].cks_voffset);
+		pp_table->CksVidOffset[i] = (uint8_t)(dep_table->entries[i].cks_voffset
+				* VOLTAGE_VID_OFFSET_SCALE2 / VOLTAGE_VID_OFFSET_SCALE1);
 	}
 
 	return 0;
@@ -2380,8 +2383,7 @@ static int vega10_init_smc_table(struct pp_hwmgr *hwmgr)
 			"Failed to initialize UVD Level!",
 			return result);
 
-	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
-			PHM_PlatformCaps_ClockStretcher)) {
+	if (data->registry_data.clock_stretcher_support) {
 		result = vega10_populate_clock_stretcher_table(hwmgr);
 		PP_ASSERT_WITH_CODE(!result,
 				"Failed to populate Clock Stretcher Table!",
Signature · 6 lines
1.9.1

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

PATCH 4/5 drm/amd/powerplay: Fix AVFS param.

In reply to a message not in the archive
Change-Id If5a1b94efba8a5a7281e28e0019aca2efc9a1952
---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +4 -4
index 0042c33..278def7 100644
@@ -2163,7 +2163,7 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
 
 			pp_table->DisplayClock2Gfxclk[DSPCLK_DISPCLK].m1_shift = 24;
 			pp_table->DisplayClock2Gfxclk[DSPCLK_DISPCLK].m2_shift = 12;
-			pp_table->DisplayClock2Gfxclk[DSPCLK_DISPCLK].b_shift = 0;
+			pp_table->DisplayClock2Gfxclk[DSPCLK_DISPCLK].b_shift = 12;
 
 			if ((PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=
 					data->dcef_clk_quad_eqn_a) &&
@@ -2186,7 +2186,7 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
 
 			pp_table->DisplayClock2Gfxclk[DSPCLK_DCEFCLK].m1_shift = 24;
 			pp_table->DisplayClock2Gfxclk[DSPCLK_DCEFCLK].m2_shift = 12;
-			pp_table->DisplayClock2Gfxclk[DSPCLK_DCEFCLK].b_shift = 0;
+			pp_table->DisplayClock2Gfxclk[DSPCLK_DCEFCLK].b_shift = 12;
 
 			if ((PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=
 					data->pixel_clk_quad_eqn_a) &&
@@ -2209,7 +2209,7 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
 
 			pp_table->DisplayClock2Gfxclk[DSPCLK_PIXCLK].m1_shift = 24;
 			pp_table->DisplayClock2Gfxclk[DSPCLK_PIXCLK].m2_shift = 12;
-
+			pp_table->DisplayClock2Gfxclk[DSPCLK_PIXCLK].b_shift = 12;
 			if ((PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=
 					data->phy_clk_quad_eqn_a) &&
 				(PPREGKEY_VEGA10QUADRATICEQUATION_DFLT !=
@@ -2231,7 +2231,7 @@ static int vega10_populate_avfs_parameters(struct pp_hwmgr *hwmgr)
 
 			pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].m1_shift = 24;
 			pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].m2_shift = 12;
-			pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].b_shift = 0;
+			pp_table->DisplayClock2Gfxclk[DSPCLK_PHYCLK].b_shift = 12;
 		} else {
 			data->smu_features[GNLD_AVFS].supported = false;
 		}
Signature · 6 lines
1.9.1

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

PATCH 5/5 drm/amd/powerplay: add avfs fuse overdriver

In reply to a message not in the archive

Change-Id: I0f98553985ddbda1473f5313ac803fb9a38ca43a

---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 42 ++++++++++++++++++++++
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |  1 +
 2 files changed, 43 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +42 -0
index 278def7..c8689ce 100644
@@ -2304,6 +2304,48 @@ static int vega10_avfs_enable(struct pp_hwmgr *hwmgr, bool enable)
 	return 0;
 }
 
+static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)
+{
+	int result = 0;
+
+	/* Keep Commented until SMC is ready.*/
+  /*  ULONGLONG SerialNumber = 0;
+    ULONG TOP32, BOTTOM32;
+    PHM_FusesDefault Fuses;
+    PhwVega10_PrivateData *pPrivate = (PhwVega10_PrivateData *)(pHwMgr->pBackEndPrivateData);
+    AvfsFuseOverride_t * AVFSFuseTable = &(pPrivate->smcStateTable.AvfsFuseOverrideTable);
+
+    Vega10_SendMsgToSmc(pHwMgr->pSmuMgr, PPSMC_MSG_ReadSerialNumTop32);
+    Vega10_ReadArgFromSmc(pHwMgr->pSmuMgr, &TOP32);
+    
+    Vega10_SendMsgToSmc(pHwMgr->pSmuMgr, PPSMC_MSG_ReadSerialNumBottom32);
+    Vega10_ReadArgFromSmc(pHwMgr->pSmuMgr, &BOTTOM32);
+
+    SerialNumber = ((ULONGLONG)BOTTOM32 << 32)| TOP32;
+    
+    if (PP_Override_GetDefaultFuseValue(SerialNumber, PHM_Vega10FusesDefault, &Fuses) == PP_Result_OK)
+    {
+        AVFSFuseTable->VFT0_b  = Fuses.VFT0_b;
+        AVFSFuseTable->VFT0_m1 = Fuses.VFT0_m1;
+        AVFSFuseTable->VFT0_m2 = Fuses.VFT0_m2;
+        AVFSFuseTable->VFT1_b  = Fuses.VFT1_b;
+        AVFSFuseTable->VFT1_m1 = Fuses.VFT2_m1;
+        AVFSFuseTable->VFT1_m2 = Fuses.VFT1_m2;
+        AVFSFuseTable->VFT2_b  = Fuses.VFT2_b;
+        AVFSFuseTable->VFT2_m1 = Fuses.VFT2_m1;
+        AVFSFuseTable->VFT2_m2 = Fuses.VFT2_m2;
+
+        result = PhwVega10_SMCTableManager(pHwMgr, SMUTABLE_WRITE, AVFSFUSETABLE_BIT_MASK);
+        PP_ASSERT_WITH_CODE(pHwMgr->pPECI, PP_Result_OK == result, "[PhwVega10_PopulateAndUploadAVFSFuseOverride] Failed to update FuseOVerride!", return result;);
+    }
+    else
+    {
+        result = PP_Result_OK;
+    }
+*/
+	return result;
+}
+
 /**
 * Initializes the SMC table and uploads it
 *
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +1 -0
index 83c67b9..6070896 100644
@@ -207,6 +207,7 @@ struct vega10_smc_state_table {
 	PPTable_t       pp_table;
 	Watermarks_t    water_marks_table;
 	AvfsTable_t     avfs_table;
+	AvfsFuseOverride_t AvfsFuseOverrideTable;
 };
 
 struct vega10_mclk_latency_entries {
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): 1492677872-20232-5-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

Reviewed-by
#7 lore raw

Re: [PATCH 5/5] drm/amd/powerplay: add avfs fuse overdriver

Quoted 11 lines · Rex Zhu

Change-Id: I0f98553985ddbda1473f5313ac803fb9a38ca43a

---
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 42 ++++++++++++++++++++++
 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h |  1 +
 2 files changed, 43 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +0 -0
index 278def7..c8689ce 100644

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c static int vega10_avfs_enable(struct pp_hwmgr *hwmgr, bool enable) · line 2313

Quoted 10 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +7 -0
@@ -2304,6 +2304,48 @@ static int vega10_avfs_enable(struct pp_hwmgr *hwmgr, bool enable)
        return 0;
 }
 
+static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)
+{
+       int result = 0;
+
+       /* Keep Commented until SMC is ready.*/
+  /*  ULONGLONG SerialNumber = 0;
+    ULONG TOP32, BOTTOM32;

Fix the types here. With that fixed, the series is:

Quoted 53 lines
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +35 -0
+    PHM_FusesDefault Fuses;
+    PhwVega10_PrivateData *pPrivate = (PhwVega10_PrivateData *)(pHwMgr->pBackEndPrivateData);
+    AvfsFuseOverride_t * AVFSFuseTable = &(pPrivate->smcStateTable.AvfsFuseOverrideTable);
+
+    Vega10_SendMsgToSmc(pHwMgr->pSmuMgr, PPSMC_MSG_ReadSerialNumTop32);
+    Vega10_ReadArgFromSmc(pHwMgr->pSmuMgr, &TOP32);
+
+    Vega10_SendMsgToSmc(pHwMgr->pSmuMgr, PPSMC_MSG_ReadSerialNumBottom32);
+    Vega10_ReadArgFromSmc(pHwMgr->pSmuMgr, &BOTTOM32);
+
+    SerialNumber = ((ULONGLONG)BOTTOM32 << 32)| TOP32;
+
+    if (PP_Override_GetDefaultFuseValue(SerialNumber, PHM_Vega10FusesDefault, &Fuses) == PP_Result_OK)
+    {
+        AVFSFuseTable->VFT0_b  = Fuses.VFT0_b;
+        AVFSFuseTable->VFT0_m1 = Fuses.VFT0_m1;
+        AVFSFuseTable->VFT0_m2 = Fuses.VFT0_m2;
+        AVFSFuseTable->VFT1_b  = Fuses.VFT1_b;
+        AVFSFuseTable->VFT1_m1 = Fuses.VFT2_m1;
+        AVFSFuseTable->VFT1_m2 = Fuses.VFT1_m2;
+        AVFSFuseTable->VFT2_b  = Fuses.VFT2_b;
+        AVFSFuseTable->VFT2_m1 = Fuses.VFT2_m1;
+        AVFSFuseTable->VFT2_m2 = Fuses.VFT2_m2;
+
+        result = PhwVega10_SMCTableManager(pHwMgr, SMUTABLE_WRITE, AVFSFUSETABLE_BIT_MASK);
+        PP_ASSERT_WITH_CODE(pHwMgr->pPECI, PP_Result_OK == result, "[PhwVega10_PopulateAndUploadAVFSFuseOverride] Failed to update FuseOVerride!", return result;);
+    }
+    else
+    {
+        result = PP_Result_OK;
+    }
+*/
+       return result;
+}
+
 /**
 * Initializes the SMC table and uploads it
 *
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h +1 -1
index 83c67b9..6070896 100644
@@ -207,6 +207,7 @@ struct vega10_smc_state_table {
        PPTable_t       pp_table;
        Watermarks_t    water_marks_table;
        AvfsTable_t     avfs_table;
+       AvfsFuseOverride_t AvfsFuseOverrideTable;
 };
 
 struct vega10_mclk_latency_entries {
--

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