On Wed, Nov 17, 2021 at 5:33 PM Surbhi Kakarya <surbhi.kakarya@xxxxxxx> wrote: > > Fill voltage fields in metrics table. This patch is > based on an existing patch I9e15971919b88e54fe5fbee5b784293eaf18025c. This seems to be an invalid commit hash. > > Signed-off-by: Surbhi Kakarya <Surbhi.Kakarya@xxxxxxx> > Change-Id: I701110d78a85c092f5dda167a52350cc6dda7557 > --- > .../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > 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 3b1bf270ebc6..97d18e764665 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 > @@ -3619,6 +3619,16 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, > gpu_metrics->energy_accumulator = > use_metrics_v2 ? metrics_v2->EnergyAccumulator : metrics->EnergyAccumulator; > > + if (metrics->CurrGfxVoltageOffset) > + gpu_metrics->voltage_gfx = > + (155000 - 625 * metrics->CurrGfxVoltageOffset) / 100; > + if (metrics->CurrMemVidOffset) > + gpu_metrics->voltage_mem = > + (155000 - 625 * metrics->CurrMemVidOffset) / 100; > + if (metrics->CurrSocVoltageOffset) > + gpu_metrics->voltage_soc = > + (155000 - 625 * metrics->CurrSocVoltageOffset) / 100; Assuming these are the same for both the v1 and v2 metrics table cases, the patch is: Acked-by: Alex Deucher <alexander.deucher@xxxxxxx> > + > average_gfx_activity = use_metrics_v2 ? metrics_v2->AverageGfxActivity : metrics->AverageGfxActivity; > if (average_gfx_activity <= SMU_11_0_7_GFX_BUSY_THRESHOLD) > gpu_metrics->average_gfxclk_frequency = > -- > 2.25.1 >
