Skip to content

Commit 3b8e19a

Browse files
AngeloGioacchino Del RegnoChun-Kuang Hu
authored andcommitted
drm/mediatek: hdmi: Perform NULL pointer check for mtk_hdmi_conf
In commit 41ca9ca ("drm/mediatek: hdmi: Add check for CEA modes only") a check for CEA modes was added to function mtk_hdmi_bridge_mode_valid() in order to address possible issues on MT8167; moreover, with commit c91026a ("drm/mediatek: hdmi: Add optional limit on maximal HDMI mode clock") another similar check was introduced. Unfortunately though, at the time of writing, MT8173 does not provide any mtk_hdmi_conf structure and this is crashing the kernel with NULL pointer upon entering mtk_hdmi_bridge_mode_valid(), which happens as soon as a HDMI cable gets plugged in. To fix this regression, add a NULL pointer check for hdmi->conf in the said function, restoring HDMI functionality and avoiding NULL pointer kernel panics. Fixes: 41ca9ca ("drm/mediatek: hdmi: Add check for CEA modes only") Fixes: c91026a ("drm/mediatek: hdmi: Add optional limit on maximal HDMI mode clock") Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent fa55b7d commit 3b8e19a

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)