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

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 b405f2e..cca0143 100644 (file)
--- 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;