Merge "disp: msm: sde: check for valid pointer before accessing" into display-kernel.lnx.5.10

This commit is contained in:
Linux Build Service Account
2021-04-28 10:41:20 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 2 additions and 2 deletions

View File

@@ -409,7 +409,7 @@ static void sde_encoder_phys_cmd_cont_splash_mode_set(
&cmd_enc->autorefresh.cfg); &cmd_enc->autorefresh.cfg);
} }
if (hw_intf->ops.reset_counter) if (hw_intf && hw_intf->ops.reset_counter)
hw_intf->ops.reset_counter(hw_intf); hw_intf->ops.reset_counter(hw_intf);
} }

View File

@@ -2347,7 +2347,7 @@ static void _sde_plane_get_max_downscale_limits(struct sde_plane *psde,
{ {
bool rotated, has_predown, default_scale; bool rotated, has_predown, default_scale;
const struct sde_sspp_sub_blks *sblk; const struct sde_sspp_sub_blks *sblk;
struct sde_hw_inline_pre_downscale_cfg *pd; struct sde_hw_inline_pre_downscale_cfg *pd = NULL;
rotated = pstate->rotation & DRM_MODE_ROTATE_90; rotated = pstate->rotation & DRM_MODE_ROTATE_90;
sblk = psde->pipe_sblk; sblk = psde->pipe_sblk;