From patchwork Thu Mar  3 16:36:49 2022
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jagan Teki <jagan@amarulasolutions.com>
X-Patchwork-Id: 1855
Return-Path: 
 <linux-amarula+bncBD7MFH7A7EEBBUO5QOIQMGQEPUNE2FY@amarulasolutions.com>
X-Original-To: linux-amarula@patchwork.amarulasolutions.com
Delivered-To: linux-amarula@patchwork.amarulasolutions.com
Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com
	[209.85.214.199])
	by ganimede.amarulasolutions.com (Postfix) with ESMTPS id E3C7A3F236
	for <linux-amarula@patchwork.amarulasolutions.com>;
	Thu,  3 Mar 2022 17:37:38 +0100 (CET)
Received: by mail-pl1-f199.google.com with SMTP id
	d4-20020a170902f14400b001518350e5c7sf3186259plb.13
	for <linux-amarula@patchwork.amarulasolutions.com>;
	Thu, 03 Mar 2022 08:37:38 -0800 (PST)
ARC-Seal: i=2; a=rsa-sha256; t=1646325457; cv=pass;
	d=google.com; s=arc-20160816;
	b=sRu24LNCLmgmPuS1XMSVT0RHG7vJ/nZe5jGjRDmkawGDBXN3ORsAs5U91qPmNclYBr
	lt/GlkMBNmX4NeQN03BXyMwbqucgh/AMvOKm75d3df+xsgZ62JOLv4tROAfObUvhZOWq
	uCp5YbjdTAo14mBoXfboSGBRcro7hbvA+gS5MnRYZW+Gn4hjEYUB73G6qxIhXp+AH6F2
	H6lSJi80BFqmdclvaISTUlPa4D6sIvnSip0+K1pII6oLTfDNA06607wlZiI30zBojKA9
	QE5Zwo+lVmi4hOgwJ0KKM2fGJQ+13JQaUWpnlsHxhJYlWEaIkJSS5dqQzxdayTuvhN5W
	AqUw==
ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
	s=arc-20160816;
	h=list-unsubscribe:list-archive:list-help:list-post:list-id
	:mailing-list:precedence:mime-version:references:in-reply-to
	:message-id:date:subject:cc:to:from:dkim-signature;
	bh=nyeCj5KHl397Eda2H1VRMjkcJ2cXCmB6yxH9NgEZQjA=;
	b=LA1T1+TRezfDVZafHAGY/VHyv5V9rkA9DqK4FI34kiraHK656mU17GjtVO/zqwjgQH
	fXJ2KtdC/JAQyBjjj1umQEjkG/KdwAiP9uS7zK0vwGafgUCjkcX9ba8Xbv43n6CnL5Zb
	gYMq8irxPxytOmbckng0Bdbo6R3iZhsNKZ6H+0KWV8wWzbIxX0eTnyoGfi9rZ//EUtrD
	TnXt+CsPPCL8H+FWFPs/j5p9SeBF7UiExpxzoBMkpxpxL9yYkTkDbu1EqIrDB/o3EQU3
	uLa6qbLSJPPDFcpK4TCKOFOCfr8vNcHwgjdyBo9tK3dnKI+gzYseZKNRdNl8A7zbH3mt
	Wu8A==
