From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA7C3C61DD3 for ; Thu, 3 Sep 2026 08:12:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1AF2810F462; Thu, 3 Sep 2026 08:12:33 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="Pd/1AiCb"; dkim-atps=neutral Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6F77810F462 for ; Thu, 3 Sep 2026 08:12:31 +0000 (UTC) Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 453931A1992; Thu, 3 Sep 2026 08:12:30 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 17EFC602B8; Thu, 3 Sep 2026 08:12:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 04D0811C79F4D; Thu, 3 Sep 2026 10:12:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1788423148; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=zRTS0SSS3PHuFBTy5A8RPzvsmc1PDq5h/+sxpBismTA=; b=Pd/1AiCb+JlNUxWnMbSZE9y+kz1ZibsJ7rzeukdpdq0G+fmit/pXA8HhDtW7idje1a5mFq hEbnt+/SMau1XorL++t2sR0RSBHaZnbL89bI9xR0wGXXHHwTB9S8zcgeFcNnNw6L6yR3EK MRWAjVEOMK5utxzKDD7UA3R3io6I/J682UtM7w0mGO6EdIOVPAzQ6ucNJ3yJlGt4+XVicb wq/5ZMbcc8bDJQA3suuI+AMRJ1Yk68R6UY+V11mVG+WPXVgUues6kTkONsZi1T4hv5/7zs Imb0Knsx3qn9w+fj135F9L74kqb2OKXdeGsonvz/wkb2zGrSTsmvbDUFtXtx9w== From: Luca Ceresoli Date: Thu, 03 Sep 2026 10:11:13 +0200 Subject: [PATCH RFC v2 10/19] drm/mcde: dsi: don't create a panel_bridge MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260903-drm-bridge-every-panel-v2-10-2ab8ee24538e@bootlin.com> References: <20260903-drm-bridge-every-panel-v2-0-2ab8ee24538e@bootlin.com> In-Reply-To: <20260903-drm-bridge-every-panel-v2-0-2ab8ee24538e@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Jessica Zhang , Linus Walleij , Inki Dae , Jagan Teki , Marek Szyprowski Cc: Albert Esteve , Anusha Srivatsa , Dmitry Baryshkov , Hui Pu , Ian Ray , Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.16.0 X-Last-TLS-Session-Version: TLSv1.3 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now a panel_bridge is automatically created for every drm_panel, so this code (similar to an open-coded variant of drm_of_find_panel_or_bridge()) would lead to creating a second bridge for the same panel. Update and simplify the code by just getting a reference to the already-existing bridge. Also keep the "connected to non-panel bridge (unsupported)\n" error logic by using the drm_bridge_is_panel() function. Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/mcde/Kconfig | 1 - drivers/gpu/drm/mcde/mcde_dsi.c | 41 +++++++++-------------------------------- 2 files changed, 9 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/drm/mcde/Kconfig b/drivers/gpu/drm/mcde/Kconfig index 6ebfb930cbfa..81e7d3796c06 100644 --- a/drivers/gpu/drm/mcde/Kconfig +++ b/drivers/gpu/drm/mcde/Kconfig @@ -10,7 +10,6 @@ config DRM_MCDE select DRM_MIPI_DSI select DRM_BRIDGE select DRM_PANEL - select DRM_PANEL_BRIDGE select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER help diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index 747886dfa17a..c36885f5f275 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c @@ -36,7 +36,6 @@ struct mcde_dsi { struct device *dev; struct mcde *mcde; struct drm_bridge bridge; - struct drm_panel *panel; struct mipi_dsi_host dsi_host; struct mipi_dsi_device *mdsi; const struct drm_display_mode *mode; @@ -1073,7 +1072,6 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, struct drm_device *drm = data; struct mcde *mcde = to_mcde(drm); struct mcde_dsi *d = dev_get_drvdata(dev); - struct drm_panel *panel = NULL; struct drm_bridge *bridge __free(drm_bridge_put) = NULL; if (!of_get_available_child_count(dev->of_node)) { @@ -1101,40 +1099,21 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, /* Look for a panel as a child to this node */ for_each_available_child_of_node_scoped(dev->of_node, child) { - panel = of_drm_find_panel(child); - if (IS_ERR(panel)) { - dev_err(dev, "failed to find panel try bridge (%ld)\n", - PTR_ERR(panel)); - panel = NULL; - - bridge = of_drm_find_and_get_bridge(child); - if (!bridge) { - dev_err(dev, "failed to find bridge\n"); - return -EINVAL; - } + bridge = of_drm_find_and_get_bridge(child); + if (!bridge) { + dev_err(dev, "failed to find bridge\n"); + return -EINVAL; } - if (panel || bridge) - break; + break; } - if (panel) { - bridge = drm_panel_bridge_add_typed(panel, - DRM_MODE_CONNECTOR_DSI); - drm_panel_put(panel); - if (IS_ERR(bridge)) { - dev_err(dev, "error adding panel bridge\n"); - return PTR_ERR(bridge); - } - drm_bridge_get(bridge); - dev_info(dev, "connected to panel\n"); - d->panel = panel; - } else if (bridge) { + if (!bridge) { + dev_err(dev, "no bridge\n"); + return -ENODEV; + } else if (!drm_bridge_is_panel(bridge)) { /* TODO: AV8100 HDMI encoder goes here for example */ dev_info(dev, "connected to non-panel bridge (unsupported)\n"); return -ENODEV; - } else { - dev_err(dev, "no panel or bridge\n"); - return -ENODEV; } d->bridge.next_bridge = drm_bridge_get(bridge); @@ -1156,8 +1135,6 @@ static void mcde_dsi_unbind(struct device *dev, struct device *master, { struct mcde_dsi *d = dev_get_drvdata(dev); - if (d->panel) - drm_panel_bridge_remove(d->bridge.next_bridge); regmap_update_bits(d->prcmu, PRCM_DSI_SW_RESET, PRCM_DSI_SW_RESET_DSI0_SW_RESETN, 0); } -- 2.55.0