diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-11-24 12:49:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-11-24 12:49:36 +1000 |
| commit | 2847b6681547022e5c8f1f6dc104c9256a120c0a (patch) | |
| tree | a4ce5a054dad5f5b0746ced4ead7be83ef56f0f0 /drivers/gpu/drm/mediatek/mtk_hdmi.c | |
| parent | 9040ef6f68a29114ff77c423d3f78be09391ae97 (diff) | |
| parent | 76cdcb87d391a8e426d81b26be0afc221291cfc2 (diff) | |
| download | linux-2847b6681547022e5c8f1f6dc104c9256a120c0a.tar.gz linux-2847b6681547022e5c8f1f6dc104c9256a120c0a.tar.bz2 linux-2847b6681547022e5c8f1f6dc104c9256a120c0a.zip | |
Merge tag 'mediatek-drm-next-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next
Mediatek DRM Next for Linux 6.2
1. Fixup of dpi and hdmi
2. Move panel connector to head
3. Add MT8188 dpi support
4. Add MT8195 AFBC support
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20221123234855.2485-1-chunkuang.hu@kernel.org
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_hdmi.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_hdmi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c index 12fa78f286ff..0a8e0a13f516 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c @@ -1202,9 +1202,10 @@ static enum drm_connector_status mtk_hdmi_detect(struct mtk_hdmi *hdmi) return mtk_hdmi_update_plugged_status(hdmi); } -static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge, - const struct drm_display_info *info, - const struct drm_display_mode *mode) +static enum drm_mode_status +mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge, + const struct drm_display_info *info, + const struct drm_display_mode *mode) { struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge); struct drm_bridge *next_bridge; |