Commit 606c8296 authored Dec 09, 2023 by Ilya Bakoulin Committed by Zheng Zengkai Dec 09, 2023

drm/amd/display: Fix MPCC 1DLUT programming

stable inclusion
from stable-v6.6.5
commit 117917b0be2e9bc893859a70cfff17e48020ada8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8N21P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=117917b0be2e9bc893859a70cfff17e48020ada8



--------------------------------

[ Upstream commit 6f395cebdd8927fbffdc3a55a14fcacf93634359 ]

[Why]
Wrong function is used to translate LUT values to HW format, leading to
visible artifacting in some cases.

[How]
Use the correct cm3_helper function.

Cc: stable@vger.kernel.org # 6.1+
Reviewed-by: Krunoslav Kovac <krunoslav.kovac@amd.com>
Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Ilya Bakoulin <ilya.bakoulin@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent d93654d6

drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -486,8 +486,7 @@ bool dcn32_set_mcm_luts(
		if (plane_state->blend_tf->type == TF_TYPE_HWPWL)
		lut_params = &plane_state->blend_tf->pwl;
		else if (plane_state->blend_tf->type == TF_TYPE_DISTRIBUTED_POINTS) {
		cm_helper_translate_curve_to_hw_format(plane_state->ctx,
		plane_state->blend_tf,
		cm3_helper_translate_curve_to_hw_format(plane_state->blend_tf,
		&dpp_base->regamma_params, false);
		lut_params = &dpp_base->regamma_params;
		}
		@@ -501,8 +500,7 @@ bool dcn32_set_mcm_luts(
		else if (plane_state->in_shaper_func->type == TF_TYPE_DISTRIBUTED_POINTS) {
		// TODO: dpp_base replace
		ASSERT(false);
		cm_helper_translate_curve_to_hw_format(plane_state->ctx,
		plane_state->in_shaper_func,
		cm3_helper_translate_curve_to_hw_format(plane_state->in_shaper_func,
		&dpp_base->shaper_params, true);
		lut_params = &dpp_base->shaper_params;
		}