Merge tag 'topic/drm-fixes-2015-08-14' of git://anongit.freedesktop.org/drm-intel...

single MST fixes from Maarten.

* tag 'topic/drm-fixes-2015-08-14' of git://anongit.freedesktop.org/drm-intel:
  drm/dp/mst: Remove port after removing connector.

diff --combined drivers/gpu/drm/drm_dp_mst_topology.c
index b0487c9f018cfd09d040ffb08fe4585f68ab6022,1325eecb0510e534b3da0256cfe4a4495d9001d1..eb603f1defc2250ea158864ea4371e24655138e1
--- 1/drivers/gpu/drm/drm_dp_mst_topology.c
--- 2/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@@ -873,9 -873,10 +873,10 @@@ static void drm_dp_destroy_port(struct 
                   from an EDID retrieval */
                if (port->connector) {
                        mutex_lock(&mgr->destroy_connector_lock);
-                       list_add(&port->connector->destroy_list, &mgr->destroy_connector_list);
+                       list_add(&port->next, &mgr->destroy_connector_list);
                        mutex_unlock(&mgr->destroy_connector_lock);
                        schedule_work(&mgr->destroy_connector_work);
+                       return;
                }
                drm_dp_port_teardown_pdt(port, port->pdt);
  
@@@ -1294,6 -1295,7 +1295,6 @@@ retry
                                goto retry;
                        }
                        DRM_DEBUG_KMS("failed to dpcd write %d %d\n", tosend, ret);
 -                      WARN(1, "fail\n");
  
                        return -EIO;
                }
@@@ -2659,7 -2661,7 +2660,7 @@@ static void drm_dp_tx_work(struct work_
  static void drm_dp_destroy_connector_work(struct work_struct *work)
  {
        struct drm_dp_mst_topology_mgr *mgr = container_of(work, struct drm_dp_mst_topology_mgr, destroy_connector_work);
-       struct drm_connector *connector;
+       struct drm_dp_mst_port *port;
  
        /*
         * Not a regular list traverse as we have to drop the destroy
@@@ -2668,15 -2670,21 +2669,21 @@@
         */
        for (;;) {
                mutex_lock(&mgr->destroy_connector_lock);
-               connector = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_connector, destroy_list);
-               if (!connector) {
+               port = list_first_entry_or_null(&mgr->destroy_connector_list, struct drm_dp_mst_port, next);
+               if (!port) {
                        mutex_unlock(&mgr->destroy_connector_lock);
                        break;
                }
-               list_del(&connector->destroy_list);
+               list_del(&port->next);
                mutex_unlock(&mgr->destroy_connector_lock);
  
-               mgr->cbs->destroy_connector(mgr, connector);
+               mgr->cbs->destroy_connector(mgr, port->connector);
+ 
+               drm_dp_port_teardown_pdt(port, port->pdt);
+ 
+               if (!port->input && port->vcpi.vcpi > 0)
+                       drm_dp_mst_put_payload_id(mgr, port->vcpi.vcpi);
+               kfree(port);
        }
  }