Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
From:   Xin Ji <xji@analogixsemi.com>
To:     Andrzej Hajda <andrzej.hajda@intel.com>,
        Neil Armstrong <neil.armstrong@linaro.org>,
        Robert Foss <rfoss@kernel.org>,
        Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
        Jonas Karlman <jonas@kwiboo.se>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Maxime Ripard <mripard@kernel.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>
Cc:     bliang@analogixsemi.com, qwen@analogixsemi.com,
        hsinyi@chromium.org, Xin Ji <xji@analogixsemi.com>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] drm/bridge: anx7625: Fix Set HPD irq detect window to 2ms
Date:   Mon, 20 Nov 2023 17:10:37 +0800
Message-Id: <20231120091038.284825-2-xji@analogixsemi.com>
In-Reply-To: <20231120091038.284825-1-xji@analogixsemi.com>
References: <20231120091038.284825-1-xji@analogixsemi.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?2Qd0eIJhEPalSrrxBe/7YivOTQ/oHy7pBnaFX/reUYZIbDBx9dHexeNhqaOd?=
 =?us-ascii?Q?WcFVjN2/EmHt+kpUE54LRZfIuciizjX8HUPcUjPZG0ST6Gc5TZ4xFn7CNi4k?=
 =?us-ascii?Q?WesQ1xRR3+EGLQ6B0nCAcBiAjl6+AL32ZB0CtIR/Kz8+P66Q2suYS3Z2e7iu?=
 =?us-ascii?Q?3k+31yB0yBB8Ze75xH53mIGZH0KwddFMXVl1wHfJFhDwqtobVsiJ7FlteKXY?=
 =?us-ascii?Q?7Ys1kVEnWLtNJlw+PxpZhl3wxc5++/DIsUo1GaXpTQM3zsUT3PblsrdHLzCE?=
 =?us-ascii?Q?Dj9l92ABosLdVdn2YnbRGvJIh/M+lm/6A3GWPOKpuxeQJPKCa4BIfv+9/eyp?=
 =?us-ascii?Q?gt3HGgGvcaq9bdynlq6IRGKdaBWpoJn0X5UOFtwOGPIIJp+Rq5nmag1gew/f?=
 =?us-ascii?Q?y+r07W0NkDm9VAG7EdBnq9RBzbRshpFqyf7sRnwJjtA6T+c5+eShBR+WfIps?=
 =?us-ascii?Q?a3hHiJYquqpYp3qIo9rA3/q5AnGxhnUPv/TAlqpHbvNIMpUAuzPcSxadyCEP?=
 =?us-ascii?Q?9XeOmbIW8yMlMtuD8tJGqRsoWyAdUPy6f5h3PKYAZR4v0KueR1nOpOGVG2TY?=
 =?us-ascii?Q?5HE69aa3khVJLl9j7nnpNwlph5Q+Zcr74XL5/PGkZMPHUdceN99ci64fRpUJ?=
 =?us-ascii?Q?/XWQAd4u1TyL9BnQXuOpy3EWiXvWdCUNtQfLsWYWlrD/6Asx26H3SlGf0uYg?=
 =?us-ascii?Q?cdMC1eBukbUKuVSklQDpsZVVDQMKVOFzn4m0gm6TU92Yrgw/0o+Gmyko9Qra?=
 =?us-ascii?Q?ySaa0aA9s5CONAfbaFZ4Fev3eCm7x3Pwj6KsEYY8OJnJeBx1y/6OF4E5/CfN?=
 =?us-ascii?Q?KuIUZt4YRf//qhpyZ7AC+4cLz6v2GL66JiiidVrgLlvN/tuqLhbIecOnZsoM?=
 =?us-ascii?Q?m/9UQMFkyvwv+OzyqfaClePF8m4JIkAROvPlBH68QsTOvsIocvhdOFnLu0ku?=
 =?us-ascii?Q?DIOsNBmDmI3NfwfifRPUNA73Fnf5XxIwmx10BB0hbptLr3s6jdMLyyj04jqV?=
 =?us-ascii?Q?KxjHobPS4kGf9ukLsgPpdwLwYiq1hOveuFtwxNaZVyw82euFAzlAnG4zxyqr?=
 =?us-ascii?Q?uT5lVHbeZRKXtvAMIJDnywV5gErROiIdKNXzI/MRNvTL44h+QslGzSirXGl/?=
 =?us-ascii?Q?VxlsOn86x6UNiRKyFS70HcvXyk7oqQK6FMq/CxZVutQrHKKGw/X/ev676CrX?=
 =?us-ascii?Q?j5IfU8leBQcfKFFVN6LsMDKgQckMmsWnykR41id0sXG4/q3Ak+RUpz+Ev3kr?=
 =?us-ascii?Q?vtGhOHZV0tn+6OioNqF7i2FfVWHnxpb/O4KdkrjLCIVTUXYMhVAmORpedQyG?=
 =?us-ascii?Q?+VH4OA4SETlfbEepnSJXnfahFYKplWRE3T3JZ/YJN5V6YJQiGRrsbHtg6+R+?=
 =?us-ascii?Q?syAvF4MN8DURmLZgXWfTVucw9ReBTiiPJpLD8YUoAVvADTv2tjoFGVRAqzTk?=
 =?us-ascii?Q?bDXSn+CTpcYUcGswdS1R96w3a7xJuWYrqx1tcbvtbWVTyueIBwPiZ51qWlWR?=
 =?us-ascii?Q?T4MI/cqQWSYv2lxYy+Qn52TlY7V1q7M6Q8OMmHUIZCntMiIRFNK+QXcXlArP?=
 =?us-ascii?Q?sZ1w+LJO2HbsQXalGE6iUyAXk9PQWufxwXj7++WK?=
