drm/amd/powerplay: update current profile mode only when it's really applied (e815a9e6) · Commits · 戴 / test

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -4904,13 +4904,12 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr hwmgr, long input, ui
		uint8_t FPS;
		uint8_t use_rlc_busy;
		uint8_t min_active_level;

		hwmgr->power_profile_mode = input[size];
		uint32_t power_profile_mode = input[size];

		smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask,
		1<<hwmgr->power_profile_mode);
		1 << power_profile_mode);

		if (hwmgr->power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
		if (power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
		if (size == 0 \|\| size > 4)
		return -EINVAL;

		@@ -4924,6 +4923,8 @@ static int vega10_set_power_profile_mode(struct pp_hwmgr hwmgr, long input, ui
		use_rlc_busy << 16 \| min_active_level<<24);
		}

		hwmgr->power_profile_mode = power_profile_mode;

		return 0;
		}

+7 −6

Original line number	Diff line number	Diff line
		@@ -3819,15 +3819,14 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr hwmgr, long input, ui
		{
		DpmActivityMonitorCoeffInt_t activity_monitor;
		int workload_type, result = 0;
		uint32_t power_profile_mode = input[size];

		hwmgr->power_profile_mode = input[size];

		if (hwmgr->power_profile_mode > PP_SMC_POWER_PROFILE_CUSTOM) {
		pr_err("Invalid power profile mode %d\n", hwmgr->power_profile_mode);
		if (power_profile_mode > PP_SMC_POWER_PROFILE_CUSTOM) {
		pr_err("Invalid power profile mode %d\n", power_profile_mode);
		return -EINVAL;
		}

		if (hwmgr->power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
		if (power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
		if (size < 10)
		return -EINVAL;

		@@ -3895,10 +3894,12 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr hwmgr, long input, ui

		/* conv PP_SMC_POWER_PROFILE* to WORKLOAD_PPLIB__BIT /
		workload_type =
		conv_power_profile_to_pplib_workload(hwmgr->power_profile_mode);
		conv_power_profile_to_pplib_workload(power_profile_mode);
		smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetWorkloadMask,
		1 << workload_type);

		hwmgr->power_profile_mode = power_profile_mode;

		return 0;
		}