diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-12-23 10:54:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-12-23 10:55:04 +1000 |
| commit | ae95af9755285affce9cdb29e07522d27eedcb7b (patch) | |
| tree | e7b3ef0a2bac3d04ddb9ba57a42e27f907c77782 | |
| parent | a7904a538933c525096ca2ccde1e60d0ee62c08e (diff) | |
| parent | 3b8e19a0aa3933a785be9f1541afd8d398c4ec69 (diff) | |
| download | slab-ae95af9755285affce9cdb29e07522d27eedcb7b.tar.gz | |
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
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_hdmi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 5838c44cbf6f0..3196189429bcf 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge, return MODE_BAD; } - if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode)) - return MODE_BAD; + if (hdmi->conf) { + if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode)) + return MODE_BAD; - if (hdmi->conf->max_mode_clock && - mode->clock > hdmi->conf->max_mode_clock) - return MODE_CLOCK_HIGH; + if (hdmi->conf->max_mode_clock && + mode->clock > hdmi->conf->max_mode_clock) + return MODE_CLOCK_HIGH; + } if (mode->clock < 27000) return MODE_CLOCK_LOW; |