Hi, I thought it was this[1] the one causing problems[2]. -- Gustavo [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=434fb1e7444a2efc3a4ebd950c7f771ebfcffa31 [2] https://lore.kernel.org/dri-devel/3eedbe78-1fbd-4763-a7f3-ac5665e76a4a@xxxxxxxxxxx/ On 5/4/21 13:42, Alex Deucher wrote: > This reverts commit 96e27e8d919e52f30ea6b717e3cb70faa0b102cd. > > This causes the SMU to fail to load the power state. > > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1583 > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Cc: Gustavo A. R. Silva <gustavoars@xxxxxxxxxx> > --- > drivers/gpu/drm/radeon/si_dpm.c | 5 +++-- > drivers/gpu/drm/radeon/sislands_smc.h | 10 +++++----- > 2 files changed, 8 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/si_dpm.c b/drivers/gpu/drm/radeon/si_dpm.c > index 918609551804..91bfc4762767 100644 > --- a/drivers/gpu/drm/radeon/si_dpm.c > +++ b/drivers/gpu/drm/radeon/si_dpm.c > @@ -5250,9 +5250,10 @@ static int si_upload_sw_state(struct radeon_device *rdev, > int ret; > u32 address = si_pi->state_table_start + > offsetof(SISLANDS_SMC_STATETABLE, driverState); > + u32 state_size = sizeof(SISLANDS_SMC_SWSTATE) + > + ((new_state->performance_level_count - 1) * > + sizeof(SISLANDS_SMC_HW_PERFORMANCE_LEVEL)); > SISLANDS_SMC_SWSTATE *smc_state = &si_pi->smc_statetable.driverState; > - size_t state_size = struct_size(smc_state, levels, > - new_state->performance_level_count); > > memset(smc_state, 0, state_size); > > diff --git a/drivers/gpu/drm/radeon/sislands_smc.h b/drivers/gpu/drm/radeon/sislands_smc.h > index fbd6589bdab9..966e3a556011 100644 > --- a/drivers/gpu/drm/radeon/sislands_smc.h > +++ b/drivers/gpu/drm/radeon/sislands_smc.h > @@ -182,11 +182,11 @@ typedef struct SISLANDS_SMC_HW_PERFORMANCE_LEVEL SISLANDS_SMC_HW_PERFORMANCE_LEV > > struct SISLANDS_SMC_SWSTATE > { > - uint8_t flags; > - uint8_t levelCount; > - uint8_t padding2; > - uint8_t padding3; > - SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[]; > + uint8_t flags; > + uint8_t levelCount; > + uint8_t padding2; > + uint8_t padding3; > + SISLANDS_SMC_HW_PERFORMANCE_LEVEL levels[1]; > }; > > typedef struct SISLANDS_SMC_SWSTATE SISLANDS_SMC_SWSTATE; > _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
