Commit 66e2d2d9 authored by Wayne Lin's avatar Wayne Lin Committed by Alex Deucher

drm/amd/display: Check null pointer before try to access it

[why & how]
Make sure plane_state is not null before calling a function
that dereferences it. Besides, remove redundant codes.
Reviewed-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarWayne Lin <Wayne.Lin@amd.com>
Signed-off-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b686053
...@@ -1928,15 +1928,10 @@ static void dcn20_program_pipe( ...@@ -1928,15 +1928,10 @@ static void dcn20_program_pipe(
pipe_ctx->stream->update_flags.raw) pipe_ctx->stream->update_flags.raw)
dcn20_update_dchubp_dpp(dc, pipe_ctx, context); dcn20_update_dchubp_dpp(dc, pipe_ctx, context);
if (pipe_ctx->update_flags.bits.enable || if (pipe_ctx->plane_state && (pipe_ctx->update_flags.bits.enable ||
(pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.hdr_mult)) pipe_ctx->plane_state->update_flags.bits.hdr_mult))
hws->funcs.set_hdr_multiplier(pipe_ctx);
if ((pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.hdr_mult) ||
pipe_ctx->update_flags.bits.enable)
hws->funcs.set_hdr_multiplier(pipe_ctx); hws->funcs.set_hdr_multiplier(pipe_ctx);
if (hws->funcs.populate_mcm_luts) { if (hws->funcs.populate_mcm_luts) {
if (pipe_ctx->plane_state) { if (pipe_ctx->plane_state) {
hws->funcs.populate_mcm_luts(dc, pipe_ctx, pipe_ctx->plane_state->mcm_luts, hws->funcs.populate_mcm_luts(dc, pipe_ctx, pipe_ctx->plane_state->mcm_luts,
...@@ -1944,13 +1939,12 @@ static void dcn20_program_pipe( ...@@ -1944,13 +1939,12 @@ static void dcn20_program_pipe(
pipe_ctx->plane_state->lut_bank_a = !pipe_ctx->plane_state->lut_bank_a; pipe_ctx->plane_state->lut_bank_a = !pipe_ctx->plane_state->lut_bank_a;
} }
} }
if ((pipe_ctx->plane_state &&
pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change) || if (pipe_ctx->plane_state &&
(pipe_ctx->plane_state && (pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||
pipe_ctx->plane_state->update_flags.bits.gamma_change) || pipe_ctx->plane_state->update_flags.bits.gamma_change ||
(pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.lut_3d ||
pipe_ctx->plane_state->update_flags.bits.lut_3d) || pipe_ctx->update_flags.bits.enable))
pipe_ctx->update_flags.bits.enable)
hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state); hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);
/* dcn10_translate_regamma_to_hw_format takes 750us to finish /* dcn10_translate_regamma_to_hw_format takes 750us to finish
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment