From nobody Sun Feb 8 14:07:23 2026 Received: from ironport.ite.com.tw (60-251-196-230.hinet-ip.hinet.net [60.251.196.230]) (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 E2C65211C for ; Mon, 4 Mar 2024 03:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=60.251.196.230 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709521786; cv=none; b=YFB9GZYwLQGxzwtS0zx2Wt0X+HxffE/OxZnXewXKjS8RcM8pWzB+LnOn1FYhsxa+8YB7/Evl/kK8JBjaUAexC58tTYQxWwa4LNODU7MWwlszXgR6SNZLpRc9ORrgr1HPUafTsPjYgJZKUbeLWqTIuOmxWXKD7sYOfjxg/CIXDyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709521786; c=relaxed/simple; bh=+uebR4UVRCidfrSG2g4L1A2cP17hscIePZLmM4rYqMo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oaLPrZKDJ7/dU0rJ5Yn7b+LRbBoTIR6h7z5bX4OkSe8yVasW3cFQnfZyBM9Z43OJqx1vvz4UXn31oU851iWy5qArKA1p2l4ho0Barhg26XdkYRxWZ7RSSfDDtPDmgmdq06OoE5EB6abUDcFbjcA02ZmYOPnkFmsjtK7hca9b1DM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ite.com.tw; spf=pass smtp.mailfrom=ite.com.tw; dkim=pass (2048-bit key) header.d=ite.com.tw header.i=@ite.com.tw header.b=nS0543c5; arc=none smtp.client-ip=60.251.196.230 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ite.com.tw Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ite.com.tw Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ite.com.tw header.i=@ite.com.tw header.b="nS0543c5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ite.com.tw; s=dkim; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hseO+L+Af1dH00xH6zIMorO/c7gROuvZj1lTdWgi5NE=; b=nS0543c5wHZAD0Rm+J+sfE+2xaNNj2UOcezTz0xZYPu7w5/BRzqLaTT8 yGxeVQbcnFxUAU78XwXPiQRUK9X1b+5fB7Rwlf68WuS/b3RLhT/CXglXE aEvkGpfGmldtSshXmfRQq4luAN+t/lqW/g6lxfbMyXQN2Bi/nt2WIK/Zz GSS08wA2F5SuG+PEbJM++LRI6t9ez8fc/YI9yIV8tB7zqw4yVF9wshsB8 us5rYn6dUSmZdNdOl5JGM4srSs5KF7ynnAWgYz19PUKmkTPOLLhbjeRJ5 5/K8Q72/2d53FkZ0icZEOqdBD3UHFA+TKXoeeFmh2e2BI15jJ1jRkm/K7 A==; Received: from unknown (HELO mse.ite.com.tw) ([192.168.35.30]) by ironport.ite.com.tw with ESMTP; 04 Mar 2024 11:08:35 +0800 Received: from CSBMAIL1.internal.ite.com.tw (CSBMAIL1.internal.ite.com.tw [192.168.65.58]) by mse.ite.com.tw with ESMTP id 42438Ung022597; Mon, 4 Mar 2024 11:08:30 +0800 (GMT-8) (envelope-from kuro.chung@ite.com.tw) Received: from ite-XPS-13-9360.internal.ite.com.tw (192.168.72.42) by CSBMAIL1.internal.ite.com.tw (192.168.65.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 4 Mar 2024 11:08:30 +0800 From: kuro To: CC: Allen Chen , Pin-yen Lin , Kuro Chung , Kenneth Haung , Allen Chen , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , "open list:DRM DRIVERS" , open list Subject: [PATCH v2 1/1] UPSTREAM: drm/bridge: it6505: fix hibernate to resume no display issue Date: Mon, 4 Mar 2024 11:19:44 +0800 Message-ID: <20240304031945.250763-2-kuro.chung@ite.com.tw> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240304031945.250763-1-kuro.chung@ite.com.tw> References: <20240304031945.250763-1-kuro.chung@ite.com.tw> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: CSBMAIL1.internal.ite.com.tw (192.168.65.58) To CSBMAIL1.internal.ite.com.tw (192.168.65.58) X-TM-SNTS-SMTP: DEF683D84CA243BD742B6F8DB7F8C7D6B72F9DB62C2C36C95AEFC5AF1FA04CD52002:8 X-MAIL: mse.ite.com.tw 42438Ung022597 Content-Type: text/plain; charset="utf-8" From: kuro chung ITE added a FIFO reset bit for input video. When system power resume, the TTL input of it6505 may get some noise before video signal stable and the hardware function reset is required. But the input FIFO reset will also trigger error interrupts of output modul= e rising. Thus, it6505 have to wait a period can clear those expected error interrupts caused by manual hardware reset in one interrupt handler calling to avoid i= nterrupt looping. Signed-off-by: Allen Chen (cherry picked from commit Iaa3cd9da92a625496f579d87d0ab74ca9c4937c4) BUG=3DNone TEST=3DNone Change-Id: Iaa3cd9da92a625496f579d87d0ab74ca9c4937c4 --- drivers/gpu/drm/bridge/ite-it6505.c | 54 ++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/i= te-it6505.c index b53da9bb65a16..e592e14a48578 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -1318,6 +1318,8 @@ static void it6505_video_reset(struct it6505 *it6505) it6505_set_bits(it6505, REG_DATA_MUTE_CTRL, EN_VID_MUTE, EN_VID_MUTE); it6505_set_bits(it6505, REG_INFOFRAME_CTRL, EN_VID_CTRL_PKT, 0x00); it6505_set_bits(it6505, REG_RESET_CTRL, VIDEO_RESET, VIDEO_RESET); + it6505_set_bits(it6505, REG_VID_BUS_CTRL1, TX_FIFO_RESET, 0x02); + it6505_set_bits(it6505, REG_VID_BUS_CTRL1, TX_FIFO_RESET, 0x00); it6505_set_bits(it6505, REG_501_FIFO_CTRL, RST_501_FIFO, RST_501_FIFO); it6505_set_bits(it6505, REG_501_FIFO_CTRL, RST_501_FIFO, 0x00); it6505_set_bits(it6505, REG_RESET_CTRL, VIDEO_RESET, 0x00); @@ -2480,10 +2482,6 @@ static void it6505_irq_video_fifo_error(struct it650= 5 *it6505) struct device *dev =3D &it6505->client->dev; =20 DRM_DEV_DEBUG_DRIVER(dev, "video fifo overflow interrupt"); - it6505->auto_train_retry =3D AUTO_TRAIN_RETRY; - flush_work(&it6505->link_works); - it6505_stop_hdcp(it6505); - it6505_video_reset(it6505); } =20 static void it6505_irq_io_latch_fifo_overflow(struct it6505 *it6505) @@ -2491,10 +2489,6 @@ static void it6505_irq_io_latch_fifo_overflow(struct= it6505 *it6505) struct device *dev =3D &it6505->client->dev; =20 DRM_DEV_DEBUG_DRIVER(dev, "IO latch fifo overflow interrupt"); - it6505->auto_train_retry =3D AUTO_TRAIN_RETRY; - flush_work(&it6505->link_works); - it6505_stop_hdcp(it6505); - it6505_video_reset(it6505); } =20 static bool it6505_test_bit(unsigned int bit, const unsigned int *addr) @@ -2502,6 +2496,46 @@ static bool it6505_test_bit(unsigned int bit, const = unsigned int *addr) return 1 & (addr[bit / BITS_PER_BYTE] >> (bit % BITS_PER_BYTE)); } =20 +static bool it6505_is_video_error_int(const int *int_status) +{ + if ((it6505_test_bit(BIT_INT_VID_FIFO_ERROR, (unsigned int *)int_status))= || (it6505_test_bit(BIT_INT_IO_FIFO_OVERFLOW, (unsigned int *)int_status))) + return 1; + return 0; +} + +static void it6505_irq_video_error_handler(struct it6505 *it6505) +{ + struct device *dev =3D &it6505->client->dev; + int int_status[3] =3D {0}; + int reg_0d; + int i; + + it6505->auto_train_retry =3D AUTO_TRAIN_RETRY; + flush_work(&it6505->link_works); + it6505_stop_hdcp(it6505); + it6505_video_reset(it6505); + + DRM_DEV_DEBUG_DRIVER(dev, "Video Error reset wait video..."); + + for (i =3D 0; i < 10; i++) { + usleep_range(10000, 11000); + int_status[2] =3D it6505_read(it6505, INT_STATUS_03); + reg_0d =3D it6505_read(it6505, REG_SYSTEM_STS); + it6505_write(it6505, INT_STATUS_03, int_status[2]); + + DRM_DEV_DEBUG_DRIVER(dev, "reg08 =3D 0x%02x", int_status[2]); + DRM_DEV_DEBUG_DRIVER(dev, "reg0D =3D 0x%02x", reg_0d); + + if ((reg_0d & VIDEO_STB) && (reg_0d >=3D 0)) + break; + + if (it6505_is_video_error_int(int_status)) { + it6505_video_reset(it6505); + DRM_DEV_DEBUG_DRIVER(dev, "Video Error reset wait video (%d)", i); + } + } +} + static irqreturn_t it6505_int_threaded_handler(int unused, void *data) { struct it6505 *it6505 =3D data; @@ -2522,7 +2556,7 @@ static irqreturn_t it6505_int_threaded_handler(int un= used, void *data) { BIT_INT_VID_FIFO_ERROR, it6505_irq_video_fifo_error }, { BIT_INT_IO_FIFO_OVERFLOW, it6505_irq_io_latch_fifo_overflow }, }; - int int_status[3], i; + int int_status[3], i, reg_0d; =20 if (it6505->enable_drv_hold || !it6505->powered) return IRQ_HANDLED; @@ -2550,6 +2584,8 @@ static irqreturn_t it6505_int_threaded_handler(int un= used, void *data) if (it6505_test_bit(irq_vec[i].bit, (unsigned int *)int_status)) irq_vec[i].handler(it6505); } + if (it6505_is_video_error_int(int_status)) + it6505_irq_video_error_handler(it6505); } =20 pm_runtime_put_sync(dev); --=20 2.25.1