Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_dp_cec.c

diff --git a/drivers/gpu/drm/drm_dp_cec.c b/drivers/gpu/drm/drm_dp_cec.c
index b15cee85b702b257f0ebdd19c3d2f6e4995207fc..b457c16c3a8bb546ce6dfc49150919efdd24a261 100644 (file)
--- a/drivers/gpu/drm/drm_dp_cec.c
+++ b/drivers/gpu/drm/drm_dp_cec.c
@@ -8,7 +8,9 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <drm/drm_connector.h>
 #include <drm/drm_dp_helper.h>
+#include <drm/drmP.h>
 #include <media/cec.h>
 
 /*
@@ -295,7 +297,10 @@ static void drm_dp_cec_unregister_work(struct work_struct *work)
  */
 void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)
 {
-       u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD;
+       struct drm_connector *connector = aux->cec.connector;
+       u32 cec_caps = CEC_CAP_DEFAULTS | CEC_CAP_NEEDS_HPD |
+                      CEC_CAP_CONNECTOR_INFO;
+       struct cec_connector_info conn_info;
        unsigned int num_las = 1;
        u8 cap;
 
@@ -344,13 +349,17 @@ void drm_dp_cec_set_edid(struct drm_dp_aux *aux, const struct edid *edid)
 
        /* Create a new adapter */
        aux->cec.adap = cec_allocate_adapter(&drm_dp_cec_adap_ops,
-                                            aux, aux->cec.name, cec_caps,
+                                            aux, connector->name, cec_caps,
                                             num_las);
        if (IS_ERR(aux->cec.adap)) {
                aux->cec.adap = NULL;
                goto unlock;
        }
-       if (cec_register_adapter(aux->cec.adap, aux->cec.parent)) {
+
+       cec_fill_conn_info_from_drm(&conn_info, connector);
+       cec_s_conn_info(aux->cec.adap, &conn_info);
+
+       if (cec_register_adapter(aux->cec.adap, connector->dev->dev)) {
                cec_delete_adapter(aux->cec.adap);
                aux->cec.adap = NULL;
        } else {
@@ -406,22 +415,20 @@ EXPORT_SYMBOL(drm_dp_cec_unset_edid);
 /**
  * drm_dp_cec_register_connector() - register a new connector
  * @aux: DisplayPort AUX channel
- * @name: name of the CEC device
- * @parent: parent device
+ * @connector: drm connector
  *
  * A new connector was registered with associated CEC adapter name and
  * CEC adapter parent device. After registering the name and parent
  * drm_dp_cec_set_edid() is called to check if the connector supports
  * CEC and to register a CEC adapter if that is the case.
  */
-void drm_dp_cec_register_connector(struct drm_dp_aux *aux, const char *name,
-                                  struct device *parent)
+void drm_dp_cec_register_connector(struct drm_dp_aux *aux,
+                                  struct drm_connector *connector)
 {
        WARN_ON(aux->cec.adap);
        if (WARN_ON(!aux->transfer))
                return;
-       aux->cec.name = name;
-       aux->cec.parent = parent;
+       aux->cec.connector = connector;
        INIT_DELAYED_WORK(&aux->cec.unregister_work,
                          drm_dp_cec_unregister_work);
 }