[ Sasha's backport helper bot ] Hi, The upstream commit SHA1 provided is correct: 28574b08c70e56d34d6f6379326a860b96749051 WARNING: Author mismatch between patch and upstream commit: Backport author: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxxxxxx> Commit author: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx> Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.11.y | Present (different SHA1: 5298270bdabe) 6.6.y | Not found Note: The patch differs from the upstream commit: --- --- - 2024-11-26 07:56:54.529350297 -0500 +++ /tmp/tmp.sd7vGIw1jd 2024-11-26 07:56:54.518708793 -0500 @@ -1,3 +1,5 @@ +[ Upstream commit 28574b08c70e56d34d6f6379326a860b96749051 ] + This commit adds a null check for the set_output_gamma function pointer in the dcn32_set_output_transfer_func function. Previously, set_output_gamma was being checked for null, but then it was being @@ -18,15 +20,16 @@ Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx> Reviewed-by: Tom Chung <chiahsuan.chung@xxxxxxx> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> +Signed-off-by: Xiangyu Chen <xiangyu.chen@xxxxxxxxxxxxx> --- - drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 4 +++- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c -index fcaabad204a25..c3bbbfd1be941 100644 ---- a/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c -+++ b/drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c -@@ -582,7 +582,9 @@ bool dcn32_set_output_transfer_func(struct dc *dc, +diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +index bd75d3cba098..d3ad13bf35c8 100644 +--- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c ++++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c +@@ -667,7 +667,9 @@ bool dcn32_set_output_transfer_func(struct dc *dc, } } @@ -37,3 +40,6 @@ return ret; } +-- +2.43.0 + --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success | | stable/linux-6.1.y | Success | Success |
