Skip to content

Commit 4367ee3

Browse files
Dr. David Alan Gilbertalexdeucher
authored andcommitted
drm/amd/pm: Remove remainder of mode2_reset_is_support
The previous patch removed smu_mode2_reset_is_support() which was the only function to call through the mode2_reset_is_support() method pointer. Remove the remaining functions that were assigned to it and the pointer itself. See discussion at: https://lore.kernel.org/all/DM4PR12MB5165D85BD85BC8FC8BF7A3B48E88A@DM4PR12MB5165.namprd12.prod.outlook.com/ Signed-off-by: Dr. David Alan Gilbert <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent da471b8 commit 4367ee3

File tree

4 files changed

+0
-23
lines changed

4 files changed

+0
-23
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,11 +1232,6 @@ struct pptable_funcs {
12321232
*/
12331233
bool (*mode1_reset_is_support)(struct smu_context *smu);
12341234

1235-
/**
1236-
* @mode2_reset_is_support: Check if GPU supports mode2 reset.
1237-
*/
1238-
bool (*mode2_reset_is_support)(struct smu_context *smu);
1239-
12401235
/**
12411236
* @link_reset_is_support: Check if GPU supports link reset.
12421237
*/

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,11 +3089,6 @@ static int sienna_cichlid_stb_get_data_direct(struct smu_context *smu,
30893089
return 0;
30903090
}
30913091

3092-
static bool sienna_cichlid_is_mode2_reset_supported(struct smu_context *smu)
3093-
{
3094-
return true;
3095-
}
3096-
30973092
static int sienna_cichlid_mode2_reset(struct smu_context *smu)
30983093
{
30993094
int ret = 0, index;
@@ -3229,7 +3224,6 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
32293224
.get_default_config_table_settings = sienna_cichlid_get_default_config_table_settings,
32303225
.set_config_table = sienna_cichlid_set_config_table,
32313226
.get_unique_id = sienna_cichlid_get_unique_id,
3232-
.mode2_reset_is_support = sienna_cichlid_is_mode2_reset_supported,
32333227
.mode2_reset = sienna_cichlid_mode2_reset,
32343228
};
32353229

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,11 +1985,6 @@ static bool aldebaran_is_mode1_reset_supported(struct smu_context *smu)
19851985
return true;
19861986
}
19871987

1988-
static bool aldebaran_is_mode2_reset_supported(struct smu_context *smu)
1989-
{
1990-
return true;
1991-
}
1992-
19931988
static int aldebaran_set_mp1_state(struct smu_context *smu,
19941989
enum pp_mp1_state mp1_state)
19951990
{
@@ -2095,7 +2090,6 @@ static const struct pptable_funcs aldebaran_ppt_funcs = {
20952090
.set_pp_feature_mask = smu_cmn_set_pp_feature_mask,
20962091
.get_gpu_metrics = aldebaran_get_gpu_metrics,
20972092
.mode1_reset_is_support = aldebaran_is_mode1_reset_supported,
2098-
.mode2_reset_is_support = aldebaran_is_mode2_reset_supported,
20992093
.smu_handle_passthrough_sbr = aldebaran_smu_handle_passthrough_sbr,
21002094
.mode1_reset = aldebaran_mode1_reset,
21012095
.set_mp1_state = aldebaran_set_mp1_state,

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2919,11 +2919,6 @@ static bool smu_v13_0_6_is_mode1_reset_supported(struct smu_context *smu)
29192919
return true;
29202920
}
29212921

2922-
static bool smu_v13_0_6_is_mode2_reset_supported(struct smu_context *smu)
2923-
{
2924-
return true;
2925-
}
2926-
29272922
static inline bool smu_v13_0_6_is_link_reset_supported(struct smu_context *smu)
29282923
{
29292924
struct amdgpu_device *adev = smu->adev;
@@ -3680,7 +3675,6 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = {
36803675
.get_pm_metrics = smu_v13_0_6_get_pm_metrics,
36813676
.get_thermal_temperature_range = smu_v13_0_6_get_thermal_temperature_range,
36823677
.mode1_reset_is_support = smu_v13_0_6_is_mode1_reset_supported,
3683-
.mode2_reset_is_support = smu_v13_0_6_is_mode2_reset_supported,
36843678
.link_reset_is_support = smu_v13_0_6_is_link_reset_supported,
36853679
.mode1_reset = smu_v13_0_6_mode1_reset,
36863680
.mode2_reset = smu_v13_0_6_mode2_reset,

0 commit comments

Comments
 (0)