From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 16 Jun 2022 13:08:06 +0000 (+0200)
Subject: 5.18-stable patches
X-Git-Tag: v5.4.200~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c3f626555c2f9cfa8ee56e027c591fd399c871c;p=thirdparty%2Fkernel%2Fstable-queue.git

5.18-stable patches

added patches:
	revert-drm-amd-display-fix-dcn3-b0-dp-alt-mapping.patch
---

diff --git a/queue-5.18/revert-drm-amd-display-fix-dcn3-b0-dp-alt-mapping.patch b/queue-5.18/revert-drm-amd-display-fix-dcn3-b0-dp-alt-mapping.patch
new file mode 100644
index 00000000000..8fa32e14551
--- /dev/null
+++ b/queue-5.18/revert-drm-amd-display-fix-dcn3-b0-dp-alt-mapping.patch
@@ -0,0 +1,41 @@
+From 1039188806d4cfdf9c412bb4ddb51b4d8cd15478 Mon Sep 17 00:00:00 2001
+From: Stylon Wang <stylon.wang@amd.com>
+Date: Wed, 4 May 2022 18:09:44 +0800
+Subject: Revert "drm/amd/display: Fix DCN3 B0 DP Alt Mapping"
+
+From: Stylon Wang <stylon.wang@amd.com>
+
+commit 1039188806d4cfdf9c412bb4ddb51b4d8cd15478 upstream.
+
+This reverts commit 4b7786d87fb3adf3e534c4f1e4f824d8700b786b.
+
+Commit 4b7786d87fb3 ("drm/amd/display: Fix DCN3 B0 DP Alt Mapping")
+is causing 2nd USB-C display not lighting up.
+Phy id remapping is done differently than is assumed in this
+patch.
+
+Signed-off-by: Stylon Wang <stylon.wang@amd.com>
+Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: "Limonciello, Mario" <Mario.Limonciello@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+@@ -1392,12 +1392,6 @@ static struct stream_encoder *dcn31_stre
+ 		return NULL;
+ 	}
+ 
+-	if (ctx->asic_id.chip_family == FAMILY_YELLOW_CARP &&
+-			ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) {
+-		if ((eng_id == ENGINE_ID_DIGC) || (eng_id == ENGINE_ID_DIGD))
+-			eng_id = eng_id + 3; // For B0 only. C->F, D->G.
+-	}
+-
+ 	dcn30_dio_stream_encoder_construct(enc1, ctx, ctx->dc_bios,
+ 					eng_id, vpg, afmt,
+ 					&stream_enc_regs[eng_id],
diff --git a/queue-5.18/series b/queue-5.18/series
index e69de29bb2d..30c249d47ae 100644
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -0,0 +1 @@
+revert-drm-amd-display-fix-dcn3-b0-dp-alt-mapping.patch