[Public] Looks it's more clear to include code line " smu->od_settings = &powerplay_table->overdrive_table;" into the #if 0 section? Regards, Guchun > -----Original Message----- > From: amd-gfx <amd-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Evan > Quan > Sent: Monday, July 24, 2023 10:42 AM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Quan, Evan > <Evan.Quan@xxxxxxx> > Subject: [PATCH] drm/amd/pm: disable the SMU13 OD feature support > temporarily > > The existing OD interface cannot support the growing demand for more OD > features. We are in the transition to a new OD mechanism. So, disable the > SMU13 OD feature support temporarily. And this should be reverted when > the new OD mechanism online. > > Signed-off-by: Evan Quan <evan.quan@xxxxxxx> > --- > drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 9 > +++++++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | > 4 ++++ > 2 files changed, 13 insertions(+) > > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c > index 60d2684478a0..a3e510981dc5 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c > @@ -348,9 +348,18 @@ static int > smu_v13_0_0_check_powerplay_table(struct smu_context *smu) > if (powerplay_table->platform_caps & > SMU_13_0_0_PP_PLATFORM_CAP_MACO) > smu_baco->maco_support = true; > > + /* > + * We are in the transition to a new OD mechanism. > + * Disable the OD feature support for SMU13 temporarily. > + * TODO: get this reverted when new OD mechanism online > + */ > +#if 0 > if (!overdrive_lowerlimits->FeatureCtrlMask || > !overdrive_upperlimits->FeatureCtrlMask) > smu->od_enabled = false; > +#else > + smu->od_enabled = false; > +#endif > > table_context->thermal_controller_type = > powerplay_table->thermal_controller_type; > diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c > b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c > index ebb961f60316..44a3e2bf426b 100644 > --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c > +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c > @@ -338,9 +338,13 @@ static int > smu_v13_0_7_check_powerplay_table(struct smu_context *smu) > if (smu_baco->platform_support && (BoardTable->HsrEnabled || > BoardTable->VddqOffEnabled)) > smu_baco->maco_support = true; > > +#if 0 > if (!overdrive_lowerlimits->FeatureCtrlMask || > !overdrive_upperlimits->FeatureCtrlMask) > smu->od_enabled = false; > +#else > + smu->od_enabled = false; > +#endif > > table_context->thermal_controller_type = > powerplay_table->thermal_controller_type; > -- > 2.34.1
