From: Dave Airlie Date: Tue, 26 May 2026 00:46:10 +0000 (+1000) Subject: Merge tag 'mediatek-drm-next-20260521' of https://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12f8a5780e1173b4a28b8acba93380781a759bd;p=thirdparty%2Flinux.git Merge tag 'mediatek-drm-next-20260521' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-next 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 From: Chun-Kuang Hu Link: https://patch.msgid.link/20260521140841.5103-1-chunkuang.hu@kernel.org --- f12f8a5780e1173b4a28b8acba93380781a759bd diff --cc drivers/gpu/drm/mediatek/mtk_dsi.c index 46cf4b043f123,2257966bbaa9a..eb325e68aa592 --- a/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);