Commit 7eb90975 authored Dec 12, 2018 by Joshua Aberback Committed by Alex Deucher Jan 14, 2019

drm/amd/display: Fix for NULL ramp pointer crashing driver



[Why]
In certain scenarios the ramp parameter come in as NULL, which crashes
because this function doesn't guard properly in the early return.

[How]
- parameter mapUserRamp should be the guard (false means no ramp)
- remove checking ramp in early return

Signed-off-by: Joshua Aberback <joshua.aberback@amd.com>
Reviewed-by: Sivapiriyan Kumarasamy <Sivapiriyan.Kumarasamy@amd.com>
Acked-by: Eryk Brol <Eryk.Brol@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent ffb6c1c6

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -1772,8 +1772,7 @@ bool mod_color_calculate_degamma_params(struct dc_transfer_func *input_tf,
		/* we can use hardcoded curve for plain SRGB TF */
		if (input_tf->type == TF_TYPE_PREDEFINED &&
		input_tf->tf == TRANSFER_FUNCTION_SRGB &&
		(!mapUserRamp &&
		(ramp->type == GAMMA_RGB_256 \|\| ramp->num_entries == 0)))
		!mapUserRamp)
		return true;

		input_tf->type = TF_TYPE_DISTRIBUTED_POINTS;

Admin message