From: jsg <jsg@openbsd.org>
Date: Thu, 7 Apr 2022 07:50:31 +0000 (+0000)
Subject: drm/amd/display: Fix stream->link_enc unassigned during stream removal
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=43ed640db0d23ec54dbe1b4b15baef3d71b80d3d;p=openbsd

drm/amd/display: Fix stream->link_enc unassigned during stream removal

From Nicholas Kazlauskas
10dd26349edf901539d066b866490676cbfad73c in linux 5.15.y/5.15.27
3743e7f6fcb938b7d8b7967e6a9442805e269b3d in mainline linux
---

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 5519502438f..f6907c07288 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
@@ -1799,9 +1799,6 @@ enum dc_status dc_remove_stream_from_ctx(
 				dc->res_pool,
 			del_pipe->stream_res.stream_enc,
 			false);
-	/* Release link encoder from stream in new dc_state. */
-	if (dc->res_pool->funcs->link_enc_unassign)
-		dc->res_pool->funcs->link_enc_unassign(new_ctx, del_pipe->stream);
 
 	if (del_pipe->stream_res.audio)
 		update_audio_usage(