FAILED: patch "[PATCH] drm/amd/display: Init link enc resources in dc_state only if" failed to apply to 6.1-stable tree

The patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x aa36d8971fccb55ef3241cbfff9d1799e31d8628
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024012706-slideshow-oppose-38ad@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..

Possible dependencies:

aa36d8971fcc ("drm/amd/display: Init link enc resources in dc_state only if res_pool presents") 012a04b1d6af ("drm/amd/display: Refactor phantom resource allocation")
09a4ec5da92c ("drm/amd/display: Refactor dc_state interface")
abd26a3252cb ("drm/amd/display: Add dml2 copy functions")
b719a9c15d52 ("drm/amd/display: Fix NULL pointer dereference at hibernate") cfab803884f4 ("drm/amd/display: update pixel clock params after stream slice count change in context") ed6e2782e974 ("drm/amd/display: For cursor P-State allow for SubVP")
fecbaa0a79ad ("drm/amd/display: save and restore mall state when applying minimal transition") f583db812bc9 ("drm/amd/display: Update FAMS sequence for DCN30 & DCN32")
06ad7e164256 ("drm/amd/display: Destroy DC context while keeping DML and DML2") ddd5298c63e4 ("drm/amd/display: Update cursor limits based on SW cursor fallback limits") 7966f319c66d ("drm/amd/display: Introduce DML2")
6e2c4941ce0c ("drm/amd/display: Move dml code under CONFIG_DRM_AMD_DC_FP guard") 13c0e836316a ("drm/amd/display: Adjust code style for hw_sequencer.h")
1ca965719b5b ("drm/amd/display: Change dc_set_power_state() to bool instead of int") 7441ef0b3ebe ("drm/amd: Propagate failures in dc_set_power_state()")
1288d7020809 ("drm/amd/display: Improve x86 and dmub ips handshake")
ad3b63a0d298 ("drm/amd/display: add new windowed mpo odm minimal transition sequence") 177ea58bef72 ("drm/amd/display: reset stream slice count for new ODM policy") c0f8b83188c7 ("drm/amd/display: disable IPS")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From aa36d8971fccb55ef3241cbfff9d1799e31d8628 Mon Sep 17 00:00:00 2001
From: Dillon Varone <[email protected]>
Date: Thu, 28 Dec 2023 21:36:39 -0500
Subject: [PATCH] drm/amd/display: Init link enc resources in dc_state only if
res_pool presents

[Why & How]
res_pool is not initialized in all situations such as virtual environments, and therefore link encoder resources should not be initialized if res_pool is NULL.

index 460a8010c79f..56feee0ff01b 100644
@@ -267,7 +267,8 @@ void dc_state_construct(struct dc *dc, struct dc_state *state)
 	state->clk_mgr = dc->clk_mgr;
 
 	/* Initialise DIG link encoder resource tracking variables. */
-	link_enc_cfg_init(dc, state);
+	if (dc->res_pool)
+		link_enc_cfg_init(dc, state);
 }
 
 void dc_state_destruct(struct dc_state *state)