cadence: cdns-mhdp8546*: Change drm_connector from structure to pointer

Now that we have dropped the legacy code which became redundant with
introduction of DRM_BRIDGE_ATTACH_NO_CONNECTOR
usecase in driver,we can cleanly switch to drm_connector pointer
instead of structure.

Rename the connector_ptr member variable to connector for clarity and
consistency. The driver was using both connector and connector_ptr members,
but connector_ptr was the only one actually used throughout the code.
This change removes the unused connector struct member and renames
connector_ptr to connector for better readability.

This is purely a code cleanup change with no functional impact. All
references to connector_ptr are updated to use the renamed connector
variable throughout the driver.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Jayesh Choudhary <j-choudhary@ti.com>
Signed-off-by: Harikrishna Shenoy <h-shenoy@ti.com>
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patch.msgid.link/20251209120332.3559893-6-h-shenoy@ti.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
index 243cb61dcde158a6501477133decd267c83292a5..89cf8cb37cd3f66bc469be1fe438ed49f451a026 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c
@@ -1765,12 +1765,12 @@ static void cdns_mhdp_atomic_enable(struct drm_bridge *bridge,
 
        mutex_lock(&mhdp->link_mutex);
 
-       mhdp->connector_ptr = drm_atomic_get_new_connector_for_encoder(state,
-                                                                      bridge->encoder);
-       if (WARN_ON(!mhdp->connector_ptr))
+       mhdp->connector = drm_atomic_get_new_connector_for_encoder(state,
+                                                                  bridge->encoder);
+       if (WARN_ON(!mhdp->connector))
                goto out;
 
-       conn_state = drm_atomic_get_new_connector_state(state, mhdp->connector_ptr);
+       conn_state = drm_atomic_get_new_connector_state(state, mhdp->connector);
        if (WARN_ON(!conn_state))
                goto out;
 
@@ -1869,7 +1869,7 @@ static void cdns_mhdp_atomic_disable(struct drm_bridge *bridge,
        if (mhdp->info && mhdp->info->ops && mhdp->info->ops->disable)
                mhdp->info->ops->disable(mhdp);
 
-       mhdp->connector_ptr = NULL;
+       mhdp->connector = NULL;
        mutex_unlock(&mhdp->link_mutex);
 }
 
@@ -1964,7 +1964,7 @@ static int cdns_mhdp_atomic_check(struct drm_bridge *bridge,
        const struct drm_display_mode *mode = &crtc_state->adjusted_mode;
        struct drm_connector_state *old_state, *new_state;
        struct drm_atomic_state *state = crtc_state->state;
-       struct drm_connector *conn = mhdp->connector_ptr;
+       struct drm_connector *conn = mhdp->connector;
        u64 old_cp, new_cp;
 
        mutex_lock(&mhdp->link_mutex);
@@ -2179,7 +2179,7 @@ static void cdns_mhdp_modeset_retry_fn(struct work_struct *work)
 
        mhdp = container_of(work, typeof(*mhdp), modeset_retry_work);
 
-       conn = mhdp->connector_ptr;
+       conn = mhdp->connector;
 
        /* Grab the locks before changing connector property */
        mutex_lock(&conn->dev->mode_config.mutex);

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
index a76775c7689568889a1bd2e1e761d650e4a95455..b297db53ba2835e43e3cb238887d7f4f03309683 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h
@@ -375,8 +375,7 @@ struct cdns_mhdp_device {
         */
        struct mutex link_mutex;
 
-       struct drm_connector connector;
-       struct drm_connector *connector_ptr;
+       struct drm_connector *connector;
        struct drm_bridge bridge;
 
        struct cdns_mhdp_link link;

diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
index 21a7d2fb266e49f55e1595ea69c67069f9b7d34e..5cd0b873e16f94f7168dd385129e913089e87b2d 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
+++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c
@@ -394,7 +394,7 @@ static int _cdns_mhdp_hdcp_disable(struct cdns_mhdp_device *mhdp)
        int ret;
 
        dev_dbg(mhdp->dev, "[%s:%d] HDCP is being disabled...\n",
-               mhdp->connector_ptr->name, mhdp->connector_ptr->base.id);
+               mhdp->connector->name, mhdp->connector->base.id);
 
        ret = cdns_mhdp_hdcp_set_config(mhdp, 0, false);
 
@@ -437,7 +437,7 @@ static int cdns_mhdp_hdcp_check_link(struct cdns_mhdp_device *mhdp)
 
        mutex_lock(&mhdp->hdcp.mutex);
 
-       if (!mhdp->connector_ptr)
+       if (!mhdp->connector)
                goto out;
 
        if (mhdp->hdcp.value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED)
@@ -449,7 +449,7 @@ static int cdns_mhdp_hdcp_check_link(struct cdns_mhdp_device *mhdp)
 
        dev_err(mhdp->dev,
                "[%s:%d] HDCP link failed, retrying authentication\n",
-               mhdp->connector_ptr->name, mhdp->connector_ptr->base.id);
+               mhdp->connector->name, mhdp->connector->base.id);
 
        ret = _cdns_mhdp_hdcp_disable(mhdp);
        if (ret) {
@@ -494,8 +494,8 @@ static void cdns_mhdp_hdcp_prop_work(struct work_struct *work)
        struct drm_device *dev = NULL;
        struct drm_connector_state *state;
 
-       if (mhdp->connector_ptr)
-               dev = mhdp->connector_ptr->dev;
+       if (mhdp->connector)
+               dev = mhdp->connector->dev;
 
        if (!dev)
                return;
@@ -503,7 +503,7 @@ static void cdns_mhdp_hdcp_prop_work(struct work_struct *work)
        drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
        mutex_lock(&mhdp->hdcp.mutex);
        if (mhdp->hdcp.value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) {
-               state = mhdp->connector_ptr->state;
+               state = mhdp->connector->state;
                state->content_protection = mhdp->hdcp.value;
        }
        mutex_unlock(&mhdp->hdcp.mutex);