[PATCH AUTOSEL 5.15 24/27] Revert "drm/amdgpu: Revert "drm/amdgpu: getting fan speed pwm for vega10 properly""

[Yury Zhuravlev]

Sorry, but do anybody know about this?
I hope my message is not lost.

On Tue, Jan 3, 2023 at 9:38 PM Yury Zhuravlev <stalkerg at gmail.com> wrote:

> Hello!
>
> Why is this revert for revert coming for 6.1 but reverted again for 6.1.2?
> My GPU is not working correctly again!
> https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.2
>
> It seems like somebody made a mistake and pick up the wrong patch for the
> stable channel.
>
> Regards!
>
> On Sat, Nov 19, 2022 at 11:14 AM Sasha Levin <sashal at kernel.org> wrote:
>
>> From: Asher Song <Asher.Song at amd.com>
>>
>> [ Upstream commit 30b8e7b8ee3be003e0df85c857c5cd0e0bd58b82 ]
>>
>> This reverts commit 4545ae2ed3f2f7c3f615a53399c9c8460ee5bca7.
>>
>> The origin patch "drm/amdgpu: getting fan speed pwm for vega10 properly"
>> works fine.
>> Test failure is caused by test case self.
>>
>> Signed-off-by: Asher Song <Asher.Song at amd.com>
>> Reviewed-by: Guchun Chen <guchun.chen at amd.com>
>> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
>> Signed-off-by: Sasha Levin <sashal at kernel.org>
>> ---
>>  .../amd/pm/powerplay/hwmgr/vega10_thermal.c   | 25 +++++++++----------
>>  1 file changed, 12 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
>> b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
>> index dad3e3741a4e..190af79f3236 100644
>> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
>> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_thermal.c
>> @@ -67,22 +67,21 @@ int vega10_fan_ctrl_get_fan_speed_info(struct
>> pp_hwmgr *hwmgr,
>>  int vega10_fan_ctrl_get_fan_speed_pwm(struct pp_hwmgr *hwmgr,
>>                 uint32_t *speed)
>>  {
>> -       uint32_t current_rpm;
>> -       uint32_t percent = 0;
>> -
>> -       if (hwmgr->thermal_controller.fanInfo.bNoFan)
>> -               return 0;
>> +       struct amdgpu_device *adev = hwmgr->adev;
>> +       uint32_t duty100, duty;
>> +       uint64_t tmp64;
>>
>> -       if (vega10_get_current_rpm(hwmgr, &current_rpm))
>> -               return -1;
>> +       duty100 = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_FDO_CTRL1),
>> +                               CG_FDO_CTRL1, FMAX_DUTY100);
>> +       duty = REG_GET_FIELD(RREG32_SOC15(THM, 0, mmCG_THERMAL_STATUS),
>> +                               CG_THERMAL_STATUS, FDO_PWM_DUTY);
>>
>> -       if (hwmgr->thermal_controller.
>> -                       advanceFanControlParameters.usMaxFanRPM != 0)
>> -               percent = current_rpm * 255 /
>> -                       hwmgr->thermal_controller.
>> -                       advanceFanControlParameters.usMaxFanRPM;
>> +       if (!duty100)
>> +               return -EINVAL;
>>
>> -       *speed = MIN(percent, 255);
>> +       tmp64 = (uint64_t)duty * 255;
>> +       do_div(tmp64, duty100);
>> +       *speed = MIN((uint32_t)tmp64, 255);
>>
>>         return 0;
>>  }
>> --
>> 2.35.1
>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230108/1ae22449/attachment.htm>