Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139dde1e authored by Su Sung Chung's avatar Su Sung Chung Committed by Greg Kroah-Hartman
Browse files

drm/amd/display: fix bug of accessing invalid memory 



[ Upstream commit 43c3ff27a47d83d153c4adc088243ba594582bf5 ]

[Why]
A loop inside of build_evenly_distributed_points function that traverse through
the array of points become an infinite loop when m_GammaUpdates does not
get assigned to any value.

[How]
In DMColor, clear m_gammaIsValid bit just before writting all Zeromem for
m_GammaUpdates, to prevent calling build_evenly_distributed_points
before m_GammaUpdates gets assigned to some value.

Signed-off-by: default avatarSu Sung Chung <Su.Chung@amd.com>
Reviewed-by: default avatarAric Cyr <Aric.Cyr@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56e4367f

drivers/gpu/drm/amd/display/modules/color/color_gamma.c

+6 −2
Original line number Diff line number Diff line
@@ -1069,10 +1069,14 @@ static void build_evenly_distributed_points( 
	struct dividers dividers)

{

	struct gamma_pixel *p = points;

	struct gamma_pixel *p_last = p + numberof_points - 1;

	struct gamma_pixel *p_last;



	uint32_t i = 0;



	// This function should not gets called with 0 as a parameter

	ASSERT(numberof_points > 0);

	p_last = p + numberof_points - 1;



	do {

		struct fixed31_32 value = dc_fixpt_from_fraction(i,

			numberof_points - 1);
@@ -1083,7 +1087,7 @@ static void build_evenly_distributed_points( 


		++p;

		++i;

	} while (i != numberof_points);

	} while (i < numberof_points);



	p->r = dc_fixpt_div(p_last->r, dividers.divider1);

	p->g = dc_fixpt_div(p_last->g, dividers.divider1);