ARC-Authentication-Results: i=2; mx.google.com;
	dkim=pass header.i=@amarulasolutions.com header.s=google
	header.b=J2A6xeb0;
	spf=pass (google.com: domain of jagan@amarulasolutions.com designates
	209.85.220.41 as permitted sender)
	smtp.mailfrom=jagan@amarulasolutions.com
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=amarulasolutions.com; s=google;
	h=from:to:cc:subject:date:message-id:in-reply-to:references
	:mime-version:x-original-sender:x-original-authentication-results
	:precedence:mailing-list:list-id:list-post:list-help:list-archive
	:list-unsubscribe;
	bh=nyeCj5KHl397Eda2H1VRMjkcJ2cXCmB6yxH9NgEZQjA=;
	b=M4kH+QD64CbPsZRXU8LN+ttNgmtQRaC+3aaHGu7EdHMGK9rMsrLYseK8Rv7qzgHCdy
	tHG5T9laWoD8vMWVcw1unfdNAqiuZM+mvsnOYuNNz8J9ewnjeyaMRmtLR34s3JvkPfTq
	KvrAUrc0rqAdZZOdw0y68yxUc1NNEfHUmEqoc=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=1e100.net; s=20210112;
	h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
	:references:mime-version:x-original-sender
	:x-original-authentication-results:precedence:mailing-list:list-id
	:x-spam-checked-in-group:list-post:list-help:list-archive
	:list-unsubscribe;
	bh=nyeCj5KHl397Eda2H1VRMjkcJ2cXCmB6yxH9NgEZQjA=;
	b=6GKsjDFt6+j0ZoEXvDAPL+CRAzXZmdC3CwkuPE24h+BheWvS1xNp86vRX3fxsXCy7+
	KIRXigLi1aFWqvNs6HzluX2YOLTMqTpsUdF76gmFtqTm1zrKlzoX4L50kszpc9FDx7rs
	ENgOuVn31d2wWPW6GKRipU7jolUCdgJ0Jpmm5PGcUdd1MViFLYWpX2s0XbbI1bi9YBNm
	edDfeZjL1Lgh+8eJFTqhotwzRC3/ckQe2XMX2Wk07E3UE3ldj3BrZf2K1NwUHWwxs5TE
	RRxxH4ZgWv3FAg1M3L8U22GGaRkXBZm8tDlAhbZgkuQAB8XLV1E7Cup4WunwrSeLlpIp
	IqiA==
X-Gm-Message-State: AOAM532J1VdemezqFyLbSHwU1XfJeJAZzOp1QTDONGsWAWfAOpVOb+iL
	/yuG7DfS4o9p33vmeCUE6ihrG/Ta
X-Google-Smtp-Source: 
 ABdhPJwOYWP6laAau4mYuZGDeA2GLTQRsmEGg80CYljCruTKh3DGlG4ggxE7C4CE+aeP24qXAM/q/Q==
X-Received: by 2002:a17:90a:a78f:b0:1bc:8042:9330 with SMTP id
	f15-20020a17090aa78f00b001bc80429330mr6074515pjq.229.1646325457710;
	Thu, 03 Mar 2022 08:37:37 -0800 (PST)
X-BeenThere: linux-amarula@amarulasolutions.com
Received: by 2002:a17:902:e546:b0:151:3f2d:8b25 with SMTP id
	n6-20020a170902e54600b001513f2d8b25ls2513108plf.1.gmail;
	Thu, 03 Mar 2022 08:37:37 -0800 (PST)
X-Received: by 2002:a17:90b:314:b0:1be:dc22:62f2 with SMTP id
	ay20-20020a17090b031400b001bedc2262f2mr6210159pjb.102.1646325456870;
	Thu, 03 Mar 2022 08:37:36 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1646325456; cv=none;
	d=google.com; s=arc-20160816;
	b=C9vHHvgL+wbRKw/In1TOrYWEm1f2i99jSsJpveO3OU9GFLG0vJil48zR8iy2gul192
	QZw0soSplCLq+sQSFVTB1raJ8dmcHzG5WSKpsZJyrS4pG7e2lgp2l2PRt7F8g/90/lQs
	nonv5TaQeSBtxkCyO7ayxyOIV2/b56MsNYHecZlx5/fZaYdETQhlU5IaN26cRgXafZIi
	yi2YHNjWVv/CRLDETNiS2g9A5/M+dwzURgp2YADz+9TnEI3Ecq1J4ADp3ak4nlH0CfcY
	PfUfwnyko96yPUB9LHx0EfXhu4H5VHshzHvC11HWNtvxy0XBYUPnKcO9FhrgWSfSJtbI
	nN5A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
	s=arc-20160816;
	h=content-transfer-encoding:mime-version:references:in-reply-to
	:message-id:date:subject:cc:to:from:dkim-signature;
	bh=Dias74Svt+6TABOfyKPB5h5wnbwc964CIcS14g2KvKI=;
	b=F/NcO52R1SIdLkq3zyx0ORWnFRhKLU2onDLbxLAehvTUZK9ZgkNa3GW1BS1xG9qwVD
	Q6Rv3ODU+Knu4fN96SYVxG/4bdXStAjEe1Ozs9dGy54KdEg9hNkSrzJEaVRjyh1998P5
	vCkWGOoU5tm2Z2Hp8HEwpDtJyOGtYemHFAyxl3tmeMSkhQtUcFM4jLio5ZoySoo2SKbL
	+UYOUAjOn46cBhx4ngkIxMCVOVKp9qxNq++cpebsflkFl+izcSJudY8ZhVOqM8zjhlbA
	pYa7vL8BeZzjl3jQkXb4GEGLPudVuO5rgBSUKRl+4uaCYUd2jMQryvB8eGdZxM3cgVNN
	TC7Q==
