drm/msm/dp: Remove encoder pointer from struct msm_dp

We don't need to stash the encoder here. Instead we can simply pass it
around as an argument.

Cc: Kuogee Hsieh <quic_khsieh@quicinc.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/491187/
Link: https://lore.kernel.org/r/20220625002811.3225344-1-swboyd@chromium.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index c234295..859353f 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1624,8 +1624,6 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
                return ret;
        }
 
-       dp_display->encoder = encoder;
-
        ret = dp_display_get_next_bridge(dp_display);
        if (ret)
                return ret;
@@ -1641,7 +1639,7 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
 
        priv->bridges[priv->num_bridges++] = dp_display->bridge;
 
-       dp_display->connector = dp_drm_connector_init(dp_display);
+       dp_display->connector = dp_drm_connector_init(dp_display, encoder);
        if (IS_ERR(dp_display->connector)) {
                ret = PTR_ERR(dp_display->connector);
                DRM_DEV_ERROR(dev->dev,

diff --git a/drivers/gpu/drm/msm/dp/dp_display.h b/drivers/gpu/drm/msm/dp/dp_display.h
index 4f9fe4d..dcedf02 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_display.h
+++ b/drivers/gpu/drm/msm/dp/dp_display.h
@@ -15,7 +15,6 @@ struct msm_dp {
        struct device *codec_dev;
        struct drm_bridge *bridge;
        struct drm_connector *connector;
-       struct drm_encoder *encoder;
        struct drm_bridge *next_bridge;
        bool is_connected;
        bool audio_enabled;

diff --git a/drivers/gpu/drm/msm/dp/dp_drm.c b/drivers/gpu/drm/msm/dp/dp_drm.c
index 62d58b9..6df25f7 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_drm.c
+++ b/drivers/gpu/drm/msm/dp/dp_drm.c
@@ -116,7 +116,7 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
        }
 
        if (dp_display->next_bridge) {
-               rc = drm_bridge_attach(dp_display->encoder,
+               rc = drm_bridge_attach(encoder,
                                        dp_display->next_bridge, bridge,
                                        DRM_BRIDGE_ATTACH_NO_CONNECTOR);
                if (rc < 0) {
@@ -130,15 +130,15 @@ struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *
 }
 
 /* connector initialization */
-struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display)
+struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder)
 {
        struct drm_connector *connector = NULL;
 
-       connector = drm_bridge_connector_init(dp_display->drm_dev, dp_display->encoder);
+       connector = drm_bridge_connector_init(dp_display->drm_dev, encoder);
        if (IS_ERR(connector))
                return connector;
 
-       drm_connector_attach_encoder(connector, dp_display->encoder);
+       drm_connector_attach_encoder(connector, encoder);
 
        return connector;
 }

diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h
index f4b1ed1..82035db 100644 (file)
--- a/drivers/gpu/drm/msm/dp/dp_drm.h
+++ b/drivers/gpu/drm/msm/dp/dp_drm.h
@@ -19,7 +19,7 @@ struct msm_dp_bridge {
 
 #define to_dp_bridge(x)     container_of((x), struct msm_dp_bridge, bridge)
 
-struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display);
+struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display, struct drm_encoder *encoder);
 struct drm_bridge *dp_bridge_init(struct msm_dp *dp_display, struct drm_device *dev,
                        struct drm_encoder *encoder);