From 52987abcfec77bea6b69d77e3c6c43e229034cae Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 26 Jul 2023 06:29:09 +0000 Subject: [PATCH] drm/amd/display: disable seamless boot if force_odm_combine is enabled From Leo Chen 3546f76c7ad87d0ade575a5c4acad5e4704d927c in linux-6.1.y/6.1.40 26518b39181876064850209ecdab48c0ee5924b1 in mainline linux --- sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c b/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c index b405f2e8692..cca01434441 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c +++ b/sys/dev/pci/drm/amd/display/dc/core/amdgpu_dc.c @@ -1539,6 +1539,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; -- 2.20.1