Applied the series. Thanks!
Alex On Wed, May 7, 2025 at 1:13 PM <li...@treblig.org> wrote: > > From: "Dr. David Alan Gilbert" <li...@treblig.org> > > 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/dm4pr12mb5165d85bd85bc8fc8bf7a3b48e...@dm4pr12mb5165.namprd12.prod.outlook.com/ > > Signed-off-by: Dr. David Alan Gilbert <li...@treblig.org> > --- > drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 4 ---- > drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 6 ------ > drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 6 ------ > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 6 ------ > 4 files changed, 22 deletions(-) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h > b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h > index a5ba37f57650..eb0a97dde71c 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h > +++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h > @@ -1229,10 +1229,6 @@ struct pptable_funcs { > * @mode1_reset_is_support: Check if GPU supports mode1 reset. > */ > bool (*mode1_reset_is_support)(struct smu_context *smu); > - /** > - * @mode2_reset_is_support: Check if GPU supports mode2 reset. > - */ > - bool (*mode2_reset_is_support)(struct smu_context *smu); > > /** > * @mode1_reset: Perform mode1 reset. > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > index 19a25fdc2f5b..115e3fa456bc 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c > @@ -3089,11 +3089,6 @@ static int sienna_cichlid_stb_get_data_direct(struct > smu_context *smu, > return 0; > } > > -static bool sienna_cichlid_is_mode2_reset_supported(struct smu_context *smu) > -{ > - return true; > -} > - > static int sienna_cichlid_mode2_reset(struct smu_context *smu) > { > int ret = 0, index; > @@ -3229,7 +3224,6 @@ static const struct pptable_funcs > sienna_cichlid_ppt_funcs = { > .get_default_config_table_settings = > sienna_cichlid_get_default_config_table_settings, > .set_config_table = sienna_cichlid_set_config_table, > .get_unique_id = sienna_cichlid_get_unique_id, > - .mode2_reset_is_support = sienna_cichlid_is_mode2_reset_supported, > .mode2_reset = sienna_cichlid_mode2_reset, > }; > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c > index 83163d7c7f00..38fbe0ddc4e6 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c > @@ -1976,11 +1976,6 @@ static bool aldebaran_is_mode1_reset_supported(struct > smu_context *smu) > return true; > } > > -static bool aldebaran_is_mode2_reset_supported(struct smu_context *smu) > -{ > - return true; > -} > - > static int aldebaran_set_mp1_state(struct smu_context *smu, > enum pp_mp1_state mp1_state) > { > @@ -2086,7 +2081,6 @@ static const struct pptable_funcs aldebaran_ppt_funcs = > { > .set_pp_feature_mask = smu_cmn_set_pp_feature_mask, > .get_gpu_metrics = aldebaran_get_gpu_metrics, > .mode1_reset_is_support = aldebaran_is_mode1_reset_supported, > - .mode2_reset_is_support = aldebaran_is_mode2_reset_supported, > .smu_handle_passthrough_sbr = aldebaran_smu_handle_passthrough_sbr, > .mode1_reset = aldebaran_mode1_reset, > .set_mp1_state = aldebaran_set_mp1_state, > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c > index c478b3be37af..c529859c83ab 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c > @@ -2849,11 +2849,6 @@ static bool > smu_v13_0_6_is_mode1_reset_supported(struct smu_context *smu) > return true; > } > > -static bool smu_v13_0_6_is_mode2_reset_supported(struct smu_context *smu) > -{ > - return true; > -} > - > static int smu_v13_0_6_smu_send_hbm_bad_page_num(struct smu_context *smu, > uint32_t size) > { > @@ -3586,7 +3581,6 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs > = { > .get_pm_metrics = smu_v13_0_6_get_pm_metrics, > .get_thermal_temperature_range = > smu_v13_0_6_get_thermal_temperature_range, > .mode1_reset_is_support = smu_v13_0_6_is_mode1_reset_supported, > - .mode2_reset_is_support = smu_v13_0_6_is_mode2_reset_supported, > .mode1_reset = smu_v13_0_6_mode1_reset, > .mode2_reset = smu_v13_0_6_mode2_reset, > .wait_for_event = smu_v13_0_wait_for_event, > -- > 2.49.0 >
