From fbf2ddd53b5a601443e8ba048da84720679183cd Mon Sep 17 00:00:00 2001 From: jsg Date: Thu, 14 Apr 2022 08:32:15 +0000 Subject: [PATCH] drm/amd/display: Add signal type check when verify stream backends same From Dale Zhao c4b64a80554e57a68b594f2920988f4bc39768d9 in linux 5.15.y/5.15.34 047db281c026de5971cedb5bb486aa29bd16a39d in mainline linux --- sys/dev/pci/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c index f6907c07288..df49952ffab 100644 --- a/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/core/dc_resource.c @@ -1599,6 +1599,9 @@ static bool are_stream_backends_same( if (is_timing_changed(stream_a, stream_b)) return false; + if (stream_a->signal != stream_b->signal) + return false; + if (stream_a->dpms_off != stream_b->dpms_off) return false; -- 2.20.1