Commit 93c5f1f6 authored by Matt Coffin's avatar Matt Coffin Committed by Alex Deucher
Browse files

drm/amdgpu/smu_v11_0: Correct behavior of restoring default tables (v2) 

Previously, the syfs functionality for restoring the default powerplay
table was sourcing it's information from the currently-staged powerplay
table.

This patch adds a step to cache the first overdrive table that we see on
boot, so that it can be used later to "restore" the powerplay table

v2: sqaush my original with Matt's fix

Bug: https://gitlab.freedesktop.org/drm/amd/issues/1020


Signed-off-by: default avatarMatt Coffin <mcoffin13@gmail.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.5.x
parent ee23a518

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ struct smu_table_context 
	uint8_t                         thermal_controller_type;



	void				*overdrive_table;

	void                            *boot_overdrive_table;

};



struct smu_dpm_context {

drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+7 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,13 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL 
			return ret;

		od_table->UclkFmax = input[1];

		break;

	case PP_OD_RESTORE_DEFAULT_TABLE:

		if (!(table_context->overdrive_table && table_context->boot_overdrive_table)) {

			pr_err("Overdrive table was not initialized!\n");

			return -EINVAL;

		}

		memcpy(table_context->overdrive_table, table_context->boot_overdrive_table, sizeof(OverDriveTable_t));

		break;

	case PP_OD_COMMIT_DPM_TABLE:

		navi10_dump_od_table(od_table);

		ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, (void *)od_table, true);

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+6 −0
Original line number Diff line number Diff line
@@ -1882,6 +1882,12 @@ int smu_v11_0_set_default_od_settings(struct smu_context *smu, bool initialize, 
			pr_err("Failed to export overdrive table!\n");

			return ret;

		}

		if (!table_context->boot_overdrive_table) {

			table_context->boot_overdrive_table = kmemdup(table_context->overdrive_table, overdrive_table_size, GFP_KERNEL);

			if (!table_context->boot_overdrive_table) {

				return -ENOMEM;

			}

		}

	}

	ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, table_context->overdrive_table, true);

	if (ret) {

drivers/gpu/drm/amd/powerplay/vega20_ppt.c

+8 −20
Original line number Diff line number Diff line
@@ -1706,22 +1706,11 @@ static int vega20_set_default_od_settings(struct smu_context *smu, 
	struct smu_table_context *table_context = &smu->smu_table;

	int ret;



	if (initialize) {

		if (table_context->overdrive_table)

			return -EINVAL;



		table_context->overdrive_table = kzalloc(sizeof(OverDriveTable_t), GFP_KERNEL);



		if (!table_context->overdrive_table)

			return -ENOMEM;



		ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0,

				       table_context->overdrive_table, false);

		if (ret) {

			pr_err("Failed to export over drive table!\n");

	ret = smu_v11_0_set_default_od_settings(smu, initialize, sizeof(OverDriveTable_t));

	if (ret)

		return ret;

		}



	if (initialize) {

		ret = vega20_set_default_od8_setttings(smu);

		if (ret)

			return ret;
@@ -2778,12 +2767,11 @@ static int vega20_odn_edit_dpm_table(struct smu_context *smu, 
		break;



	case PP_OD_RESTORE_DEFAULT_TABLE:

		ret = smu_update_table(smu, SMU_TABLE_OVERDRIVE, 0, table_context->overdrive_table, false);

		if (ret) {

			pr_err("Failed to export over drive table!\n");

			return ret;

		if (!(table_context->overdrive_table && table_context->boot_overdrive_table)) {

			pr_err("Overdrive table was not initialized!\n");

			return -EINVAL;

		}



		memcpy(table_context->overdrive_table, table_context->boot_overdrive_table, sizeof(OverDriveTable_t));

		break;



	case PP_OD_COMMIT_DPM_TABLE:

CRA Git | Maintained and supported by SUSTech CRA and CCSE