On 2026-05-19 18:18, Mario Limonciello wrote:
>
>
> On 5/19/26 17:04, [email protected] wrote:
>> From: Leo Li <[email protected]>
>>
>> Now that proper fixes have been found, let's revert this workaround.
>>
>> This reverts commit 751414c12388ff2b475e15c15d3c817dcf563635.
>>
>> Signed-off-by: Leo Li <[email protected]>
>
> Unless it "actively" makese the problem worse - could this be the last patch
> in the series instead of the first? This will make things cleaner when it
> comes to backporting. IE backport the fixes, "then" revert the W/A.
It doesn't make the problem worse, but we do want to revert it since it
negatively impacts power.
I'll reorder this to be the last patch when merging.
Thanks,
Leo
>
>> ---
>> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 18 +++---------------
>> 1 file changed, 3 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> index 4670252ede244..be9c4e094d8ec 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -9518,21 +9518,9 @@ static void manage_dm_interrupts(struct amdgpu_device
>> *adev,
>> if (acrtc_state) {
>> timing = &acrtc_state->stream->timing;
>> - if (amdgpu_ip_version(adev, DCE_HWIP, 0) >=
>> - IP_VERSION(3, 2, 0) &&
>> - !(adev->flags & AMD_IS_APU)) {
>> - /*
>> - * DGPUs NV3x and newer that support idle optimizations
>> - * experience intermittent flip-done timeouts on cursor
>> - * updates. Restore 5s offdelay behavior for now.
>> - *
>> - * Discussion on the issue:
>> - *
>> https://lore.kernel.org/amd-gfx/[email protected]/
>> - */
>> - config.offdelay_ms = 5000;
>> - config.disable_immediate = false;
>> - } else if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
>> - IP_VERSION(3, 5, 0)) {
>> + if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
>> + IP_VERSION(3, 5, 0) ||
>> + !(adev->flags & AMD_IS_APU)) {
>> /*
>> * Older HW and DGPU have issues with instant off;
>> * use a 2 frame offdelay.
>