X-OriginatorOrg: analogixsemi.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 30934ae5-1d54-4b86-ab8c-08dbe9a8b156
X-MS-Exchange-CrossTenant-AuthSource: BY5PR04MB6739.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2023 09:11:34.3899
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b099b0b4-f26c-4cf5-9a0f-d5be9acab205
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +h0Eu7ERrlsoytwHHvmeq6Bllqsxex5dLp51/7xJUG4t8FykQ9o2o1oBJPj0w8R131w8uEgY5TmeNqG7klRz+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR04MB6706
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 20 Nov 2023 01:12:54 -0800 (PST)

Polling firmware HPD GPIO status, set HPD irq detect window to 2ms
after firmware HPD GPIO initial done

Signed-off-by: Xin Ji <xji@analogixsemi.com>
---
 drivers/gpu/drm/bridge/analogix/anx7625.c | 51 ++++++++++++++++-------
 drivers/gpu/drm/bridge/analogix/anx7625.h |  4 ++
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c
index 51abe42c639e..ef31033439bc 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.c
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.c
@@ -1298,10 +1298,32 @@ static void anx7625_config(struct anx7625_data *ctx)
 			  XTAL_FRQ_SEL, XTAL_FRQ_27M);
 }
 
+static int anx7625_hpd_timer_config(struct anx7625_data *ctx)
+{
+	int ret;
+
+	/* Set irq detect window to 2ms */
+	ret = anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
+				HPD_DET_TIMER_BIT0_7, HPD_TIME & 0xFF);
+	ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
+				 HPD_DET_TIMER_BIT8_15,
+				 (HPD_TIME >> 8) & 0xFF);
+	ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
+				 HPD_DET_TIMER_BIT16_23,
+				 (HPD_TIME >> 16) & 0xFF);
+
+	return ret;
+}
+
+static int anx7625_read_hpd_gpio_config_status(struct anx7625_data *ctx)
+{
+	return anx7625_reg_read(ctx, ctx->i2c.rx_p0_client, GPIO_CTRL_2);
+}
+
 static void anx7625_disable_pd_protocol(struct anx7625_data *ctx)
 {
 	struct device *dev = ctx->dev;
-	int ret;
+	int ret, val;
 
 	/* Reset main ocm */
 	ret = anx7625_reg_write(ctx, ctx->i2c.rx_p0_client, 0x88, 0x40);
@@ -1315,6 +1337,19 @@ static void anx7625_disable_pd_protocol(struct anx7625_data *ctx)
 		DRM_DEV_DEBUG_DRIVER(dev, "disable PD feature fail.\n");
 	else
 		DRM_DEV_DEBUG_DRIVER(dev, "disable PD feature succeeded.\n");
+
+	/*
+	 * Make sure the HPD GPIO already be configured after OCM release before
+	 * setting HPD detect window register. Here we poll the status register
+	 * at maximum 40ms, then config HPD irq detect window register
+	 */
+	readx_poll_timeout(anx7625_read_hpd_gpio_config_status,
+			   ctx, val,
+			   ((val & HPD_SOURCE) || (val < 0)),
+			   2000, 2000 * 20);
+
+	/* Set HPD irq detect window to 2ms */
+	anx7625_hpd_timer_config(ctx);
 }
 
 static int anx7625_ocm_loading_check(struct anx7625_data *ctx)
@@ -1437,20 +1472,6 @@ static void anx7625_start_dp_work(struct anx7625_data *ctx)
 
 static int anx7625_read_hpd_status_p0(struct anx7625_data *ctx)
 {
-	int ret;
-
-	/* Set irq detect window to 2ms */
-	ret = anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
-				HPD_DET_TIMER_BIT0_7, HPD_TIME & 0xFF);
-	ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
-				 HPD_DET_TIMER_BIT8_15,
-				 (HPD_TIME >> 8) & 0xFF);
-	ret |= anx7625_reg_write(ctx, ctx->i2c.tx_p2_client,
-				 HPD_DET_TIMER_BIT16_23,
-				 (HPD_TIME >> 16) & 0xFF);
-	if (ret < 0)
-		return ret;
-
 	return anx7625_reg_read(ctx, ctx->i2c.rx_p0_client, SYSTEM_STSTUS);
 }
 
diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h
index 5af819611ebc..66ebee7f3d83 100644
--- a/drivers/gpu/drm/bridge/analogix/anx7625.h
+++ b/drivers/gpu/drm/bridge/analogix/anx7625.h
@@ -259,6 +259,10 @@
 #define AP_MIPI_RX_EN BIT(5) /* 1: MIPI RX input in  0: no RX in */
 #define AP_DISABLE_PD BIT(6)
 #define AP_DISABLE_DISPLAY BIT(7)
+
+#define GPIO_CTRL_2   0x49
+#define HPD_SOURCE    BIT(6)
+
 /***************************************************************/
 /* Register definition of device address 0x84 */
 #define  MIPI_PHY_CONTROL_3            0x03
-- 
2.25.1