On 25 January 2017 at 09:49, Dhinakaran Pandiyan
<dhinakaran.pandiyan@xxxxxxxxx> wrote:
> 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@xxxxxxxxx>
Makes sense, can't think of any reason I initially didn't do this.
Reviewed-by: Dave Airlie <airlied@xxxxxxxxxx>
> ---
> drivers/gpu/drm/drm_dp_mst_topology.c | 6 +++---
> drivers/gpu/drm/i915/intel_dp_mst.c | 3 ++-
> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
> drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +-
> include/drm/drm_dp_mst_helper.h | 7 +++++--
> 5 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index aa64448..122a1b0 100644
> --- 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 205fe47..38e3ca2 100644
> --- 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 cb85cb7..452da48 100644
> --- 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 6d1237d..7d5ada3 100644
> --- 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 0032076..27f3e99 100644
> --- 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);
>
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