ARC-Authentication-Results: i=1; mx.google.com;
	dkim=pass header.i=@amarulasolutions.com header.s=google
	header.b=J2A6xeb0;
	spf=pass (google.com: domain of jagan@amarulasolutions.com designates
	209.85.220.41 as permitted sender)
	smtp.mailfrom=jagan@amarulasolutions.com
Received: from mail-sor-f41.google.com (mail-sor-f41.google.com.
	[209.85.220.41]) by mx.google.com with SMTPS id
	d128-20020a621d86000000b004f3bc62a6absor10566893pfd.90.2022.03.03.08.37.36
	for <linux-amarula@amarulasolutions.com>
	(Google Transport Security); Thu, 03 Mar 2022 08:37:36 -0800 (PST)
Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com
	designates 209.85.220.41 as permitted sender)
	client-ip=209.85.220.41;
X-Received: by 2002:aa7:9253:0:b0:4e1:53d4:c2c6 with SMTP id
	19-20020aa79253000000b004e153d4c2c6mr39231339pfp.62.1646325456504;
	Thu, 03 Mar 2022 08:37:36 -0800 (PST)
Received: from localhost.localdomain
	([2405:201:c00a:a0a9:4526:5253:a010:63f4])
	by smtp.gmail.com with ESMTPSA id
	j20-20020a056a00235400b004e192221ec2sm3220983pfj.14.2022.03.03.08.37.21
	(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
	Thu, 03 Mar 2022 08:37:36 -0800 (PST)
From: Jagan Teki <jagan@amarulasolutions.com>
To: Marek Szyprowski <m.szyprowski@samsung.com>,
	Andrzej Hajda <andrzej.hajda@intel.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	Robert Foss <robert.foss@linaro.org>,
	Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
	Sam Ravnborg <sam@ravnborg.org>,
	Michael Nazzareno Trimarchi <michael@amarulasolutions.com>,
	Inki Dae <inki.dae@samsung.com>
Cc: dri-devel@lists.freedesktop.org, linux-amarula@amarulasolutions.com,
	Jagan Teki <jagan@amarulasolutions.com>
Subject: [PATCH v6 1/6] drm: bridge: tc358764: Use drm panel_bridge API
Date: Thu,  3 Mar 2022 22:06:49 +0530
Message-Id: <20220303163654.3381470-2-jagan@amarulasolutions.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220303163654.3381470-1-jagan@amarulasolutions.com>
References: <20220303163654.3381470-1-jagan@amarulasolutions.com>
MIME-Version: 1.0
X-Original-Sender: jagan@amarulasolutions.com
X-Original-Authentication-Results: mx.google.com;       dkim=pass
	header.i=@amarulasolutions.com header.s=google header.b=J2A6xeb0;
	spf=pass (google.com: domain of jagan@amarulasolutions.com designates
	209.85.220.41 as permitted sender)
	smtp.mailfrom=jagan@amarulasolutions.com
Content-Type: text/plain; charset="UTF-8"
Precedence: list
Mailing-list: list linux-amarula@amarulasolutions.com;
	contact linux-amarula+owners@amarulasolutions.com
List-ID: <linux-amarula.amarulasolutions.com>
X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com
X-Google-Group-Id: 476853432473
List-Post: 
 <https://groups.google.com/a/amarulasolutions.com/group/linux-amarula/post>,
	<mailto:linux-amarula@amarulasolutions.com>
List-Help: 
 <https://support.google.com/a/amarulasolutions.com/bin/topic.py?topic=25838>,
	<mailto:linux-amarula+help@amarulasolutions.com>
List-Archive: 
 <https://groups.google.com/a/amarulasolutions.com/group/linux-amarula/>
List-Unsubscribe: 
 <mailto:googlegroups-manage+476853432473+unsubscribe@googlegroups.com>,
	<https://groups.google.com/a/amarulasolutions.com/group/linux-amarula/subscribe>

Replace the manual panel handling code by a drm panel_bridge via
devm_drm_of_get_bridge().

Adding panel_bridge handling,

- Drops drm_connector and related operations as drm_bridge_attach
  creates connector during attachment.

- Drops panel pointer and panel healpers.

This simplifies the driver and allows all components in the display
pipeline to be treated as bridges.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
Changes for v6:
- none
Changes for v2:
- s/panel_bridge/next_bridge
- drop unneeded headers

 drivers/gpu/drm/bridge/tc358764.c | 104 ++----------------------------
 1 file changed, 6 insertions(+), 98 deletions(-)

diff --git a/drivers/gpu/drm/bridge/tc358764.c b/drivers/gpu/drm/bridge/tc358764.c
index c1e35bdf9232..dca41ed32f8a 100644
--- a/drivers/gpu/drm/bridge/tc358764.c
+++ b/drivers/gpu/drm/bridge/tc358764.c
@@ -16,14 +16,9 @@
 #include <video/mipi_display.h>
 
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_bridge.h>
-#include <drm/drm_crtc.h>
-#include <drm/drm_fb_helper.h>
 #include <drm/drm_mipi_dsi.h>
 #include <drm/drm_of.h>
-#include <drm/drm_panel.h>
 #include <drm/drm_print.h>
-#include <drm/drm_probe_helper.h>
 
 #define FLD_MASK(start, end)    (((1 << ((start) - (end) + 1)) - 1) << (end))
 #define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
@@ -153,10 +148,9 @@ static const char * const tc358764_supplies[] = {
 struct tc358764 {
 	struct device *dev;
 	struct drm_bridge bridge;
-	struct drm_connector connector;
+	struct drm_bridge *next_bridge;
 	struct regulator_bulk_data supplies[ARRAY_SIZE(tc358764_supplies)];
 	struct gpio_desc *gpio_reset;
-	struct drm_panel *panel;
 	int error;
 };
 
@@ -210,12 +204,6 @@ static inline struct tc358764 *bridge_to_tc358764(struct drm_bridge *bridge)
 	return container_of(bridge, struct tc358764, bridge);
 }
 
-static inline
-struct tc358764 *connector_to_tc358764(struct drm_connector *connector)
-{
-	return container_of(connector, struct tc358764, connector);
-}
-
 static int tc358764_init(struct tc358764 *ctx)
 {
 	u32 v = 0;
@@ -278,43 +266,11 @@ static void tc358764_reset(struct tc358764 *ctx)
 	usleep_range(1000, 2000);
 }
 
-static int tc358764_get_modes(struct drm_connector *connector)
-{
-	struct tc358764 *ctx = connector_to_tc358764(connector);
-
-	return drm_panel_get_modes(ctx->panel, connector);
-}
-
-static const
-struct drm_connector_helper_funcs tc358764_connector_helper_funcs = {
-	.get_modes = tc358764_get_modes,
-};
-
-static const struct drm_connector_funcs tc358764_connector_funcs = {
-	.fill_modes = drm_helper_probe_single_connector_modes,
-	.destroy = drm_connector_cleanup,
-	.reset = drm_atomic_helper_connector_reset,
-	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
-	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
-};
-
-static void tc358764_disable(struct drm_bridge *bridge)
-{
-	struct tc358764 *ctx = bridge_to_tc358764(bridge);
-	int ret = drm_panel_disable(bridge_to_tc358764(bridge)->panel);
-
-	if (ret < 0)
-		dev_err(ctx->dev, "error disabling panel (%d)\n", ret);
-}
-
 static void tc358764_post_disable(struct drm_bridge *bridge)
 {
 	struct tc358764 *ctx = bridge_to_tc358764(bridge);
 	int ret;
 
-	ret = drm_panel_unprepare(ctx->panel);
-	if (ret < 0)
-		dev_err(ctx->dev, "error unpreparing panel (%d)\n", ret);
 	tc358764_reset(ctx);
 	usleep_range(10000, 15000);
 	ret = regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
@@ -335,72 +291,25 @@ static void tc358764_pre_enable(struct drm_bridge *bridge)
 	ret = tc358764_init(ctx);
 	if (ret < 0)
 		dev_err(ctx->dev, "error initializing bridge (%d)\n", ret);
-	ret = drm_panel_prepare(ctx->panel);
-	if (ret < 0)
-		dev_err(ctx->dev, "error preparing panel (%d)\n", ret);
-}
-
-static void tc358764_enable(struct drm_bridge *bridge)
-{
-	struct tc358764 *ctx = bridge_to_tc358764(bridge);
-	int ret = drm_panel_enable(ctx->panel);
-
-	if (ret < 0)
-		dev_err(ctx->dev, "error enabling panel (%d)\n", ret);
 }
 
 static int tc358764_attach(struct drm_bridge *bridge,
 			   enum drm_bridge_attach_flags flags)
-{
-	struct tc358764 *ctx = bridge_to_tc358764(bridge);
-	struct drm_device *drm = bridge->dev;
-	int ret;
-
-	if (flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR) {
-		DRM_ERROR("Fix bridge driver to make connector optional!");
-		return -EINVAL;
-	}
-
-	ctx->connector.polled = DRM_CONNECTOR_POLL_HPD;
-	ret = drm_connector_init(drm, &ctx->connector,
-				 &tc358764_connector_funcs,
-				 DRM_MODE_CONNECTOR_LVDS);
-	if (ret) {
-		DRM_ERROR("Failed to initialize connector\n");
-		return ret;
-	}
-
-	drm_connector_helper_add(&ctx->connector,
-				 &tc358764_connector_helper_funcs);
-	drm_connector_attach_encoder(&ctx->connector, bridge->encoder);
-	ctx->connector.funcs->reset(&ctx->connector);
-	drm_connector_register(&ctx->connector);
-
-	return 0;
-}
-
-static void tc358764_detach(struct drm_bridge *bridge)
 {
 	struct tc358764 *ctx = bridge_to_tc358764(bridge);
 
-	drm_connector_unregister(&ctx->connector);
-	ctx->panel = NULL;
-	drm_connector_put(&ctx->connector);
+	return drm_bridge_attach(bridge->encoder, ctx->next_bridge, bridge, flags);
 }
 
 static const struct drm_bridge_funcs tc358764_bridge_funcs = {
-	.disable = tc358764_disable,
 	.post_disable = tc358764_post_disable,
-	.enable = tc358764_enable,
 	.pre_enable = tc358764_pre_enable,
 	.attach = tc358764_attach,
-	.detach = tc358764_detach,
 };
 
 static int tc358764_parse_dt(struct tc358764 *ctx)
 {
 	struct device *dev = ctx->dev;
-	int ret;
 
 	ctx->gpio_reset = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
 	if (IS_ERR(ctx->gpio_reset)) {
@@ -408,12 +317,11 @@ static int tc358764_parse_dt(struct tc358764 *ctx)
 		return PTR_ERR(ctx->gpio_reset);
 	}
 
-	ret = drm_of_find_panel_or_bridge(ctx->dev->of_node, 1, 0, &ctx->panel,
-					  NULL);
-	if (ret && ret != -EPROBE_DEFER)
-		dev_err(dev, "cannot find panel (%d)\n", ret);
+	ctx->next_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	if (IS_ERR(ctx->next_bridge))
+		return PTR_ERR(ctx->next_bridge);
 
-	return ret;
+	return 0;
 }
 
 static int tc358764_configure_regulators(struct tc358764 *ctx)