drm: Nuke drm_atomic_helper_connector_dpms

[mirror_ubuntu-bionic-kernel.git] / drivers / gpu / drm / bridge / sii902x.c

diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 9b87067c022cd8f541d94310dd5266ab84cf7c9d..b1ab4ab09532b49901bdd7126f951c40a10424d5 100644 (file)
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -124,7 +124,6 @@ sii902x_connector_detect(struct drm_connector *connector, bool force)
 }
 
 static const struct drm_connector_funcs sii902x_connector_funcs = {
-       .dpms = drm_atomic_helper_connector_dpms,
        .detect = sii902x_connector_detect,
        .fill_modes = drm_helper_probe_single_connector_modes,
        .destroy = drm_connector_cleanup,
@@ -269,7 +268,7 @@ static void sii902x_bridge_mode_set(struct drm_bridge *bridge,
        if (ret)
                return;
 
-       ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj);
+       ret = drm_hdmi_avi_infoframe_from_display_mode(&frame, adj, false);
        if (ret < 0) {
                DRM_ERROR("couldn't fill AVI infoframe\n");
                return;
@@ -418,11 +417,7 @@ static int sii902x_probe(struct i2c_client *client,
 
        sii902x->bridge.funcs = &sii902x_bridge_funcs;
        sii902x->bridge.of_node = dev->of_node;
-       ret = drm_bridge_add(&sii902x->bridge);
-       if (ret) {
-               dev_err(dev, "Failed to add drm_bridge\n");
-               return ret;
-       }
+       drm_bridge_add(&sii902x->bridge);
 
        i2c_set_clientdata(client, sii902x);