Commit 8b7f3529 authored by Boyuan Zhang's avatar Boyuan Zhang Committed by Alex Deucher
Browse files

drm/amd/pm: add inst to dpm_set_vcn_enable 



Add an instance parameter to the existing function dpm_set_vcn_enable()
for future implementation. Re-write all pptable functions accordingly.

v2: Remove duplicated dpm_set_vcn_enable() functions in v1. Instead,
adding instance parameter to existing functions.

Signed-off-by: default avatarBoyuan Zhang <boyuan.zhang@amd.com>
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Suggested-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bc068194

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int smu_dpm_set_vcn_enable(struct smu_context *smu, 
	if (atomic_read(&power_gate->vcn_gated) ^ enable)

		return 0;



	ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable);

	ret = smu->ppt_funcs->dpm_set_vcn_enable(smu, enable, 0xff);

	if (!ret)

		atomic_set(&power_gate->vcn_gated, !enable);

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ struct pptable_funcs { 
	 * @dpm_set_vcn_enable: Enable/disable VCN engine dynamic power

	 *                      management.

	 */

	int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable);

	int (*dpm_set_vcn_enable)(struct smu_context *smu, bool enable, int inst);



	/**

	 * @dpm_set_jpeg_enable: Enable/disable JPEG engine dynamic power

drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h

+2 −1
Original line number Diff line number Diff line
@@ -255,7 +255,8 @@ int smu_v13_0_wait_for_event(struct smu_context *smu, enum smu_event_type event, 
			     uint64_t event_arg);



int smu_v13_0_set_vcn_enable(struct smu_context *smu,

			     bool enable);

			      bool enable,

			      int inst);



int smu_v13_0_set_jpeg_enable(struct smu_context *smu,

			      bool enable);

drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h

+2 −1
Original line number Diff line number Diff line
@@ -210,7 +210,8 @@ int smu_v14_0_wait_for_event(struct smu_context *smu, enum smu_event_type event, 
			     uint64_t event_arg);



int smu_v14_0_set_vcn_enable(struct smu_context *smu,

			     bool enable);

			      bool enable,

			      int inst);



int smu_v14_0_set_jpeg_enable(struct smu_context *smu,

			      bool enable);

drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c

+3 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,9 @@ static bool arcturus_is_dpm_running(struct smu_context *smu) 
	return !!(feature_enabled & SMC_DPM_FEATURE);

}



static int arcturus_dpm_set_vcn_enable(struct smu_context *smu, bool enable)

static int arcturus_dpm_set_vcn_enable(struct smu_context *smu,

					bool enable,

					int inst)

{

	int ret = 0;