From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4003A1A5B9E for ; Wed, 12 Nov 2025 09:15:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762938935; cv=none; b=iv/AN9XDDUcgtomwGbymFqRZQ9A0EauyT58t/QvCj51/0m586EIUeEgWQvhw1checKz5EOjMlsQdj05ZiI+p5YWoTRaEfLSI5ClgcqYS6LLsev5OgoTAa4NyORfitj0KgCxcfvw1vRGfX/nwsF/PTCek/hBrCTVt8SUHfjn8lT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762938935; c=relaxed/simple; bh=hkJvQF9lkK0c2JJZhoiJIbPTERkesPVbSpePbvoKW2w=; h=Message-ID:Date:MIME-Version:Subject:To:References:From:Cc: In-Reply-To:Content-Type; b=YnzgX8A8dru5uBWVmZPTCPMF5nPiHQOgYfJ1m1FJibWmlFunw6lRzaNVOSrrjBMlN7Rac1LRghe3uZPYNjKCrFQkmnqor8YtRRerhkhibX6U1Gb1xv0zD/Sq9P7pABVNPfMMN336WLVeFxpVPXtznRwUcO+/8j2sQu3vM63thZ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=Kacnw2cs; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Kacnw2cs" Received: from [192.168.88.20] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 13A0182E; Wed, 12 Nov 2025 10:13:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1762938810; bh=hkJvQF9lkK0c2JJZhoiJIbPTERkesPVbSpePbvoKW2w=; h=Date:Subject:To:References:From:Cc:In-Reply-To:From; b=Kacnw2csA6RIRCyzhQQJmUOla22pnN9KDaap4vEyP1uSzZS69SMtVtm+uwfpCM2gd M3348g/I/km/uNoJ2RczyA8VP2Fko6Gbk4gLaGUeO1YTqhG7UN7Tw8P2X1kfDdREDJ WUoZe9tQQFdT8+9Bbksttageov2m2T/S0Ni3hw1Q= Message-ID: <0aabf4ae-2877-409c-a047-5286085bd9a3@ideasonboard.com> Date: Wed, 12 Nov 2025 11:15:25 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v8 4/6] drm/bridge: cadence: cdns-mhdp8546*: Change drm_connector from structure to pointer To: Harikrishna Shenoy References: <20251014094527.3916421-1-h-shenoy@ti.com> <20251014094527.3916421-5-h-shenoy@ti.com> From: Tomi Valkeinen Content-Language: en-US Cc: Laurent.pinchart@ideasonboard.com, airlied@gmail.com, andrzej.hajda@intel.com, andy.yan@rock-chips.com, aradhya.bhatia@linux.dev, devarsht@ti.com, dianders@chromium.org, dri-devel@lists.freedesktop.org, javierm@redhat.com, jernej.skrabec@gmail.com, jonas@kwiboo.se, linux-kernel@vger.kernel.org, linux@treblig.org, luca.ceresoli@bootlin.com, lumag@kernel.org, lyude@redhat.com, maarten.lankhorst@linux.intel.com, mordan@ispras.ru, mripard@kernel.org, neil.armstrong@linaro.org, rfoss@kernel.org, s-jain1@ti.com, simona@ffwll.ch, tzimmermann@suse.de, u-kumar1@ti.com Autocrypt: addr=tomi.valkeinen@ideasonboard.com; keydata= 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 In-Reply-To: <20251014094527.3916421-5-h-shenoy@ti.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 14/10/2025 12:45, Harikrishna Shenoy wrote: > From: Jayesh Choudhary > > After adding DBANC framework, mhdp->connector is not initialised during > bridge_attach(). The connector is however required in few driver calls > like cdns_mhdp_hdcp_enable() and cdns_mhdp_modeset_retry_fn(). > Now that we have dropped the legacy code which became redundant > with introduction of DBNAC usecase in driver, we can cleanly switch > to drm_connector pointer instead of structure. > > Set it in bridge_enable() and clear it in bridge_disable(), > and make appropriate changes. > > This allows us to dynamically set the reference in bridge_enable() when > the connector becomes available and clear it in bridge_disable(). > This change is necessary to properly integrate with the DBANC framework > while maintaining all connector-dependent functionality in the driver. > > Reviewed-by: Dmitry Baryshkov > Signed-off-by: Jayesh Choudhary > Signed-off-by: Harikrishna Shenoy > --- > drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 12 ++++++------ > drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 3 +-- > drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 8 ++++---- > 3 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > index 31256ad69602..fe2da567ec66 100644 > --- 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); These kind of changes make sense: earlier we had connector and connector_ptr: struct drm_connector connector; struct drm_connector *connector_ptr; and for !DBANC, ptr pointed to the above connector struct, whereas for DBANC ptr pointed to the separate connector. Now we drop the above connector field, and rename connector_ptr. So that's fine. But... > 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); > } > > @@ -2156,7 +2156,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 a76775c76895..b297db53ba28 100644 > --- 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 42248f179b69..59f18c3281ef 100644 > --- 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.name, mhdp->connector.base.id); > + mhdp->connector->name, mhdp->connector->base.id); ... what's this? Here the code being removed still uses mhdp->connector. But that was essentially disabled in the previous patch. I would expect the only changes in this patch to be renaming connector_ptr -> connector, but this change and the ones below hint that there's an issue in the earlier patches. So if, before this patch, we ever ran DBANC and called this function, we'd be using mhdp->connector, which hasn't been initialized. The mdhp->connector should go away in the previous patch. This patch should only do the rename. However, I think the use of mhdp->connector with DBANC should be fixed already earlier. Sounds like patch 1 content, which already fixes similar issues? Tomi > > ret = cdns_mhdp_hdcp_set_config(mhdp, 0, false); > > @@ -445,7 +445,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.name, mhdp->connector.base.id); > + mhdp->connector->name, mhdp->connector->base.id); > > ret = _cdns_mhdp_hdcp_disable(mhdp); > if (ret) { > @@ -487,13 +487,13 @@ static void cdns_mhdp_hdcp_prop_work(struct work_struct *work) > struct cdns_mhdp_device *mhdp = container_of(hdcp, > struct cdns_mhdp_device, > hdcp); > - struct drm_device *dev = mhdp->connector.dev; > + struct drm_device *dev = mhdp->connector->dev; > struct drm_connector_state *state; > > 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.state; > + state = mhdp->connector->state; > state->content_protection = mhdp->hdcp.value; > } > mutex_unlock(&mhdp->hdcp.mutex);