Commit 1b6c8067 authored by Bhawanpreet Lakha's avatar Bhawanpreet Lakha Committed by Alex Deucher
Browse files

drm/amd/display: Add null check for 24BPP (xfm and dpp) 



Fixes Nullptr error when trying 24BPP

Signed-off-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent acc34503

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+12 −6
Original line number Diff line number Diff line
@@ -856,6 +856,7 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
	pipe_ctx->plane_res.scl_data.h_active = timing->h_addressable + timing->h_border_left + timing->h_border_right;

	pipe_ctx->plane_res.scl_data.v_active = timing->v_addressable + timing->v_border_top + timing->v_border_bottom;





	/* Taps calculations */

	if (pipe_ctx->plane_res.xfm != NULL)

		res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps(
@@ -864,16 +865,21 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx) 
	if (pipe_ctx->plane_res.dpp != NULL)

		res = pipe_ctx->plane_res.dpp->funcs->dpp_get_optimal_number_of_taps(

				pipe_ctx->plane_res.dpp, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality);



	if (!res) {

		/* Try 24 bpp linebuffer */

		pipe_ctx->plane_res.scl_data.lb_params.depth = LB_PIXEL_DEPTH_24BPP;



		if (pipe_ctx->plane_res.xfm != NULL)

			res = pipe_ctx->plane_res.xfm->funcs->transform_get_optimal_number_of_taps(

			pipe_ctx->plane_res.xfm, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality);

					pipe_ctx->plane_res.xfm,

					&pipe_ctx->plane_res.scl_data,

					&plane_state->scaling_quality);



		if (pipe_ctx->plane_res.dpp != NULL)

			res = pipe_ctx->plane_res.dpp->funcs->dpp_get_optimal_number_of_taps(

			pipe_ctx->plane_res.dpp, &pipe_ctx->plane_res.scl_data, &plane_state->scaling_quality);

					pipe_ctx->plane_res.dpp,

					&pipe_ctx->plane_res.scl_data,

					&plane_state->scaling_quality);

	}



	if (res)

CRA Git | Maintained and supported by SUSTech CRA and CCSE