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 X-Spam-Level: X-Spam-Status: No, score=-12.2 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC85FC433DB for ; Fri, 29 Jan 2021 15:36:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B0E864E02 for ; Fri, 29 Jan 2021 15:36:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B0E864E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:Subject: From:References:To:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Yol9DlseUY6/IrqZEVtxB0B4m1KWIWyNdtuVJ91Xf20=; b=kHEqFV5+6QJ/yDgIGgDO1PlZC 2s9WeQw8Vl179KtYhTKFHrBhnZvww7e/8xLRBPlbKx9KitLxb73NFes12r9fQM4JlGhDhmrXQ3P+p mzq344KwZsjsIi4v4DnWa1vkmsxk0RHq6bCFNWNuuziCrrxKUusFpB84pkrLOGDFYaq0Njn5smIV8 wuDWSgoT1Fn9ERwfUeiGfgyuoLLzIe7yzLnRFq09IWPqwsAPjNDzqnPJuug+io0yJ9BowaKE+iATd X4ujaaGVvrpxxBWHPPOvd+67rUZd7un1xrhH0kNjL32kePCKCOc7AjlqzsldvVgUmeCt2yCBvYVCQ CrKyyE1Ug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l5Vnr-0005sJ-PU; Fri, 29 Jan 2021 15:35:19 +0000 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l5Vno-0005r7-1N; Fri, 29 Jan 2021 15:35:17 +0000 Received: by mail-wm1-x329.google.com with SMTP id 190so7161380wmz.0; Fri, 29 Jan 2021 07:35:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:cc:references:from:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=zJKPfLg9CbrFKcrfXcPwVaS5yYgtqXVyVVsTJlqlX4M=; b=TpJsaM553Z5sN2tw6JHA4rBp7AZ3urCsJe496/3LIXaxlNgT7AlzYcAR3BZu0a0IsV e1V1giq4HJ2isMUA6j7v7FRvo9hR4f97CW786UPZ0RGMaCsNKkNFBv3S2dkPPfHi1Ky8 MxKnr9oKYyItvAjzAvG+KQAPPVMUcEfmKvyDRKLpy9vDPyDOn2A6N8Rf9ORoVTjw49YQ NLjQC2ZyTFEOrUeHjSBpO5Z65NJTaNe0Ti3jC78G5QADrkBoksJw1XLvJbj1VPKyS4UA ifUH1hsM+snAhKpBRo9Sut0YlfUKC6Ylf1SwJc5dBy3V56a1UYsffGEjPDUnFr2NpZt+ QuKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:references:from:subject:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=zJKPfLg9CbrFKcrfXcPwVaS5yYgtqXVyVVsTJlqlX4M=; b=U0kMgR99FsNWoGz8rfTTWlfu5wr5WRvT3mzEnheXuEpfipSL6XPOhpXn4aUMH2TLSO bLiSSkflSFFq31h+9X7g/ooCAeJkb0D4s0wabzevS1NafGB+Egd3Jc6Y0J5a+5Be7o0z h/XkuKlkdJeg/y7iA48whu9r3EsgFcNM7Fmu8s8QSvTZPGCbGVYS1PXPomUvK0qI6WxK JgNyqNy5SooOX4usVlACGboc2B4l/XxBdHKfh+58gIf1PGTaLsi08v+gmFz8xssNVZ7I oOBc3oDY2CH3+MKzVi9OwpXP70kllGiyRKsuWUwLOMObE3CipnDv5igVVLwyTNVBVFx+ XcbA== X-Gm-Message-State: AOAM53379kYc33Mrv4OrfBZFYkjHJyBvv28xGcfN3LIlUWUAygBxQhCI c6hNQTX53HkQeJrHwTn3CJvfGyKDeEI= X-Google-Smtp-Source: ABdhPJwSoqXFZnqDJP2NbG4s6pXAwkMPlQxrU3Z/S1Hld3EUcL95E9cSdTUyMu2wAN6XpPMtRQdwVw== X-Received: by 2002:a05:600c:414b:: with SMTP id h11mr4489482wmm.4.1611934514434; Fri, 29 Jan 2021 07:35:14 -0800 (PST) Received: from ziggy.stardust ([213.195.126.134]) by smtp.gmail.com with ESMTPSA id z4sm12922519wrw.38.2021.01.29.07.35.12 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 29 Jan 2021 07:35:13 -0800 (PST) To: Yongqiang Niu , Matthias Brugger References: <1609815993-22744-1-git-send-email-yongqiang.niu@mediatek.com> <1609815993-22744-4-git-send-email-yongqiang.niu@mediatek.com> <1611190616.22801.6.camel@mhfsdcap03> From: Matthias Brugger Subject: Re: [PATCH v4, 03/10] soc: mediatek: mmsys: move register operation into mmsys path select function Message-ID: <4cadc9f0-0761-7609-abac-d2211b097bda@gmail.com> Date: Fri, 29 Jan 2021 16:35:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <1611190616.22801.6.camel@mhfsdcap03> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210129_103516_186211_F6CBF318 X-CRM114-Status: GOOD ( 28.82 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Daniel Vetter , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Project_Global_Chrome_Upstream_Group@mediatek.com, Rob Herring , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 21/01/2021 01:56, Yongqiang Niu wrote: > On Wed, 2021-01-20 at 20:38 +0100, Matthias Brugger wrote: >> On Tue, Jan 05, 2021 at 11:06:26AM +0800, Yongqiang Niu wrote: >>> move register operation into mmsys path select function >> >> Why do you want to do that. It seems the register access pattern is the >> same for all SoCs so far supported, so I don't see the need to duplicate >> the code in every SoC. >> >> Regards, >> Matthias > > mt2701 and mt8173 ovl mout en already different. > mt2701 ovl mout en register offset is 0x30 > mt8173 olv mout en register offset is 0x40 > > only the use case is different; > mt2701 ovl->color0 > mt8173 ovl->rmda0 > there make different define for this different. > > #define DISP_REG_CONFIG_DISP_OVL0_MOUT_EN 0x040 > > #define DISP_REG_CONFIG_DISP_OVL_MOUT_EN 0x030 > > for the future mt8183, ovl mout en register offset will change to > 0xf00 > > this is only one different sample, there will be more and more > different, so we add this patch for different soc > > That does not explain why you want to put the read and write calls in a per SoC part, they are the same for all supported SoCs. Anyway after having a second thought, I don't like this approach at all. I think splitting up the code in several SoCs to not bloat the driver is a good thing, but not as it is done in this series. I'd prefer to use a lookup table as Enric did in his first approach [1]. We could then add this table in a per SoC header file. Regards, Matthias https://patchwork.kernel.org/project/linux-mediatek/patch/20201006193320.405529-5-enric.balletbo@collabora.com/ >> >>> >>> Signed-off-by: Yongqiang Niu >>> --- >>> drivers/soc/mediatek/mmsys/mtk-mmsys.c | 140 +++++++++++++++++---------------- >>> 1 file changed, 71 insertions(+), 69 deletions(-) >>> >>> diff --git a/drivers/soc/mediatek/mmsys/mtk-mmsys.c b/drivers/soc/mediatek/mmsys/mtk-mmsys.c >>> index 6c03282..64c8030 100644 >>> --- a/drivers/soc/mediatek/mmsys/mtk-mmsys.c >>> +++ b/drivers/soc/mediatek/mmsys/mtk-mmsys.c >>> @@ -106,141 +106,161 @@ struct mtk_mmsys { >>> .clk_driver = "clk-mt8183-mm", >>> }; >>> >>> -static unsigned int mtk_mmsys_ddp_mout_en(enum mtk_ddp_comp_id cur, >>> - enum mtk_ddp_comp_id next, >>> - unsigned int *addr) >>> +static void mtk_mmsys_ddp_mout_en(void __iomem *config_regs, >>> + enum mtk_ddp_comp_id cur, >>> + enum mtk_ddp_comp_id next, >>> + bool enable) >>> { >>> - unsigned int value; >>> + unsigned int addr, value, reg; >>> >>> if (cur == DDP_COMPONENT_OVL0 && next == DDP_COMPONENT_COLOR0) { >>> - *addr = DISP_REG_CONFIG_DISP_OVL0_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_OVL0_MOUT_EN; >>> value = OVL0_MOUT_EN_COLOR0; >>> } else if (cur == DDP_COMPONENT_OVL0 && next == DDP_COMPONENT_RDMA0) { >>> - *addr = DISP_REG_CONFIG_DISP_OVL_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_OVL_MOUT_EN; >>> value = OVL_MOUT_EN_RDMA; >>> } else if (cur == DDP_COMPONENT_OD0 && next == DDP_COMPONENT_RDMA0) { >>> - *addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN; >>> value = OD_MOUT_EN_RDMA0; >>> } else if (cur == DDP_COMPONENT_UFOE && next == DDP_COMPONENT_DSI0) { >>> - *addr = DISP_REG_CONFIG_DISP_UFOE_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_UFOE_MOUT_EN; >>> value = UFOE_MOUT_EN_DSI0; >>> } else if (cur == DDP_COMPONENT_OVL1 && next == DDP_COMPONENT_COLOR1) { >>> - *addr = DISP_REG_CONFIG_DISP_OVL1_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_OVL1_MOUT_EN; >>> value = OVL1_MOUT_EN_COLOR1; >>> } else if (cur == DDP_COMPONENT_GAMMA && next == DDP_COMPONENT_RDMA1) { >>> - *addr = DISP_REG_CONFIG_DISP_GAMMA_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_GAMMA_MOUT_EN; >>> value = GAMMA_MOUT_EN_RDMA1; >>> } else if (cur == DDP_COMPONENT_OD1 && next == DDP_COMPONENT_RDMA1) { >>> - *addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_OD_MOUT_EN; >>> value = OD1_MOUT_EN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI0) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> value = RDMA0_SOUT_DPI0; >>> } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DPI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> value = RDMA0_SOUT_DPI1; >>> } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> value = RDMA0_SOUT_DSI1; >>> } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI2) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> value = RDMA0_SOUT_DSI2; >>> } else if (cur == DDP_COMPONENT_RDMA0 && next == DDP_COMPONENT_DSI3) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA0_SOUT_EN; >>> value = RDMA0_SOUT_DSI3; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> value = RDMA1_SOUT_DSI1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI2) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> value = RDMA1_SOUT_DSI2; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI3) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> value = RDMA1_SOUT_DSI3; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI0) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> value = RDMA1_SOUT_DPI0; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> + addr = DISP_REG_CONFIG_DISP_RDMA1_SOUT_EN; >>> value = RDMA1_SOUT_DPI1; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> + addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> value = RDMA2_SOUT_DPI0; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> + addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> value = RDMA2_SOUT_DPI1; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> + addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> value = RDMA2_SOUT_DSI1; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI2) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> + addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> value = RDMA2_SOUT_DSI2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI3) { >>> - *addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> + addr = DISP_REG_CONFIG_DISP_RDMA2_SOUT; >>> value = RDMA2_SOUT_DSI3; >>> } else { >>> value = 0; >>> } >>> >>> - return value; >>> + if (value) { >>> + reg = readl_relaxed(config_regs + addr); >>> + >>> + if (enable) >>> + reg |= value; >>> + else >>> + reg &= ~value; >>> + >>> + writel_relaxed(reg, config_regs + addr); >>> + } >>> } >>> >>> -static unsigned int mtk_mmsys_ddp_sel_in(enum mtk_ddp_comp_id cur, >>> - enum mtk_ddp_comp_id next, >>> - unsigned int *addr) >>> +static void mtk_mmsys_ddp_sel_in(void __iomem *config_regs, >>> + enum mtk_ddp_comp_id cur, >>> + enum mtk_ddp_comp_id next, >>> + bool enable) >>> { >>> - unsigned int value; >>> + unsigned int addr, value, reg; >>> >>> if (cur == DDP_COMPONENT_OVL0 && next == DDP_COMPONENT_COLOR0) { >>> - *addr = DISP_REG_CONFIG_DISP_COLOR0_SEL_IN; >>> + addr = DISP_REG_CONFIG_DISP_COLOR0_SEL_IN; >>> value = COLOR0_SEL_IN_OVL0; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI0) { >>> - *addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> + addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> value = DPI0_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DPI1) { >>> - *addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> + addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> value = DPI1_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI0) { >>> - *addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> value = DSI0_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI1) { >>> - *addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> value = DSI1_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI2) { >>> - *addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> value = DSI2_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA1 && next == DDP_COMPONENT_DSI3) { >>> - *addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> value = DSI3_SEL_IN_RDMA1; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI0) { >>> - *addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> + addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> value = DPI0_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DPI1) { >>> - *addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> + addr = DISP_REG_CONFIG_DPI_SEL_IN; >>> value = DPI1_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI0) { >>> - *addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> value = DSI0_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI1) { >>> - *addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIO_SEL_IN; >>> value = DSI1_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI2) { >>> - *addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> value = DSI2_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_RDMA2 && next == DDP_COMPONENT_DSI3) { >>> - *addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> + addr = DISP_REG_CONFIG_DSIE_SEL_IN; >>> value = DSI3_SEL_IN_RDMA2; >>> } else if (cur == DDP_COMPONENT_OVL1 && next == DDP_COMPONENT_COLOR1) { >>> - *addr = DISP_REG_CONFIG_DISP_COLOR1_SEL_IN; >>> + addr = DISP_REG_CONFIG_DISP_COLOR1_SEL_IN; >>> value = COLOR1_SEL_IN_OVL1; >>> } else if (cur == DDP_COMPONENT_BLS && next == DDP_COMPONENT_DSI0) { >>> - *addr = DISP_REG_CONFIG_DSI_SEL; >>> + addr = DISP_REG_CONFIG_DSI_SEL; >>> value = DSI_SEL_IN_BLS; >>> } else { >>> value = 0; >>> } >>> >>> - return value; >>> + if (value) { >>> + reg = readl_relaxed(config_regs + addr); >>> + >>> + if (enable) >>> + reg |= value; >>> + else >>> + reg &= ~value; >>> + >>> + writel_relaxed(reg, config_regs + addr); >>> + } >>> } >>> >>> static void mtk_mmsys_ddp_sout_sel(void __iomem *config_regs, >>> @@ -265,21 +285,12 @@ void mtk_mmsys_ddp_connect(struct device *dev, >>> enum mtk_ddp_comp_id next) >>> { >>> struct mtk_mmsys *mmsys = dev_get_drvdata(dev); >>> - unsigned int addr, value, reg; >>> >>> - value = mtk_mmsys_ddp_mout_en(cur, next, &addr); >>> - if (value) { >>> - reg = readl_relaxed(mmsys->regs + addr) | value; >>> - writel_relaxed(reg, mmsys->regs + addr); >>> - } >>> + mtk_mmsys_ddp_mout_en(mmsys->regs, cur, next, true); >>> >>> mtk_mmsys_ddp_sout_sel(mmsys->regs, cur, next); >>> >>> - value = mtk_mmsys_ddp_sel_in(cur, next, &addr); >>> - if (value) { >>> - reg = readl_relaxed(mmsys->regs + addr) | value; >>> - writel_relaxed(reg, mmsys->regs + addr); >>> - } >>> + mtk_mmsys_ddp_sel_in(mmsys->regs, cur, next, true); >>> } >>> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_connect); >>> >>> @@ -288,19 +299,10 @@ void mtk_mmsys_ddp_disconnect(struct device *dev, >>> enum mtk_ddp_comp_id next) >>> { >>> struct mtk_mmsys *mmsys = dev_get_drvdata(dev); >>> - unsigned int addr, value, reg; >>> >>> - value = mtk_mmsys_ddp_mout_en(cur, next, &addr); >>> - if (value) { >>> - reg = readl_relaxed(mmsys->regs + addr) & ~value; >>> - writel_relaxed(reg, mmsys->regs + addr); >>> - } >>> + mtk_mmsys_ddp_mout_en(mmsys->regs, cur, next, false); >>> >>> - value = mtk_mmsys_ddp_sel_in(cur, next, &addr); >>> - if (value) { >>> - reg = readl_relaxed(mmsys->regs + addr) & ~value; >>> - writel_relaxed(reg, mmsys->regs + addr); >>> - } >>> + mtk_mmsys_ddp_sel_in(mmsys->regs, cur, next, false); >>> } >>> EXPORT_SYMBOL_GPL(mtk_mmsys_ddp_disconnect); >>> >>> -- >>> 1.8.1.1.dirty >>> _______________________________________________ >>> Linux-mediatek mailing list >>> Linux-mediatek@lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/linux-mediatek > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel