| From 4f31fa9a672c12f3581354a8db5d8d81801133f5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Dec 2021 16:50:28 +0800 |
| Subject: drm/amd/display: Add signal type check when verify stream backends |
| same |
| |
| From: Dale Zhao <dale.zhao@amd.com> |
| |
| [ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ] |
| |
| [Why] |
| For allow eDP hot-plug feature, the stream signal may change to VIRTUAL |
| when plug-out and back to eDP when plug-in. OS will still setPathMode |
| with same timing for each plugging, but eDP gets no stream update as we |
| don't check signal type changing back as keeping it VIRTUAL. It's also |
| unsafe for future cases that stream signal is switched with same timing. |
| |
| [How] |
| Check stream signal type change include previous HDMI signal case. |
| |
| Reviewed-by: Aric Cyr <Aric.Cyr@amd.com> |
| Acked-by: Wayne Lin <wayne.lin@amd.com> |
| Signed-off-by: Dale Zhao <dale.zhao@amd.com> |
| Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c |
| index 6b066ceab412..3aa2040d2475 100644 |
| --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c |
| +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c |
| @@ -1640,6 +1640,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.35.1 |
| |
