1 files changed, 15 insertions, 39 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 939d4df07777..cea6696b1906 100644
--- 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);
@@ -712,12 +708,9 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
         case OUTPUT_TV:
                 return get_slave_funcs(encoder)->mode_valid(encoder, mode);
         case OUTPUT_DP:
-                if (nv_encoder->dp.link_bw == DP_LINK_BW_2_7)
-                        max_clock = nv_encoder->dp.link_nr * 270000;
-                else
-                        max_clock = nv_encoder->dp.link_nr * 162000;
-
-                clock = clock * nouveau_connector_bpp(connector) / 8;
+                max_clock  = nv_encoder->dp.link_nr;
+                max_clock *= nv_encoder->dp.link_bw;
+                clock = clock * nouveau_connector_bpp(connector) / 10;
                 break;
         default:
                 BUG_ON(1);
@@ -871,7 +864,6 @@ nouveau_connector_create(struct drm_device *dev, int index)
                                         dev->mode_config.scaling_mode_property,
                                         nv_connector->scaling_mode);
                 }
-                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
                 /* fall-through */
         case DCB_CONNECTOR_TV_0:
         case DCB_CONNECTOR_TV_1:
@@ -888,27 +880,20 @@ nouveau_connector_create(struct drm_device *dev, int index)
                                 dev->mode_config.dithering_mode_property,
                                 nv_connector->use_dithering ?
                                 DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);
-
-                if (connector->connector_type != DRM_MODE_CONNECTOR_LVDS) {
-                        if (dev_priv->card_type >= NV_50)
-                                connector->polled = DRM_CONNECTOR_POLL_HPD;
-                        else
-                                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
-                }
                 break;
         }
 
-        if (pgpio->irq_register) {
+        if (nv_connector->dcb->gpio_tag != 0xff && pgpio->irq_register) {
                 pgpio->irq_register(dev, nv_connector->dcb->gpio_tag,
                                     nouveau_connector_hotplug, connector);
+
+                connector->polled = DRM_CONNECTOR_POLL_HPD;
+        } else {
+                connector->polled = DRM_CONNECTOR_POLL_CONNECT;
         }
 
         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;
 
@@ -925,22 +910,13 @@ nouveau_connector_hotplug(void *data, int plugged)
         struct drm_connector *connector = data;
         struct drm_device *dev = connector->dev;
 
-        NV_INFO(dev, "%splugged %s\n", plugged ? "" : "un",
-                drm_get_connector_name(connector));
-
-        if (connector->encoder && connector->encoder->crtc &&
-            connector->encoder->crtc->enabled) {
-                struct nouveau_encoder *nv_encoder = nouveau_encoder(connector->encoder);
-                struct drm_encoder_helper_funcs *helper =
-                        connector->encoder->helper_private;
+        NV_DEBUG(dev, "%splugged %s\n", plugged ? "" : "un",
+                 drm_get_connector_name(connector));
 
-                if (nv_encoder->dcb->type == OUTPUT_DP) {
-                        if (plugged)
-                                helper->dpms(connector->encoder, DRM_MODE_DPMS_ON);
-                        else
-                                helper->dpms(connector->encoder, DRM_MODE_DPMS_OFF);
-                }
-        }
+        if (plugged)
+                drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+        else
+                drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
 
         drm_helper_hpd_irq_event(dev);
 }