From 078fbfe5b588d07aea4ec3ec184a4800de945e84 Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Tue, 18 Dec 2018 18:40:29 +0800 Subject: [PATCH] drm/bridge/anxlogix: anx6345: backported to current tree Change-Id: Ia083b6e02731b1b6f50894e24fd0575a180db14a Signed-off-by: Wyon Bi --- drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c index e31319228ddf..7d82e9fce8e8 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c +++ b/drivers/gpu/drm/bridge/analogix/analogix-anx6345.c @@ -553,8 +553,7 @@ static int anx6345_get_modes(struct drm_connector *connector) } } - err = drm_connector_update_edid_property(connector, - anx6345->edid); + err = drm_mode_connector_update_edid_property(connector, anx6345->edid); if (err) { DRM_ERROR("Failed to update EDID property: %d\n", err); goto unlock; @@ -619,16 +618,10 @@ static int anx6345_bridge_attach(struct drm_bridge *bridge) drm_connector_helper_add(&anx6345->connector, &anx6345_connector_helper_funcs); - err = drm_connector_register(&anx6345->connector); - if (err) { - DRM_ERROR("Failed to register connector: %d\n", err); - return err; - } - anx6345->connector.polled = DRM_CONNECTOR_POLL_HPD; - err = drm_connector_attach_encoder(&anx6345->connector, - bridge->encoder); + err = drm_mode_connector_attach_encoder(&anx6345->connector, + bridge->encoder); if (err) { DRM_ERROR("Failed to link up connector to encoder: %d\n", err); return err;