On 2021-06-10 5:12 p.m., Alex Deucher wrote: > On Tue, Jun 8, 2021 at 5:41 PM Luben Tuikov <luben.tuikov@xxxxxxx> wrote: >> "req" is now a pointer , i.e. it is no longer >> allocated on the stack, thus taking its reference >> and passing that is a bug. >> >> This commit fixes this bug. >> >> Cc: Alex Deucher <alexander.deucher@xxxxxxx> >> Signed-off-by: Luben Tuikov <luben.tuikov@xxxxxxx> > Can we just squash this into the original patch where this was broken? > Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> Yeah, I'll do this--it'll be better this way. Regards, Luben > >> --- >> drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- >> drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- >> drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- >> 3 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c >> index 0db79a5236e1f1..7d9a2946806f58 100644 >> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c >> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c >> @@ -1957,7 +1957,7 @@ static int arcturus_i2c_xfer(struct i2c_adapter *i2c_adap, >> } >> } >> mutex_lock(&adev->smu.mutex); >> - r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true); >> + r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, req, true); >> mutex_unlock(&adev->smu.mutex); >> if (r) >> goto fail; >> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c >> index 2acf54967c6ab1..0568cbfb023459 100644 >> --- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c >> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c >> @@ -2752,7 +2752,7 @@ static int navi10_i2c_xfer(struct i2c_adapter *i2c_adap, >> } >> } >> mutex_lock(&adev->smu.mutex); >> - r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true); >> + r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, req, true); >> mutex_unlock(&adev->smu.mutex); >> if (r) >> goto fail; >> 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 44ca3b3f83f4d9..091b3339faadb9 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 >> @@ -3440,7 +3440,7 @@ static int sienna_cichlid_i2c_xfer(struct i2c_adapter *i2c_adap, >> } >> } >> mutex_lock(&adev->smu.mutex); >> - r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, &req, true); >> + r = smu_cmn_update_table(&adev->smu, SMU_TABLE_I2C_COMMANDS, 0, req, true); >> mutex_unlock(&adev->smu.mutex); >> if (r) >> goto fail; >> -- >> 2.32.0 >> >> _______________________________________________ >> amd-gfx mailing list >> amd-gfx@xxxxxxxxxxxxxxxxxxxxx >> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cluben.tuikov%40amd.com%7Ca961cab9226c41c5fde408d92c54721c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637589563470538602%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=LQxzFaoGKixKHL8HD2YzWDxv1FYO7oXhW4y0UMpzslY%3D&reserved=0 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
