FAILED: patch "[PATCH] drm/amd/display: register edp_backlight_control() for DCN301" failed to apply to 6.6-stable tree

The patch below does not apply to the 6.6-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.6.y
git checkout FETCH_HEAD
git cherry-pick -x ac0ec1c7d1f0d017d0ea44954026d2f138c581e4
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023112431-scolding-varsity-1012@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..

Possible dependencies:

ac0ec1c7d1f0 ("drm/amd/display: register edp_backlight_control() for DCN301")

thanks,

greg k-h

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

From ac0ec1c7d1f0d017d0ea44954026d2f138c581e4 Mon Sep 17 00:00:00 2001
From: Hamza Mahfooz <[email protected]>
Date: Tue, 22 Aug 2023 12:31:09 -0400
Subject: [PATCH] drm/amd/display: register edp_backlight_control() for DCN301

As made mention of in commit 099303e9a9bd ("drm/amd/display: eDP intermittent black screen during PnP"), we need to turn off the display's backlight before powering off an eDP display. Not doing so will result in undefined behaviour according to the eDP spec. So, set DCN301's edp_backlight_control() function pointer to dce110_edp_backlight_control().

index 257df8660b4c..61205cdbe2d5 100644
@@ -75,6 +75,7 @@ static const struct hw_sequencer_funcs dcn301_funcs = {
 	.get_hw_state = dcn10_get_hw_state,
 	.clear_status_bits = dcn10_clear_status_bits,
 	.wait_for_mpcc_disconnect = dcn10_wait_for_mpcc_disconnect,
+	.edp_backlight_control = dce110_edp_backlight_control,
 	.edp_power_control = dce110_edp_power_control,
 	.edp_wait_for_hpd_ready = dce110_edp_wait_for_hpd_ready,
 	.set_cursor_position = dcn10_set_cursor_position,