drm/dp: Store drm_device in MST topology manager

struct drm_dp_mst_topology_mgr currently stores a pointer to struct dev.
Changing this to instead hold a pointer to drm_device is more useful as it
gives access to DRM structures. This also makes it consistent with other
DRM structures like drm_crtc, drm_connector etc.

Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1485301777-3465-2-git-send-email-dhinakaran.pandiyan@intel.com

diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index aa644487749c9cbab104f2ea77c819baf7d6b250..122a1b04bebc7c6f7021875b13e1d7cd5f738c4a 100644 (file)
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -1086,7 +1086,7 @@ static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb,
 }
 
 static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
-                           struct device *dev,
+                           struct drm_device *dev,
                            struct drm_dp_link_addr_reply_port *port_msg)
 {
        struct drm_dp_mst_port *port;
@@ -1104,7 +1104,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb,
                port->port_num = port_msg->port_number;
                port->mgr = mstb->mgr;
                port->aux.name = "DPMST";
-               port->aux.dev = dev;
+               port->aux.dev = dev->dev;
                created = true;
        } else {
                old_pdt = port->pdt;
@@ -2949,7 +2949,7 @@ static void drm_dp_destroy_connector_work(struct work_struct *work)
  * Return 0 for success, or negative error code on failure
  */
 int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
-                                struct device *dev, struct drm_dp_aux *aux,
+                                struct drm_device *dev, struct drm_dp_aux *aux,
                                 int max_dpcd_transaction_bytes,
                                 int max_payloads, int conn_base_id)
 {

diff --git a/drivers/gpu/drm/i915/intel_dp_mst.c b/drivers/gpu/drm/i915/intel_dp_mst.c
index 205fe4748ec5acf424bed24ebd1fa7fc3740dae4..38e3ca2f6f180916663656280be27b23bd8b0a4f 100644 (file)
--- a/drivers/gpu/drm/i915/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/intel_dp_mst.c
@@ -587,7 +587,8 @@ intel_dp_mst_encoder_init(struct intel_digital_port *intel_dig_port, int conn_ba
 
        /* create encoders */
        intel_dp_create_fake_mst_encoders(intel_dig_port);
-       ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, dev->dev, &intel_dp->aux, 16, 3, conn_base_id);
+       ret = drm_dp_mst_topology_mgr_init(&intel_dp->mst_mgr, dev,
+                                          &intel_dp->aux, 16, 3, conn_base_id);
        if (ret) {
                intel_dp->can_mst = false;
                return ret;

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index cb85cb72dc1c30cb5114a3f31ecaf3b508e5aa22..452da483ca014e67b2fd9167195f9fae64fff93f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -3417,7 +3417,7 @@ nv50_mstm_new(struct nouveau_encoder *outp, struct drm_dp_aux *aux, int aux_max,
        mstm->outp = outp;
        mstm->mgr.cbs = &nv50_mstm;
 
-       ret = drm_dp_mst_topology_mgr_init(&mstm->mgr, dev->dev, aux, aux_max,
+       ret = drm_dp_mst_topology_mgr_init(&mstm->mgr, dev, aux, aux_max,
                                           max_payloads, conn_base_id);
        if (ret)
                return ret;

diff --git a/drivers/gpu/drm/radeon/radeon_dp_mst.c b/drivers/gpu/drm/radeon/radeon_dp_mst.c
index 6d1237d6e1b85db740f3630cde4ad53ffd64a768..7d5ada3980dc80d012813078b161f371557002c5 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_dp_mst.c
+++ b/drivers/gpu/drm/radeon/radeon_dp_mst.c
@@ -667,7 +667,7 @@ radeon_dp_mst_init(struct radeon_connector *radeon_connector)
                return 0;
 
        radeon_connector->mst_mgr.cbs = &mst_cbs;
-       return drm_dp_mst_topology_mgr_init(&radeon_connector->mst_mgr, dev->dev,
+       return drm_dp_mst_topology_mgr_init(&radeon_connector->mst_mgr, dev,
                                            &radeon_connector->ddc_bus->aux, 16, 6,
                                            radeon_connector->base.base.id);
 }

diff --git a/include/drm/drm_dp_mst_helper.h b/include/drm/drm_dp_mst_helper.h
index 003207670597095a7a5e7b3b06b177992fbd6e40..27f3e99f55d135080958aa8f335d8b9aedeea19b 100644 (file)
--- a/include/drm/drm_dp_mst_helper.h
+++ b/include/drm/drm_dp_mst_helper.h
@@ -414,7 +414,7 @@ struct drm_dp_mst_topology_mgr {
        /**
         * @dev: device pointer for adding i2c devices etc.
         */
-       struct device *dev;
+       struct drm_device *dev;
        /**
         * @cbs: callbacks for connector addition and destruction.
         */
@@ -556,7 +556,10 @@ struct drm_dp_mst_topology_mgr {
        struct work_struct destroy_connector_work;
 };
 
-int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr, struct device *dev, struct drm_dp_aux *aux, int max_dpcd_transaction_bytes, int max_payloads, int conn_base_id);
+int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
+                                struct drm_device *dev, struct drm_dp_aux *aux,
+                                int max_dpcd_transaction_bytes,
+                                int max_payloads, int conn_base_id);
 
 void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr);