Merge tag 'mediatek-drm-next-20260521' of https://git.kernel.org/pub/scm/linux/kernel...

Mediatek DRM Next - 20260521

1. hdmi: Convert DRM_ERROR() to drm_err()
2. Simplify mtk_crtc allocation
3. mtk_dpi: Open-code drm_simple_encoder_init()
4. Convert legacy DRM logging to drm_* helpers in mtk_dsi.c
5. dsi: Add compatible for mt8167-dsi

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patch.msgid.link/20260521140841.5103-1-chunkuang.hu@kernel.org

diff --cc drivers/gpu/drm/mediatek/mtk_crtc.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_dpi.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c
index 46cf4b043f123c3090ba81755bef285436db5eef,2257966bbaa9a8d2a7a268d871abe2cc175d5d0e..eb325e68aa592bfc5c6e450bda56e70e59223c76
--- 1/drivers/gpu/drm/mediatek/mtk_dsi.c
--- 2/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@@ -846,9 -849,10 +849,10 @@@ static void mtk_dsi_bridge_atomic_enabl
  }
  
  static void mtk_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge,
 -                                           struct drm_atomic_state *state)
 +                                           struct drm_atomic_commit *state)
  {
        struct mtk_dsi *dsi = bridge_to_dsi(bridge);
+       struct drm_device *drm = bridge->dev;
        int ret;
  
        ret = mtk_dsi_poweron(dsi);

diff --cc drivers/gpu/drm/mediatek/mtk_hdmi.c
Simple merge