drm/nv50/backlight: take the sor into account when bashing regs

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 561d4c6677eac2018085bfe847f0208a8f684dbf..5308024ce56ab6247ec0df817900ee30a562f65c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -39,7 +39,7 @@
 
 static void nouveau_connector_hotplug(void *, int);
 
-static struct nouveau_encoder *
+struct nouveau_encoder *
 find_encoder(struct drm_connector *connector, int type)
 {
        struct drm_device *dev = connector->dev;
@@ -116,10 +116,6 @@ nouveau_connector_destroy(struct drm_connector *connector)
                                      nouveau_connector_hotplug, connector);
        }
 
-       if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
-           connector->connector_type == DRM_MODE_CONNECTOR_eDP)
-               nouveau_backlight_exit(connector);
-
        kfree(nv_connector->edid);
        drm_sysfs_connector_remove(connector);
        drm_connector_cleanup(connector);
@@ -901,10 +897,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
 
        drm_sysfs_connector_add(connector);
 
-       if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
-           connector->connector_type == DRM_MODE_CONNECTOR_eDP)
-               nouveau_backlight_init(connector);
-
        dcb->drm = connector;
        return dcb->drm;