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 1A56CC282EC for ; Thu, 6 Mar 2025 09:50:26 +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: Content-Type:In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date: Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wr919OThgHAg3pz7M8e1PRT/9TVdrDLDBFidu7Nnq5k=; b=dgzY8XGWCovMgwkgw9yxrXsu0W 52JkLmeYILEHHrWwqUDHd2fj3r6qxcEolODOfh5wgf8MQsRNmKtxCYIKx+opS33e/zEO5EoU2Sq7w nauu440qlRfxAsuBsGCY4aghUoxIjiMgFLtI64+lDr7W4Z7EKT2w+Gj1vYS00frBm21YAZfii+MJ7 W7aNBvm/qEavTe2M3tRu+fzhwNhwC5P8nKXA0XZVxhj/eInrWf6RHFQwjyz/M8glCcCQ3ZgmQy15U Hs6bcgpd+xyKQSA5CJdyThkHZY5OWgkdQxQoPyEffx9lbS6q3qUG9eaSStwq1XxYjJuw+UIZlyzY7 j40CSH3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tq7rr-0000000AY30-1XX4; Thu, 06 Mar 2025 09:50:15 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tq7pW-0000000AX3q-3TgA; Thu, 06 Mar 2025 09:47:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1741254469; bh=eirDffSZXQnuWFuuk3LO+GhR4ye9aHsev/7ZgRDFsZE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=KjwCjN2BJjbtWfG9AsHIp0aneWHpiAVyB05RKDW866qB9fy0lUTbpdMIZawilrQVa lIykk/y3I1JQbrvpDP8+p1lJC9Lqvx6hApqU/ARpDNPT6JWrA1Jilb37YUArx7w16o jhYGi5LlUZa5Dis19/YUcGWvdoNW9sHa2PowipRhkq0NtnBGXR7OcYy5d13OktL0nq Lm+HvvyzWbGAHvzBNiQLSHcT+hDjl7U2Pk2nL+uw0Y/dxiqoDJf8z788RXWdv3aRwH oivqfb7tJnYw7a1AKyZEHiblWWXaCbnBIFAmMCFsdh7OHbIWJaZ0YANcTX1B4r3QrN gk861/ltW+1qA== Received: from [192.168.1.100] (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by bali.collaboradmins.com (Postfix) with ESMTPSA id D6FD317E088C; Thu, 6 Mar 2025 10:47:47 +0100 (CET) Message-ID: Date: Thu, 6 Mar 2025 10:47:47 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 7/8] drm/mediatek: Add programming flow for unsupported subsys ID hardware To: Jason-JH Lin , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jassi Brar , Chun-Kuang Hu , Mauro Carvalho Chehab Cc: Matthias Brugger , Nancy Lin , Singo Chang , Moudy Ho , Xavier Chang , Xiandong Wang , Sirius Wang , Fei Shao , Pin-yen Lin , Project_Global_Chrome_Upstream_Group@mediatek.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, CK Hu References: <20250218054405.2017918-1-jason-jh.lin@mediatek.com> <20250218054405.2017918-8-jason-jh.lin@mediatek.com> From: AngeloGioacchino Del Regno Content-Language: en-US In-Reply-To: <20250218054405.2017918-8-jason-jh.lin@mediatek.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250306_014751_061032_489C3539 X-CRM114-Status: GOOD ( 20.43 ) 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 Il 18/02/25 06:41, Jason-JH Lin ha scritto: > To support hardware without subsys IDs on new SoCs, add a programming > flow that checks whether the subsys ID is valid. If the subsys ID is > invalid, the flow will call 2 alternative CMDQ APIs: > cmdq_pkt_assign() and cmdq_pkt_write_s_value() to achieve the same > functionality. > > Signed-off-by: Jason-JH Lin > Reviewed-by: CK Hu > --- > drivers/gpu/drm/mediatek/mtk_ddp_comp.c | 33 ++++++++++++++++++++----- > 1 file changed, 27 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > index edc6417639e6..219d67735a54 100644 > --- a/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_ddp_comp.c > @@ -66,14 +66,37 @@ struct mtk_ddp_comp_dev { > struct cmdq_client_reg cmdq_reg; > }; > > +#if IS_REACHABLE(CONFIG_MTK_CMDQ) > +static void mtk_ddp_write_cmdq_pkt(struct cmdq_pkt *cmdq_pkt, struct cmdq_client_reg *cmdq_reg, > + unsigned int offset, unsigned int value, unsigned int mask) > +{ > + offset += cmdq_reg->offset; > + > + if (cmdq_reg->subsys != CMDQ_SUBSYS_INVALID) { > + if (mask == GENMASK(31, 0)) > + cmdq_pkt_write(cmdq_pkt, cmdq_reg->subsys, offset, value); > + else > + cmdq_pkt_write_mask(cmdq_pkt, cmdq_reg->subsys, offset, value, mask); Sorry but this is pointless, really... Function cmdq_pkt_write_mask() in mtk-cmdq-helper is doing: if (mask != GENMASK(31, 0)) { err = cmdq_pkt_mask(pkt, mask); if (err < 0) return err; offset_mask |= CMDQ_WRITE_ENABLE_MASK; } return cmdq_pkt_write(pkt, subsys, offset_mask, value); here you're doing the exact inverse check. At this point you can just do: static int mtk_ddp_write_cmdq_pkt(struct cmdq_pkt *cmdq_pkt, struct cmdq_client_reg *cmdq_reg, u16 offset, u32 value, u32 mask) { u16 gce_offset = cmdq_reg->offset + offset; if (cmdq_reg->subsys != CMDQ_SUBSYS_INVALID) return cmdq_pkt_write_mask(pkt, cmdq_reg->subsys, gce_offset, value, mask); return cmdq_pkt_write_mask_pa(cmdq_pkt, cmdq_reg->pa_base, gce_offset, value, mask); } Cheers, Angelo > + } else { > + /* only MMIO access, no need to check mminfro_offset */ > + cmdq_pkt_assign(cmdq_pkt, 0, CMDQ_ADDR_HIGH(cmdq_reg->pa_base)); > + if (mask == GENMASK(31, 0)) > + cmdq_pkt_write_s_value(cmdq_pkt, CMDQ_THR_SPR_IDX0, > + CMDQ_ADDR_LOW(offset), value); > + else > + cmdq_pkt_write_s_mask_value(cmdq_pkt, CMDQ_THR_SPR_IDX0, > + CMDQ_ADDR_LOW(offset), value, mask); > + } > +} > +#endif > + > void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value, > struct cmdq_client_reg *cmdq_reg, void __iomem *regs, > unsigned int offset) > { > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > if (cmdq_pkt) > - cmdq_pkt_write(cmdq_pkt, cmdq_reg->subsys, > - cmdq_reg->offset + offset, value); > + mtk_ddp_write_cmdq_pkt(cmdq_pkt, cmdq_reg, offset, value, GENMASK(31, 0)); > else > #endif > writel(value, regs + offset); > @@ -85,8 +108,7 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt *cmdq_pkt, unsigned int value, > { > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > if (cmdq_pkt) > - cmdq_pkt_write(cmdq_pkt, cmdq_reg->subsys, > - cmdq_reg->offset + offset, value); > + mtk_ddp_write_cmdq_pkt(cmdq_pkt, cmdq_reg, offset, value, GENMASK(31, 0)); > else > #endif > writel_relaxed(value, regs + offset); > @@ -98,8 +120,7 @@ void mtk_ddp_write_mask(struct cmdq_pkt *cmdq_pkt, unsigned int value, > { > #if IS_REACHABLE(CONFIG_MTK_CMDQ) > if (cmdq_pkt) { > - cmdq_pkt_write_mask(cmdq_pkt, cmdq_reg->subsys, > - cmdq_reg->offset + offset, value, mask); > + mtk_ddp_write_cmdq_pkt(cmdq_pkt, cmdq_reg, offset, value, mask); > } else { > #endif > u32 tmp = readl(regs + offset);