Merge tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / drivers / gpu / drm / mediatek / mtk_hdmi.c

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi.c b/drivers/gpu/drm/mediatek/mtk_hdmi.c
index d80017e..ff43a3d 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_hdmi.c
+++ b/drivers/gpu/drm/mediatek/mtk_hdmi.c
@@ -1314,11 +1314,17 @@ static void mtk_hdmi_hpd_event(bool hpd, struct device *dev)
  * Bridge callbacks
  */
 
-static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
+static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge,
+                                 enum drm_bridge_attach_flags flags)
 {
        struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
        int ret;
 
+       if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
+               DRM_ERROR("Fix bridge driver to make connector optional!");
+               return -EINVAL;
+       }
+
        ret = drm_connector_init_with_ddc(bridge->encoder->dev, &hdmi->conn,
                                          &mtk_hdmi_connector_funcs,
                                          DRM_MODE_CONNECTOR_HDMIA,
@@ -1343,7 +1349,7 @@ static int mtk_hdmi_bridge_attach(struct drm_bridge *bridge)
 
        if (hdmi->next_bridge) {
                ret = drm_bridge_attach(bridge->encoder, hdmi->next_bridge,
-                                       bridge);
+                                       bridge, flags);
                if (ret) {
                        dev_err(hdmi->dev,
                                "Failed to attach external bridge: %d\n", ret);