mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 19:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/amd/pm: add inst to dpm_set_vcn_enable

Browse Source 
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: Boyuan Zhang <boyuan.zhang@amd.com>
Suggested-by: Christian König <christian.koenig@amd.com>
Suggested-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Boyuan Zhang
2024-10-02 20:51:53 -04:00
committed by Alex Deucher
parent bc068194f5
commit 8b7f3529cd
13 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
View File

@@ -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);

2
drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
View File

@@ -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

3
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
View File

@@ -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);

3
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h
View File

@@ -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);

4
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
View File

@@ -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;

4
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
View File

@@ -1135,7 +1135,9 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)
return 0;
}
static int navi10_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int navi10_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
int ret = 0;

4
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
View File

@@ -1152,7 +1152,9 @@ static int sienna_cichlid_set_default_dpm_table(struct smu_context *smu)
return 0;
}
static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int sienna_cichlid_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
struct amdgpu_device *adev = smu->adev;
int i, ret = 0;

4
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c
View File

@@ -461,7 +461,9 @@ static int vangogh_init_smc_tables(struct smu_context *smu)
return smu_v11_0_init_smc_tables(smu);
}
static int vangogh_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int vangogh_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
int ret = 0;

4
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c
View File

@@ -645,7 +645,9 @@ static enum amd_pm_state_type renoir_get_current_power_state(struct smu_context
return pm_type;
}
static int renoir_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int renoir_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
int ret = 0;

3
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
View File

@@ -2104,7 +2104,8 @@ int smu_v13_0_get_current_pcie_link_speed(struct smu_context *smu)
}
int smu_v13_0_set_vcn_enable(struct smu_context *smu,
bool enable)
bool enable,
int inst)
{
struct amdgpu_device *adev = smu->adev;
int i, ret = 0;

4
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c
View File

@@ -193,7 +193,9 @@ static int smu_v13_0_5_system_features_control(struct smu_context *smu, bool en)
return ret;
}
static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int smu_v13_0_5_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
int ret = 0;

4
drivers/gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c
View File

@@ -220,7 +220,9 @@ static int yellow_carp_system_features_control(struct smu_context *smu, bool en)
return ret;
}
static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu, bool enable)
static int yellow_carp_dpm_set_vcn_enable(struct smu_context *smu,
bool enable,
int inst)
{
int ret = 0;

3
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
View File

@@ -1507,7 +1507,8 @@ int smu_v14_0_set_single_dpm_table(struct smu_context *smu,
}
int smu_v14_0_set_vcn_enable(struct smu_context *smu,
bool enable)
bool enable,
int inst)
{
struct amdgpu_device *adev = smu->adev;
int i, ret = 0;