UPSTREAM: drm: Do not set connector->encoder in drivers

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / shmobile / shmob_drm_crtc.c

diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
index e9272b0a859246970d62c69b8c7132e20f799d68..db0763794edcb62de69a9f45c825a0b79b631820 100644 (file)
--- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
+++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c
@@ -613,7 +613,7 @@ int shmob_drm_encoder_create(struct shmob_drm_device *sdev)
        encoder->possible_crtcs = 1;
 
        ret = drm_encoder_init(sdev->ddev, encoder, &encoder_funcs,
-                              DRM_MODE_ENCODER_LVDS);
+                              DRM_MODE_ENCODER_LVDS, NULL);
        if (ret < 0)
                return ret;
 
@@ -739,8 +739,6 @@ int shmob_drm_connector_create(struct shmob_drm_device *sdev,
        if (ret < 0)
                goto err_backlight;
 
-       connector->encoder = encoder;
-
        drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
        drm_object_property_set_value(&connector->base,
                sdev->ddev->mode_config.dpms_property, DRM_MODE_DPMS_OFF);