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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E44FAC55ABA for ; Tue, 4 Aug 2026 08:17:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wZ3Yx1pvPBwGiqSi0fnx71r627+5/VtLrTsEj4ffKDA=; b=UWe2792BhH46uNg7oNQEinv63i 2GboXDsNsuheN8b9ydZnHluWKY+q1gA7En3BW6/dFhi+OHMVJDpv6/qYCTILi2lBwyq13W4qE/JWW C6e6GXsL3g9X6WuOdt1/7kh3Fa3+7FyFmi6HDsZSEz5Z41ziCc/Gffr5rXJYOljsaFX9yPbo1IHhU bBhG3h0Dgrqh05PGcw2cKHoY/nf9vVD9jWhcUO4VN+pgWa3xsGBctOka8PqJ+OOfirTUp4dj1BoxL vMzbAdaXAEGRwoWAxjDLRhAnMkiNWa7nT1JKERnEqaC5gcQ9qBDZQJxOm4er7fCIvmzmPaAva4TRb Jrebxigg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wrALE-00000001J1i-34Rj; Tue, 04 Aug 2026 08:17:40 +0000 Received: from mail-m103131191139.xmail.ntesmail.com ([103.131.191.139]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wrAL7-00000001IsY-0hs2; Tue, 04 Aug 2026 08:17:36 +0000 Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [61.154.14.86]) by smtp.qiye.163.com (Hmail) with ESMTP id 48b4ffee5; Tue, 4 Aug 2026 16:17:28 +0800 (GMT+08:00) From: Damon Ding To: Andrzej Hajda , Neil Armstrong , Robert Foss , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Heiko Stuebner , Andy Yan Cc: Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Dmitry Baryshkov , Marek Szyprowski , Sebastian Reichel , dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Damon Ding Subject: [PATCH v2 04/10] drm/bridge: analogix_dp: Extend clear_hotplug_interrupts to accept IRQ bitmask Date: Tue, 4 Aug 2026 16:17:11 +0800 Message-Id: <20260804081717.741404-5-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260804081717.741404-1-damon.ding@rock-chips.com> References: <20260804081717.741404-1-damon.ding@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Tid: 0a9fcbd9607703a8kunma7b8cbe762b09a X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWRgWCB1ZQUpXWS1ZQUlXWQ8JGhUIEh9ZQVlCSEhCVhhPHUtCSBpKThkfSlYVFA kWGhdVEwETFhoSFyQUDg9ZV1kYEgtZQVlNSlVKTk9VSk9VQ01ZV1kWGg8SFR0UWUFZT0tIVUpLSU 9PT0hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=QU7AhU643FcCKLOKXHEqJOzu5oal/dDH6dNQ+X1wvu8EnAuxNsO/BdUksmawjrUMcYV6fZKhvA1teQr6rK1wdWpoj0yUHELkS1CjPMy1TKZeU/pTIPIuOI1xzTQVe4JrNCiS4WyA8sGS0aF+UbHkuG4ESRYxToJ4pHjoxHEvxs8=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=wZ3Yx1pvPBwGiqSi0fnx71r627+5/VtLrTsEj4ffKDA=; h=date:mime-version:subject:message-id:from; X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260804_011733_493155_FDE8FBC5 X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Update analogix_dp_clear_hotplug_interrupts() to take an irq_type bitmask argument. Instead of clearing all hotplug interrupt bits unconditionally, only clear the interrupt flags corresponding to the triggered events. Pass the detected IRQ bitmask from the irq thread handler, and use the full HPD_IRQ mask during HPD initialization. This implements fine-grained pending interrupt clearing logic and removes limitations brought by unconditional register writes, supporting improved accuracy for HPD event handling. Signed-off-by: Damon Ding --- Changes in v2: - Add separate patch for IRQF_ONESHOT to resolve interrupt mask issues triggered by interrupt preemption.(Sashiko) --- .../drm/bridge/analogix/analogix_dp_core.c | 2 +- .../drm/bridge/analogix/analogix_dp_core.h | 2 +- .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 28 +++++++++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 4fe248e66515..603abd940a7c 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -720,7 +720,7 @@ static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) irq_type = analogix_dp_get_irq_type(dp); if (irq_type) - analogix_dp_clear_hotplug_interrupts(dp); + analogix_dp_clear_hotplug_interrupts(dp, irq_type); if (irq_type & DP_IRQ_TYPE_HP_CABLE_IN || irq_type & DP_IRQ_TYPE_HP_CABLE_OUT) { diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h index c2eba77f9a81..ecb86a6c1fc3 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -194,7 +194,7 @@ int analogix_dp_init_analog_func(struct analogix_dp_device *dp); void analogix_dp_init_hpd(struct analogix_dp_device *dp); void analogix_dp_force_hpd(struct analogix_dp_device *dp); u32 analogix_dp_get_irq_type(struct analogix_dp_device *dp); -void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp); +void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp, u32 irq_type); void analogix_dp_reset_aux(struct analogix_dp_device *dp); void analogix_dp_init_aux(struct analogix_dp_device *dp); int analogix_dp_get_plug_in_status(struct analogix_dp_device *dp); diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c index f4f859cb2936..024f342da461 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -24,6 +24,11 @@ #define COMMON_INT_MASK_4 (HOTPLUG_CHG | HPD_LOST | PLUG) #define INT_STA_MASK INT_HPD +#define HPD_IRQ (DP_IRQ_TYPE_HP_CABLE_IN | DP_IRQ_TYPE_HP_CABLE_OUT | \ + DP_IRQ_TYPE_HP_CHANGE | DP_IRQ_TYPE_IRQ_HPD) +#define COMMON_INT_4_HPD_IRQ (DP_IRQ_TYPE_HP_CABLE_IN | DP_IRQ_TYPE_HP_CABLE_OUT | \ + DP_IRQ_TYPE_HP_CHANGE) + void analogix_dp_enable_video_mute(struct analogix_dp_device *dp, bool enable) { u32 reg; @@ -376,18 +381,25 @@ int analogix_dp_init_analog_func(struct analogix_dp_device *dp) return 0; } -void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp) +void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp, u32 irq_type) { - u32 reg; + u32 reg = 0; - if (dp->hpd_gpiod) + if (dp->hpd_gpiod || !irq_type) return; - reg = HOTPLUG_CHG | HPD_LOST | PLUG; - writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); + if (irq_type & COMMON_INT_4_HPD_IRQ) { + if (irq_type & DP_IRQ_TYPE_HP_CABLE_IN) + reg |= PLUG; + if (irq_type & DP_IRQ_TYPE_HP_CABLE_OUT) + reg |= HPD_LOST; + if (irq_type & DP_IRQ_TYPE_HP_CHANGE) + reg |= HOTPLUG_CHG; + writel(reg, dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); + } - reg = INT_HPD; - writel(reg, dp->reg_base + ANALOGIX_DP_INT_STA); + if (irq_type & DP_IRQ_TYPE_IRQ_HPD) + writel(INT_HPD, dp->reg_base + ANALOGIX_DP_INT_STA); } void analogix_dp_init_hpd(struct analogix_dp_device *dp) @@ -397,7 +409,7 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp) if (dp->hpd_gpiod) return; - analogix_dp_clear_hotplug_interrupts(dp); + analogix_dp_clear_hotplug_interrupts(dp, HPD_IRQ); reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3); reg &= ~(F_HPD | HPD_CTRL); -- 2.34.1