Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
From:   Liu Ying <victor.liu@nxp.com>
To:     linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Cc:     linux-next@vger.kernel.org, sfr@canb.auug.org.au,
        gregkh@linuxfoundation.org, rafael@kernel.org,
        andrzej.hajda@intel.com, neil.armstrong@linaro.org,
        rfoss@kernel.org, Laurent.pinchart@ideasonboard.com,
        jonas@kwiboo.se, jernej.skrabec@gmail.com,
        maarten.lankhorst@linux.intel.com, mripard@kernel.org,
        tzimmermann@suse.de, airlied@gmail.com, daniel@ffwll.ch,
        angelogioacchino.delregno@collabora.com, ulf.hansson@linaro.org,
        linus.walleij@linaro.org
Subject: [PATCH v2 2/2] drm/bridge: panel: Check device dependency before managing device link
Date:   Mon, 27 Nov 2023 13:14:14 +0800
Message-Id: <20231127051414.3783108-3-victor.liu@nxp.com>
In-Reply-To: <20231127051414.3783108-1-victor.liu@nxp.com>
References: <20231127051414.3783108-1-victor.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HNu8tw0h9bZtckpOi9b3c99rlPv5TSZ23+P2k06qJ15pj+MiS5S/V1dLUbxF?=
 =?us-ascii?Q?o/bPEHgwXxQ/F4/V1HBDS7Nrme+6dsbsJlGJ7QO2683Txd+MYH2CHymvprKD?=
 =?us-ascii?Q?/kE99eTLjN+JfKweVS7hZE5h66ZcZhnRhOAag2D6QBUdslCo+6joRgdI0y+2?=
 =?us-ascii?Q?KsgkqAY/4JNDvXSxVyrUife6a6yVXg568Et/fqHfcGWfT4mR3wt6pbwqWAe8?=
 =?us-ascii?Q?uibNsNGTwQ+sWfhXBF+gI2pYZyJ/3sUMSlQl2MJDdLGENGpNgNd5nzq6HiUf?=
 =?us-ascii?Q?2RjRge6p8x6Eb5ECfpvrRcnvNgmUX05WaQpOPdd1coyPTz/ggzaJvHQ4DUcY?=
 =?us-ascii?Q?/PWhRreFJb5H7E6JBYVErvgYIO5dFZTM20JGuybxKFV9Sxp+7lRfyxlahCqY?=
 =?us-ascii?Q?oFsqoFnsY8MMTJe+zwad4GYClQ+nc3CCNUOBnGMGMPijuCAEn1R8JEGBbGIM?=
 =?us-ascii?Q?Q7PFjPhQ1PKY/riFb5VVj89F9f1f6xBhZszza+pa1rbbGKJIUKt8MOTyrL+f?=
 =?us-ascii?Q?ztOdEZcy1Kw0DqQco5gIFopRRMu1PRZD4kLF0iEoaH5Xb2Ul0O4rOkQ0WsXE?=
 =?us-ascii?Q?ANWKAhKaOS+aH/gWz6wnWNlKoxSefNKjk4vL8vezLohnBTzsrvjHoKhG8SAr?=
 =?us-ascii?Q?ZGDCXOea9EAyNzs5qg2QeUSnpPrNpNLrHIFJ/zPUC8zLVu0s9tNFVjuy67TR?=
 =?us-ascii?Q?zjDArFmYnm4VUAK9iVpVLLQ3SPzvRD89HoNpIrB8g1YfAYwgEJRj+QM/Jvws?=
 =?us-ascii?Q?9w5My7IgpfNaC8829V1qHJNWxnabb/VHRAqcku0g2xs2U4NRbCNKpIM2Gcgp?=
 =?us-ascii?Q?y8mTWePOvEXwP0uHunthM6Q63J4zGmTzDwSFqeQ06H2SEh8+s8jPmKH58Bcm?=
 =?us-ascii?Q?y2CXkJ7bpLuSeIpet7zUy2J1VHZ3ZEUvUcL5ro31nHj8cx9yRMcsPFBRJbJ1?=
 =?us-ascii?Q?9+hvhgiHkxK+NjLex25AtXI+2pWdX2gqdv3HdyNDOydaAyg0Y4O+OV7CYpug?=
 =?us-ascii?Q?mGyqj4p4DXFEXwnbues4ssC9RGY+3VkOLG8u6u/UDFigJonP2yI41SV/j1lF?=
 =?us-ascii?Q?3MEGZroOGXV4pOODBjGqDKBcVqvnm0iJiVfwQTOZ9hAl8zNFZA5m9ZbXHNgX?=
 =?us-ascii?Q?t6pPfJf6tIb1pBrwsai/o6d4VcR+Ev7JAyLhaY3KRW81zPet8ld11k/Hi1Jj?=
 =?us-ascii?Q?Q3QWoBCNVVMPJ3uXA4P0ainseSSbNAHWTdn8yqDHGfEtnFvctBOb3MdYOvql?=
 =?us-ascii?Q?Ll9ggTbd5NnPrGc8jC+Hr8ixXDSPZBi/wpayjyZxNle5A3XSnU6tM7U/XuBn?=
 =?us-ascii?Q?DZIiK4w4hM6sagKFrMXI2JdbjG9FDn48nf5HFO5KL3v2rbbk7wKietGRC+EW?=
 =?us-ascii?Q?dwU/AA1Isx8wjg8ME/RM2bbzb5Wa5wxVoEoUT5kPVFvvkAmxnvYHpZcKQUvc?=
 =?us-ascii?Q?uNqCWOkw2kBGAzymLBlud2oTDfJhubXg97bcC8oxIBcm3ELJ0ruAjARptFYs?=
 =?us-ascii?Q?eQD8v0KEYZXtRzlCIBLVmBwPDb15BFkWzXyfLW2pG0Q8A3x7d6LSQlZYXS7L?=
 =?us-ascii?Q?VgmW0UXEkZK5wvNYsL4+h18yVTr8WJT+EpmMIemS?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 130cf83e-8372-4e41-9fad-08dbef072298
