Re: [PATCH AUTOSEL 5.5 530/542] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage
On Thu, Feb 20, 2020 at 2:26 PM Sasha Levin wrote: > > On Fri, Feb 14, 2020 at 11:31:31AM -0500, Alex Deucher wrote: > >On Fri, Feb 14, 2020 at 11:00 AM Sasha Levin wrote: > >> > >> From: Alex Deucher > >> > >> [ Upstream commit 1064ad4aeef94f51ca230ac639a9e996fb7867a0 ] > >> > >> Cull out 0 clocks to avoid a warning in DC. > >> > >> Bug: https://gitlab.freedesktop.org/drm/amd/issues/963 > > > >All of the upstream commits that reference this bug need to be applied > >or this patch set will be broken. Please either apply them all or > >drop them. > > Okay, so I have these 3 in 4.19-5.5: > > c37243579d6c ("drm/amdgpu/display: handle multiple numbers of fclks in > dcn_calcs.c (v2)") > 4d0a72b66065 ("drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency") > 1064ad4aeef9 ("drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage" Yes, that should do it. Thanks! Alex > > -- > Thanks, > Sasha ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH AUTOSEL 5.5 530/542] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage
On Fri, Feb 14, 2020 at 11:31:31AM -0500, Alex Deucher wrote: On Fri, Feb 14, 2020 at 11:00 AM Sasha Levin wrote: From: Alex Deucher [ Upstream commit 1064ad4aeef94f51ca230ac639a9e996fb7867a0 ] Cull out 0 clocks to avoid a warning in DC. Bug: https://gitlab.freedesktop.org/drm/amd/issues/963 All of the upstream commits that reference this bug need to be applied or this patch set will be broken. Please either apply them all or drop them. Okay, so I have these 3 in 4.19-5.5: c37243579d6c ("drm/amdgpu/display: handle multiple numbers of fclks in dcn_calcs.c (v2)") 4d0a72b66065 ("drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_latency") 1064ad4aeef9 ("drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage" -- Thanks, Sasha ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH AUTOSEL 5.5 530/542] drm/amdgpu/smu10: fix smu10_get_clock_by_type_with_voltage
On Fri, Feb 14, 2020 at 11:00 AM Sasha Levin wrote: > > From: Alex Deucher > > [ Upstream commit 1064ad4aeef94f51ca230ac639a9e996fb7867a0 ] > > Cull out 0 clocks to avoid a warning in DC. > > Bug: https://gitlab.freedesktop.org/drm/amd/issues/963 All of the upstream commits that reference this bug need to be applied or this patch set will be broken. Please either apply them all or drop them. Alex > Reviewed-by: Evan Quan > Signed-off-by: Alex Deucher > Signed-off-by: Sasha Levin > --- > drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 8 +--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c > b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c > index 627a42e8fd318..fed3fc4bb57a9 100644 > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c > @@ -1080,9 +1080,11 @@ static int smu10_get_clock_by_type_with_voltage(struct > pp_hwmgr *hwmgr, > > clocks->num_levels = 0; > for (i = 0; i < pclk_vol_table->count; i++) { > - clocks->data[i].clocks_in_khz = > pclk_vol_table->entries[i].clk * 10; > - clocks->data[i].voltage_in_mv = > pclk_vol_table->entries[i].vol; > - clocks->num_levels++; > + if (pclk_vol_table->entries[i].clk) { > + clocks->data[clocks->num_levels].clocks_in_khz = > pclk_vol_table->entries[i].clk * 10; > + clocks->data[clocks->num_levels].voltage_in_mv = > pclk_vol_table->entries[i].vol; > + clocks->num_levels++; > + } > } > > return 0; > -- > 2.20.1 > > ___ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx