From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-m49229.qiye.163.com (mail-m49229.qiye.163.com [45.254.49.229]) (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 4A0A34AC170; Mon, 28 Sep 2026 11:44:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.254.49.229 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790595874; cv=none; b=WjuS7M4qMgNvIqb4Kf5r0dw7abY0ooQC9MbMa10QmUiTwhoZlYVK2fgD/jQiT2Z5q+n/+0OVxLzLCnfNS1hWod3ZZpdZoqG1m/7gXc3hcv1/jF2vDNoagI2d250/MHISDZnArKyBrEOCaxErdtwe4JxHXoz9NeccYd+PO1rb6M4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790595874; c=relaxed/simple; bh=Y0MsiQrYJDDSuydp8+WFnjB9TUx6dfjNvmhwJzV3kMQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TrAj/r1IkBWy1lt+RJaHpYT8099XsZjHe9GY26ksKGni8ZuI0kHIlSu+q6wIclPe+fyzkpdNIh7r8jV91hH2L4W3BmHjcK3nNRXPPxXqSAB4/CNHSGXo+23RG0ec27Cr5fWcHRJKhfbNuS7Ny5P2QwDX4FHGoJJstT950pzpOhM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com; spf=pass smtp.mailfrom=rock-chips.com; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b=e9rUnIUn; arc=none smtp.client-ip=45.254.49.229 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b="e9rUnIUn" Received: from zyb-HP-ProDesk-680-G2-MT.. (unknown [61.154.14.86]) by smtp.qiye.163.com (Hmail) with ESMTP id 4f5398e40; Mon, 28 Sep 2026 16:15:02 +0800 (GMT+08:00) From: Damon Ding To: Andrzej Hajda , Neil Armstrong , Robert Foss , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jingoo Han , Inki Dae , Seung-Woo Kim , Kyungmin Park , Krzysztof Kozlowski , Peter Griffin , Alim Akhtar , Heiko Stuebner Cc: Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Luca Ceresoli , Dmitry Baryshkov , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-rockchip@lists.infradead.org, Damon Ding Subject: [PATCH v3 01/14] drm/bridge: analogix_dp: Return bitmask from analogix_dp_get_irq_type() Date: Mon, 28 Sep 2026 16:14:05 +0800 Message-Id: <20260928081418.3605775-2-damon.ding@rock-chips.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260928081418.3605775-1-damon.ding@rock-chips.com> References: <20260928081418.3605775-1-damon.ding@rock-chips.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Tid: 0aa0e714eaeb03a8kunm323e2b5437cf01 X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWRgWCB1ZQUpXWS1ZQUlXWQ8JGhUIEh9ZQVkaSUlIVkJCT0pPHx1IHkJIS1YVFA kWGhdVEwETFhoSFyQUDg9ZV1kYEgtZQVlNSlVKTk9VSk9VQ01ZV1kWGg8SFR0UWUFZT0tIVUpLSU JDQ0xVSktLVUtZBg++ DKIM-Signature: a=rsa-sha256; b=e9rUnIUnggVntlM+VCCn3Pgkdao9uZAva/eyhDYkS+mpJG9kvFVs+UQiHBHj9uanrY95E6qMpW1TWQN2yXUCRx3lCupYRaGdilL+QImZUX58j6Nf8p1gib6hDpwyGY27P3ZS378dJuT2MjFTMCcmDRplArlaJ9yRXcHWo+75Yjw=; s=default; c=relaxed/relaxed; d=rock-chips.com; v=1; bh=fTbtcGZ0NiXRdk++xUkHW9KoNxxGSWE+RUMF8C782Oc=; h=date:mime-version:subject:message-id:from; Analogix DP controllers support two sets of interrupts for hotplug detection: HOTPLUG_CHG, and the pair PLUG / HPD_LOST. The current driver logic relies on PLUG/HPD_LOST and does not consume HOTPLUG_CHG, nor does it check for INT_HPD for IRQ_HPD events. The existing analogix_dp_get_irq_type() returns on the first matched interrupt flag. This causes the hardirq handler to unconditionally mute all HPD interrupts, including HOTPLUG_CHG and INT_HPD, creating a limitation for future extensions. To prepare fine-grained interrupt handling, convert the return type from enum dp_irq_type to a u32 bitmask. Accumulate all pending interrupt flags instead of returning early, and add detection for DP_IRQ_TYPE_IRQ_HPD. Remove DP_IRQ_TYPE_UNKNOWN sentinel; use zero to indicate no pending interrupts, which simplifies code and facilitates future extension for additional interrupt types. Signed-off-by: Damon Ding --- .../gpu/drm/bridge/analogix/analogix_dp_core.c | 8 ++++---- .../gpu/drm/bridge/analogix/analogix_dp_core.h | 4 ++-- .../gpu/drm/bridge/analogix/analogix_dp_reg.c | 18 ++++++++++-------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 6df6963740d2..079f2f01f33b 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -701,10 +701,10 @@ static irqreturn_t analogix_dp_hardirq(int irq, void *arg) { struct analogix_dp_device *dp = arg; irqreturn_t ret = IRQ_NONE; - enum dp_irq_type irq_type; + u32 irq_type; irq_type = analogix_dp_get_irq_type(dp); - if (irq_type != DP_IRQ_TYPE_UNKNOWN) { + if (irq_type) { analogix_dp_mute_hpd_interrupt(dp); ret = IRQ_WAKE_THREAD; } @@ -715,7 +715,7 @@ static irqreturn_t analogix_dp_hardirq(int irq, void *arg) static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) { struct analogix_dp_device *dp = arg; - enum dp_irq_type irq_type; + u32 irq_type; irq_type = analogix_dp_get_irq_type(dp); if (irq_type & DP_IRQ_TYPE_HP_CABLE_IN || @@ -725,7 +725,7 @@ static irqreturn_t analogix_dp_irq_thread(int irq, void *arg) drm_helper_hpd_irq_event(dp->drm_dev); } - if (irq_type != DP_IRQ_TYPE_UNKNOWN) { + if (irq_type) { analogix_dp_clear_hotplug_interrupts(dp); analogix_dp_unmute_hpd_interrupt(dp); } diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h index 4560597604ad..3f40d95757c5 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h @@ -120,7 +120,7 @@ enum dp_irq_type { DP_IRQ_TYPE_HP_CABLE_IN = BIT(0), DP_IRQ_TYPE_HP_CABLE_OUT = BIT(1), DP_IRQ_TYPE_HP_CHANGE = BIT(2), - DP_IRQ_TYPE_UNKNOWN = BIT(3), + DP_IRQ_TYPE_IRQ_HPD = BIT(3), }; struct video_info { @@ -195,7 +195,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, 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); -enum dp_irq_type analogix_dp_get_irq_type(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_reset_aux(struct analogix_dp_device *dp); void analogix_dp_init_aux(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 c1344a3f013a..49c1961e4326 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c @@ -412,8 +412,9 @@ void analogix_dp_force_hpd(struct analogix_dp_device *dp) writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3); } -enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp) +u32 analogix_dp_get_irq_type(struct analogix_dp_device *dp) { + u32 irq_type = 0; u32 reg; if (dp->hpd_gpiod) { @@ -425,17 +426,18 @@ enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp) } else { /* Parse hotplug interrupt status register */ reg = readl(dp->reg_base + ANALOGIX_DP_COMMON_INT_STA_4); - if (reg & PLUG) - return DP_IRQ_TYPE_HP_CABLE_IN; - + irq_type |= DP_IRQ_TYPE_HP_CABLE_IN; if (reg & HPD_LOST) - return DP_IRQ_TYPE_HP_CABLE_OUT; - + irq_type |= DP_IRQ_TYPE_HP_CABLE_OUT; if (reg & HOTPLUG_CHG) - return DP_IRQ_TYPE_HP_CHANGE; + irq_type |= DP_IRQ_TYPE_HP_CHANGE; + + reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); + if (reg & INT_HPD) + irq_type |= DP_IRQ_TYPE_IRQ_HPD; - return DP_IRQ_TYPE_UNKNOWN; + return irq_type; } } -- 2.34.1