summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLeo Chen <sancchen@amd.com>2023-06-08 23:37:38 +0300
committerAlex Deucher <alexander.deucher@amd.com>2023-06-23 22:44:28 +0300
commit26518b39181876064850209ecdab48c0ee5924b1 (patch)
tree2618a8d9933215c249ba28e22b658b28cd276ea7 /drivers/gpu
parent2bf0ce3bec8b22e4bac828aeaeade15884fa0f5c (diff)
downloadlinux-26518b39181876064850209ecdab48c0ee5924b1.tar.xz
drm/amd/display: disable seamless boot if force_odm_combine is enabled
[Why & How] Having seamless boot on while forcing debug option ODM combine 2 to 1 will cause some corruptions because of some missing programmings. Cc: stable@vger.kernel.org # 6.1+ Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com> Signed-off-by: Leo Chen <sancchen@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 4bacbd9141ee..99a14c2f05cf 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1629,6 +1629,9 @@ bool dc_validate_boot_timing(const struct dc *dc,
return false;
}
+ if (dc->debug.force_odm_combine)
+ return false;
+
/* Check for enabled DIG to identify enabled display */
if (!link->link_enc->funcs->is_dig_enabled(link->link_enc))
return false;