Commit ae95af97 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'mediatek-drm-fixes-5.16' of...

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: default avatarDave 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
parents a7904a53 3b8e19a0
...@@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge, ...@@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge,
return MODE_BAD; return MODE_BAD;
} }
if (hdmi->conf) {
if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode)) if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
return MODE_BAD; return MODE_BAD;
if (hdmi->conf->max_mode_clock && if (hdmi->conf->max_mode_clock &&
mode->clock > hdmi->conf->max_mode_clock) mode->clock > hdmi->conf->max_mode_clock)
return MODE_CLOCK_HIGH; return MODE_CLOCK_HIGH;
}
if (mode->clock < 27000) if (mode->clock < 27000)
return MODE_CLOCK_LOW; return MODE_CLOCK_LOW;
......
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