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 A811330AADC for ; Fri, 21 Nov 2025 13:21:42 +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=1763731304; cv=none; b=lSI9o3ik8crzNIY7+XxR79ShraWEglqcvUcI0C+CrarHby0cGwnUjSFB5rLjBCVCVIRiSAILFvjwUT4WVh7b4jchomiPp/nUERPFpdmus5ZEb/8gkM3G+q5PLvhuuuYEkAbg5H67k6TFx8hnaFO4Tx3WoBKpDp4jpzfVuK4A8p4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763731304; c=relaxed/simple; bh=VJ8QN0zYbVSWnmXqJ/F+7cc1NaP1yvl11T/mwpoiqTo=; h=Message-ID:Date:MIME-Version:Subject:To:References:From:Cc: In-Reply-To:Content-Type; b=UhZdxUdpd85qEEwguLhvO9pjXYLBQkY2bKc2YAPMtbaH47MsI2Z6diwwxX0DYG3wCcxaeQVK5yvBT2/IF5HphxEz40jfjwkXWjHw/O6I2UeIoTjfDTICIgfkQZFAad81d8hFX4Oo7DlPIHDe/G8/ymE3YqYDG/2qO5I7WdzBSEU= 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=aFgkgOE4; 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="aFgkgOE4" 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 6FCA666B; Fri, 21 Nov 2025 14:19:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1763731172; bh=VJ8QN0zYbVSWnmXqJ/F+7cc1NaP1yvl11T/mwpoiqTo=; h=Date:Subject:To:References:From:Cc:In-Reply-To:From; b=aFgkgOE4oLFspa5IhoFxeN6TgRUfAk3dRRwoNmo80cKqVh3o/7vShf6Pl4Rzf+eHT aShj2VzbJ8dmMYJGpFHz3zo35+b/oUecj9umtgq+ympy72wVy5bMb7jS1LbrBmFVFp 0PSACttqvy9r+gXcwiD9v0xF+UTwYBrBhakaSZYo= Message-ID: Date: Fri, 21 Nov 2025 15:21:34 +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 RESEND v9 4/6] drm/bridge: cadence: cdns-mhdp8546-core: Remove legacy support for connector initialisation in bridge To: Harikrishna Shenoy References: <20251120121416.660781-1-h-shenoy@ti.com> <20251120121416.660781-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: <20251120121416.660781-5-h-shenoy@ti.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 20/11/2025 14:14, Harikrishna Shenoy wrote: > From: Jayesh Choudhary > > Now that we have DRM_BRIDGE_ATTACH_NO_CONNECTOR framework, remove the I think you could rather say something like "now that this bridge supports DRM_BRIDGE_ATTACH_NO_CONNECTOR, and tidss, the only user of this bridge, always sets DRM_BRIDGE_ATTACH_NO_CONNECTOR, we can remove the legacy code for the non-DRM_BRIDGE_ATTACH_NO_CONNECTOR case" > connector initialisation code as that piece of code is not called > if DRM_BRIDGE_ATTACH_NO_CONNECTOR flag is used. > Only TI K3 platforms consume this driver and tidss (their display > controller) has this flag set. So this legacy support can be dropped. > > Reviewed-by: Dmitry Baryshkov > Signed-off-by: Jayesh Choudhary > Signed-off-by: Harikrishna Shenoy > --- > .../drm/bridge/cadence/cdns-mhdp8546-core.c | 188 +----------------- > 1 file changed, 10 insertions(+), 178 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > index d944095da4722..816d5d87b45fe 100644 > --- a/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > +++ b/drivers/gpu/drm/bridge/cadence/cdns-mhdp8546-core.c > @@ -739,12 +739,8 @@ static void cdns_mhdp_fw_cb(const struct firmware *fw, void *context) > spin_lock(&mhdp->start_lock); > bridge_attached = mhdp->bridge_attached; > spin_unlock(&mhdp->start_lock); > - if (bridge_attached) { > - if (mhdp->connector_ptr && mhdp->connector_ptr->dev) > - drm_kms_helper_hotplug_event(mhdp->bridge.dev); > - else > - drm_bridge_hpd_notify(&mhdp->bridge, cdns_mhdp_detect(mhdp)); > - } > + if (bridge_attached) > + drm_bridge_hpd_notify(&mhdp->bridge, cdns_mhdp_detect(mhdp)); > } > > static int cdns_mhdp_load_firmware(struct cdns_mhdp_device *mhdp) > @@ -1444,56 +1440,6 @@ static const struct drm_edid *cdns_mhdp_edid_read(struct cdns_mhdp_device *mhdp, > return drm_edid_read_custom(connector, cdns_mhdp_get_edid_block, mhdp); > } > > -static int cdns_mhdp_get_modes(struct drm_connector *connector) > -{ > - struct cdns_mhdp_device *mhdp = connector_to_mhdp(connector); > - const struct drm_edid *drm_edid; > - int num_modes; > - > - if (!mhdp->plugged) > - return 0; > - > - drm_edid = cdns_mhdp_edid_read(mhdp, connector); > - > - drm_edid_connector_update(connector, drm_edid); > - > - if (!drm_edid) { > - dev_err(mhdp->dev, "Failed to read EDID\n"); > - return 0; > - } > - > - num_modes = drm_edid_connector_add_modes(connector); > - drm_edid_free(drm_edid); > - > - /* > - * HACK: Warn about unsupported display formats until we deal > - * with them correctly. > - */ > - if (connector->display_info.color_formats && > - !(connector->display_info.color_formats & > - mhdp->display_fmt.color_format)) > - dev_warn(mhdp->dev, > - "%s: No supported color_format found (0x%08x)\n", > - __func__, connector->display_info.color_formats); > - > - if (connector->display_info.bpc && > - connector->display_info.bpc < mhdp->display_fmt.bpc) > - dev_warn(mhdp->dev, "%s: Display bpc only %d < %d\n", > - __func__, connector->display_info.bpc, > - mhdp->display_fmt.bpc); > - > - return num_modes; > -} > - > -static int cdns_mhdp_connector_detect(struct drm_connector *conn, > - struct drm_modeset_acquire_ctx *ctx, > - bool force) > -{ > - struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn); > - > - return cdns_mhdp_detect(mhdp); > -} > - > static u32 cdns_mhdp_get_bpp(struct cdns_mhdp_display_fmt *fmt) > { > u32 bpp; > @@ -1547,115 +1493,6 @@ bool cdns_mhdp_bandwidth_ok(struct cdns_mhdp_device *mhdp, > return true; > } > > -static > -enum drm_mode_status cdns_mhdp_mode_valid(struct drm_connector *conn, > - const struct drm_display_mode *mode) > -{ > - struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn); > - > - mutex_lock(&mhdp->link_mutex); > - > - if (!cdns_mhdp_bandwidth_ok(mhdp, mode, mhdp->link.num_lanes, > - mhdp->link.rate)) { > - mutex_unlock(&mhdp->link_mutex); > - return MODE_CLOCK_HIGH; > - } > - > - mutex_unlock(&mhdp->link_mutex); > - return MODE_OK; > -} > - > -static int cdns_mhdp_connector_atomic_check(struct drm_connector *conn, > - struct drm_atomic_state *state) > -{ > - struct cdns_mhdp_device *mhdp = connector_to_mhdp(conn); > - struct drm_connector_state *old_state, *new_state; > - struct drm_crtc_state *crtc_state; > - u64 old_cp, new_cp; > - > - if (!mhdp->hdcp_supported) > - return 0; > - > - old_state = drm_atomic_get_old_connector_state(state, conn); > - new_state = drm_atomic_get_new_connector_state(state, conn); > - old_cp = old_state->content_protection; > - new_cp = new_state->content_protection; > - > - if (old_state->hdcp_content_type != new_state->hdcp_content_type && > - new_cp != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { > - new_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; > - goto mode_changed; > - } > - > - if (!new_state->crtc) { > - if (old_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED) > - new_state->content_protection = DRM_MODE_CONTENT_PROTECTION_DESIRED; > - return 0; > - } > - > - if (old_cp == new_cp || > - (old_cp == DRM_MODE_CONTENT_PROTECTION_DESIRED && > - new_cp == DRM_MODE_CONTENT_PROTECTION_ENABLED)) > - return 0; > - > -mode_changed: > - crtc_state = drm_atomic_get_new_crtc_state(state, new_state->crtc); > - crtc_state->mode_changed = true; > - > - return 0; > -} > - > -static const struct drm_connector_helper_funcs cdns_mhdp_conn_helper_funcs = { > - .detect_ctx = cdns_mhdp_connector_detect, > - .get_modes = cdns_mhdp_get_modes, > - .mode_valid = cdns_mhdp_mode_valid, > - .atomic_check = cdns_mhdp_connector_atomic_check, > -}; > - > -static const struct drm_connector_funcs cdns_mhdp_conn_funcs = { > - .fill_modes = drm_helper_probe_single_connector_modes, > - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > - .reset = drm_atomic_helper_connector_reset, > - .destroy = drm_connector_cleanup, > -}; > - > -static int cdns_mhdp_connector_init(struct cdns_mhdp_device *mhdp) > -{ > - u32 bus_format = MEDIA_BUS_FMT_RGB121212_1X36; > - struct drm_connector *conn = &mhdp->connector; > - struct drm_bridge *bridge = &mhdp->bridge; > - int ret; > - > - conn->polled = DRM_CONNECTOR_POLL_HPD; > - > - ret = drm_connector_init(bridge->dev, conn, &cdns_mhdp_conn_funcs, > - DRM_MODE_CONNECTOR_DisplayPort); > - if (ret) { > - dev_err(mhdp->dev, "Failed to initialize connector with drm\n"); > - return ret; > - } > - > - mhdp->connector_ptr = conn; > - drm_connector_helper_add(conn, &cdns_mhdp_conn_helper_funcs); > - > - ret = drm_display_info_set_bus_formats(&conn->display_info, > - &bus_format, 1); > - if (ret) > - return ret; > - > - ret = drm_connector_attach_encoder(conn, bridge->encoder); > - if (ret) { > - dev_err(mhdp->dev, "Failed to attach connector to encoder\n"); > - return ret; > - } > - > - if (mhdp->hdcp_supported) > - ret = drm_connector_attach_content_protection_property(conn, true); > - > - return ret; > -} > - > static int cdns_mhdp_attach(struct drm_bridge *bridge, > struct drm_encoder *encoder, > enum drm_bridge_attach_flags flags) > @@ -1672,9 +1509,11 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge, > return ret; > > if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) { > - ret = cdns_mhdp_connector_init(mhdp); > - if (ret) > - goto aux_unregister; > + ret = -EINVAL; > + dev_err(mhdp->dev, > + "Connector initialisation not supported in bridge_attach %d\n", > + ret); > + goto aux_unregister; > } > > spin_lock(&mhdp->start_lock); > @@ -2414,17 +2253,10 @@ static void cdns_mhdp_hpd_work(struct work_struct *work) > struct cdns_mhdp_device *mhdp = container_of(work, > struct cdns_mhdp_device, > hpd_work); > - int ret; > > - ret = cdns_mhdp_update_link_status(mhdp); > - if (mhdp->connector_ptr && mhdp->connector_ptr->dev) { > - if (ret < 0) > - schedule_work(&mhdp->modeset_retry_work); > - else > - drm_kms_helper_hotplug_event(mhdp->bridge.dev); > - } else { > - drm_bridge_hpd_notify(&mhdp->bridge, cdns_mhdp_detect(mhdp)); > - } > + cdns_mhdp_update_link_status(mhdp); > + > + drm_bridge_hpd_notify(&mhdp->bridge, cdns_mhdp_detect(mhdp)); This looks odd. The removed code looks odd too, so maybe the issue is in patch 1 (I replied to that patch again). But assuming the old code is right, the new code is still different than the old: Previously cdns_mhdp_update_link_status()'s ret value is used, and background work is started on error (when we have connector_ptr). Now the ret value is ignored, no bg work. Afaics, we can get the hpd_work call with or without connector_ptr, as we can get HPD when the bridge is enabled or disabled. So in the removed code both branches can be taken. But the new code only has one of the branches. And I still don't understand what exactly it's doing. Tomi