drm: rcar-du: Wait for page flip completion when turning the CRTC off

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / rcar-du / rcar_du_hdmicon.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
index 4d7d4dd46d2603c6cc3d4f06958edac30d34a2a4..3896cb20ad5192a0350eddc60b89021411d7e82f 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
@@ -95,6 +95,8 @@ int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,
        connector = &rcon->connector;
        connector->display_info.width_mm = 0;
        connector->display_info.height_mm = 0;
+       connector->interlace_allowed = true;
+       connector->polled = DRM_CONNECTOR_POLL_HPD;
 
        ret = drm_connector_init(rcdu->ddev, connector, &connector_funcs,
                                 DRM_MODE_CONNECTOR_HDMIA);
@@ -114,7 +116,6 @@ int rcar_du_hdmi_connector_init(struct rcar_du_device *rcdu,
        if (ret < 0)
                return ret;
 
-       connector->encoder = encoder;
        rcon->encoder = renc;
 
        return 0;