Skip to content

Commit ae95af9

Browse files
committed
Merge tag 'mediatek-drm-fixes-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes
Mediatek DRM Fixes for Linux 5.16 1. Perform NULL pointer check for mtk_hdmi_conf. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Chun-Kuang Hu <chunkuang.hu@kernel.org> Link: https://patchwork.freedesktop.org/patch/msgid/1639956861-14873-1-git-send-email-chunkuang.hu@kernel.org
2 parents a7904a5 + 3b8e19a commit ae95af9

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

drivers/gpu/drm/mediatek/mtk_hdmi.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
12241224
return MODE_BAD;
12251225
}
12261226

1227-
if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
1228-
return MODE_BAD;
1227+
if (hdmi->conf) {
1228+
if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
1229+
return MODE_BAD;
12291230

1230-
if (hdmi->conf->max_mode_clock &&
1231-
mode->clock > hdmi->conf->max_mode_clock)
1232-
return MODE_CLOCK_HIGH;
1231+
if (hdmi->conf->max_mode_clock &&
1232+
mode->clock > hdmi->conf->max_mode_clock)
1233+
return MODE_CLOCK_HIGH;
1234+
}
12331235

12341236
if (mode->clock < 27000)
12351237
return MODE_CLOCK_LOW;

0 commit comments

Comments
 (0)