From 9ab2ae8df0a10d24b2c080a2e82e790f8106c931 Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 27 Mar 2023 03:44:58 +0000 Subject: [PATCH] drm/amd/display: Defer DIG FIFO disable after VID stream enable From Nicholas Kazlauskas efb332a2037bdb3f49c42c0b895241383024c06b in linux-6.1.y/6.1.16 2d90a1c054831338d57b39aec4d273cf3e867590 in mainline linux --- .../drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c index 38842f938be..0926db01833 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn314/dcn314_dio_stream_encoder.c @@ -278,10 +278,10 @@ static void enc314_stream_encoder_dp_blank( struct dc_link *link, struct stream_encoder *enc) { - /* New to DCN314 - disable the FIFO before VID stream disable. */ - enc314_disable_fifo(enc); - enc1_stream_encoder_dp_blank(link, enc); + + /* Disable FIFO after the DP vid stream is disabled to avoid corruption. */ + enc314_disable_fifo(enc); } static void enc314_stream_encoder_dp_unblank( -- 2.20.1