X-MS-Exchange-CrossTenant-AuthSource: AM7PR04MB7046.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2023 05:10:12.9275
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: dHo0h4fqvwmozg5qC3vr04Tpjch7TvsbPlNh7A05b+cumK4bhM+Csg4kwYjfQHA5P/xCc4D7OQ8UCE7gdGA6Ow==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6961
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 26 Nov 2023 21:11:02 -0800 (PST)

Some panel devices already depend on DRM device, like the panel in
arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts, because DRM device is
the ancestor of those panel devices.  device_link_add() would fail by
returning a NULL pointer for those panel devices because of the existing
dependency.  So, check the dependency by calling device_is_dependent()
before adding or deleting device link between panel device and DRM device
so that the link is managed only for independent panel devices.

Fixes: 887878014534 ("drm/bridge: panel: Fix device link for DRM_BRIDGE_ATTACH_NO_CONNECTOR")
Fixes: 199cf07ebd2b ("drm/bridge: panel: Add a device link between drm device and panel device")
Reported-by: Linus Walleij <linus.walleij@linaro.org>
Closes: https://lore.kernel.org/lkml/CACRpkdaGzXD6HbiX7mVUNJAJtMEPG00Pp6+nJ1P0JrfJ-ArMvQ@mail.gmail.com/T/
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Liu Ying <victor.liu@nxp.com>
---
v2:
* No change.

 drivers/gpu/drm/bridge/panel.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index e48823a4f1ed..5e8980023407 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -23,6 +23,7 @@ struct panel_bridge {
 	struct drm_panel *panel;
 	struct device_link *link;
 	u32 connector_type;
+	bool is_independent;
 };
 
 static inline struct panel_bridge *
@@ -67,12 +68,17 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
 	struct drm_device *drm_dev = bridge->dev;
 	int ret;
 
-	panel_bridge->link = device_link_add(drm_dev->dev, panel->dev,
-					     DL_FLAG_STATELESS);
-	if (!panel_bridge->link) {
-		DRM_ERROR("Failed to add device link between %s and %s\n",
-			  dev_name(drm_dev->dev), dev_name(panel->dev));
-		return -EINVAL;
+	panel_bridge->is_independent = !device_is_dependent(drm_dev->dev,
+							    panel->dev);
+
+	if (panel_bridge->is_independent) {
+		panel_bridge->link = device_link_add(drm_dev->dev, panel->dev,
+						     DL_FLAG_STATELESS);
+		if (!panel_bridge->link) {
+			DRM_ERROR("Failed to add device link between %s and %s\n",
+				  dev_name(drm_dev->dev), dev_name(panel->dev));
+			return -EINVAL;
+		}
 	}
 
 	if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)
@@ -80,7 +86,8 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
 
 	if (!bridge->encoder) {
 		DRM_ERROR("Missing encoder\n");
-		device_link_del(panel_bridge->link);
+		if (panel_bridge->is_independent)
+			device_link_del(panel_bridge->link);
 		return -ENODEV;
 	}
 
@@ -92,7 +99,8 @@ static int panel_bridge_attach(struct drm_bridge *bridge,
 				 panel_bridge->connector_type);
 	if (ret) {
 		DRM_ERROR("Failed to initialize connector\n");
-		device_link_del(panel_bridge->link);
+		if (panel_bridge->is_independent)
+			device_link_del(panel_bridge->link);
 		return ret;
 	}
 
@@ -115,7 +123,8 @@ static void panel_bridge_detach(struct drm_bridge *bridge)
 	struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge);
 	struct drm_connector *connector = &panel_bridge->connector;
 
-	device_link_del(panel_bridge->link);
+	if (panel_bridge->is_independent)
+		device_link_del(panel_bridge->link);
 
 	/*
 	 * Cleanup the connector if we know it was initialized.
-- 
2.37.1