drm/radeon/dpm: implement force performance level for SI (a160a6a3) · Commits · 戴 / test

drivers/gpu/drm/radeon/radeon_asic.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2287,6 +2287,7 @@ static struct radeon_asic si_asic = {
	.get_mclk = &ni_dpm_get_mclk,		.get_mclk = &ni_dpm_get_mclk,
	.print_power_state = &ni_dpm_print_power_state,		.print_power_state = &ni_dpm_print_power_state,
	.debugfs_print_current_performance_level = &si_dpm_debugfs_print_current_performance_level,		.debugfs_print_current_performance_level = &si_dpm_debugfs_print_current_performance_level,
			.force_performance_level = &si_dpm_force_performance_level,
	},		},
	.pflip = {		.pflip = {
	.pre_page_flip = &evergreen_pre_page_flip,		.pre_page_flip = &evergreen_pre_page_flip,

drivers/gpu/drm/radeon/radeon_asic.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -683,6 +683,8 @@ void si_dpm_fini(struct radeon_device *rdev);
	void si_dpm_display_configuration_changed(struct radeon_device *rdev);		void si_dpm_display_configuration_changed(struct radeon_device *rdev);
	void si_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,		void si_dpm_debugfs_print_current_performance_level(struct radeon_device *rdev,
	struct seq_file *m);		struct seq_file *m);
			int si_dpm_force_performance_level(struct radeon_device *rdev,
			enum radeon_dpm_forced_level level);

	/* DCE8 - CIK */		/* DCE8 - CIK */
	void dce8_bandwidth_update(struct radeon_device *rdev);		void dce8_bandwidth_update(struct radeon_device *rdev);

drivers/gpu/drm/radeon/si_dpm.c

+33 −9

Original line number	Original line	Diff line number	Diff line
	@@ -3231,16 +3231,38 @@ static int si_restrict_performance_levels_before_switch(struct radeon_device *rd
	0 : -EINVAL;		0 : -EINVAL;
	}		}

	#if 0		int si_dpm_force_performance_level(struct radeon_device *rdev,
	static int si_unrestrict_performance_levels_after_switch(struct radeon_device *rdev)		enum radeon_dpm_forced_level level)
	{		{
			struct radeon_ps *rps = rdev->pm.dpm.current_ps;
			struct ni_ps *ps = ni_get_ps(rps);
			u32 levels;

			if (level == RADEON_DPM_FORCED_LEVEL_HIGH) {
			if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) != PPSMC_Result_OK)
			return -EINVAL;

			if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 1) != PPSMC_Result_OK)
			return -EINVAL;
			} else if (level == RADEON_DPM_FORCED_LEVEL_LOW) {
	if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)		if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
	return -EINVAL;		return -EINVAL;

	return (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) == PPSMC_Result_OK) ?		levels = ps->performance_level_count - 1;
	0 : -EINVAL;		if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, levels) != PPSMC_Result_OK)
			return -EINVAL;
			} else if (level == RADEON_DPM_FORCED_LEVEL_AUTO) {
			if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetForcedLevels, 0) != PPSMC_Result_OK)
			return -EINVAL;

			if (si_send_msg_to_smc_with_parameter(rdev, PPSMC_MSG_SetEnabledLevels, 0) != PPSMC_Result_OK)
			return -EINVAL;
			}

			rdev->pm.dpm.forced_level = level;

			return 0;
	}		}
	#endif

	static int si_set_boot_state(struct radeon_device *rdev)		static int si_set_boot_state(struct radeon_device *rdev)
	{		{
	@@ -5992,11 +6014,13 @@ int si_dpm_set_power_state(struct radeon_device *rdev)

	#if 0		#if 0
	/* XXX */		/* XXX */
	ret = si_unrestrict_performance_levels_after_switch(rdev);		ret = si_dpm_force_performance_level(rdev, RADEON_DPM_FORCED_LEVEL_AUTO);
	if (ret) {		if (ret) {
	DRM_ERROR("si_unrestrict_performance_levels_after_switch failed\n");		DRM_ERROR("si_dpm_force_performance_level failed\n");
	return ret;		return ret;
	}		}
			#else
			rdev->pm.dpm.forced_level = RADEON_DPM_FORCED_LEVEL_AUTO;
	#endif		#endif

	return 0;		return 0;

Admin message