Re: [PATCH] drm/amd/display: Don't require DMUB PSR caps before DCN 3.0

[Ray Wu <ray.wu@amd.com>]

[-- Attachment #1: Type: text/plain, Size: 954 bytes --]

Hi Hugo,

Thanks. I've attached the patch here.

There's also a related discussion here:
https://gitlab.freedesktop.org/drm/amd/-/work_items/5993

Please give it a try and let me know if it resolves the issue.
If so, I'll add your Tested-by.

Thanks,
Ray

On 11/4/2026 6:17 PM, Hugo Sales wrote:
> On 11/04/2026 9:31 AM WET Ray Wu <ray.wu@amd.com> wrote:
>> We already have a similar fix internally that is planned for an upcoming DC release:
>>
>> commit: drm/amd/display: Allow DC_PSR_MASK to enable PSR without DMUB PSR cap
>>
>> Could you give it a try and see if it resolves the issue?
> Hi Ray,
>
> Happy to test it, but I can't find that commit. It isn't on amd-gfx and
> it isn't in amd-staging-drm-next yet. Could you post it to the list, or
> send it to me directly?
>
> I'll try it on my ROG Flow X13 (DCN 2.1) with PSR. Since my patch reported the same problem, could the commit also carry a
> Reported-by/Tested-by for me?
>
> Thanks,
> Hugo

[-- Attachment #2: test-5993-dm-psr-gate.patch --]
[-- Type: text/plain, Size: 737 bytes --]

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
index dbad0a6d3a2b..295b1c307fa3 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c
@@ -111,7 +111,8 @@ bool amdgpu_dm_set_psr_caps(struct dc_link *link, struct amdgpu_dm_connector *ac
 	/* Reset psr version first */
 	link->psr_settings.psr_version = DC_PSR_VERSION_UNSUPPORTED;
 
-	if (!dc->caps.dmub_caps.psr)
+	/* DCN IPs that never query DMUB feature caps rely on DC_PSR_MASK to opt in */
+	if (!dc->caps.dmub_caps.psr && !(amdgpu_dc_feature_mask & DC_PSR_MASK))
 		return false;
 
 	if (!(link->connector_signal & SIGNAL_TYPE_EDP))