aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display
diff options
context:
space:
mode:
authorRoman Li <Roman.Li@amd.com>2019-10-01 09:45:38 -0400
committerAlex Deucher <alexander.deucher@amd.com>2019-10-25 16:50:10 -0400
commit397a9bc588797907fda9879c2f8cfda1a436e8ce (patch)
tree2929424e049d7a9ec1f0a62449ebfd81eaeb0017 /drivers/gpu/drm/amd/display
parentdrm/amd/powerplay: clear the swSMU code layer (diff)
downloadlinux-dev-397a9bc588797907fda9879c2f8cfda1a436e8ce.tar.xz
linux-dev-397a9bc588797907fda9879c2f8cfda1a436e8ce.zip
drm/amdgpu/display: add dc feature mask for psr enablement
[Why] Adding psr mask to dc features allows selectively disable/enable psr. Current psr implementation may not work with non-pageflipping application. Until resolved it should be disabled by default. [How] Add dcfeaturemask for psr enablement. Disable by default. To enable set amdgpu.dcfeaturemask=0x8 in grub kernel command line. Signed-off-by: Roman Li <Roman.Li@amd.com> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display')
-rw-r--r--drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c3
1 files changed, 2 insertions, 1 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 04c5bccb35f8..854d2caf18dd 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2424,7 +2424,8 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev)
} else if (dc_link_detect(link, DETECT_REASON_BOOT)) {
amdgpu_dm_update_connector_after_detect(aconnector);
register_backlight_device(dm, link);
- amdgpu_dm_set_psr_caps(link);
+ if (amdgpu_dc_feature_mask & DC_PSR_MASK)
+ amdgpu_dm_set_psr_caps(link);
}