From: Dave Airlie <airlied@redhat.com>
Date: Tue, 12 Jul 2022 06:54:19 +0000 (+1000)
Subject: Merge tag 'mediatek-drm-next-5.20' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.1-rc5~617^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e4cb0afe21e4e744ed808de1169a62ab35a57f5;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mediatek-drm-next-5.20' of https://git./linux/kernel/git/chunkuang.hu/linux into drm-next

Mediatek DRM Next for Linux 5.20

1. Add Mediatek Soc DRM (vdosys0) support for mt8195
2. Cooperate with DSI RX devices to modify dsi funcs and delay mipi high to cooperate with panel sequence
3. Add mt8186 dsi compatible and convert dsi_dtbinding to .yaml
4. Add MediaTek SoC DRM (vdosys1) support for mt8195
5. Add MT8195 dp_intf driver

Signed-off-by: Dave Airlie <airlied@redhat.com>

[airlied: fix drm_edid.h include]
From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220709142021.24260-1-chunkuang.hu@kernel.org
---

5e4cb0afe21e4e744ed808de1169a62ab35a57f5
diff --cc drivers/gpu/drm/mediatek/mtk_dpi.c
index 6dafa61,fb0b797..630a4e3
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@@ -23,6 -22,6 +23,7 @@@
  #include <drm/drm_bridge.h>
  #include <drm/drm_bridge_connector.h>
  #include <drm/drm_crtc.h>
++#include <drm/drm_edid.h>
  #include <drm/drm_of.h>
  #include <drm/drm_simple_kms_helper.h>