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 921CECCD18C for ; Sat, 11 Oct 2025 17:03:46 +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=PV/qyG9vDb+LB23XSMaQgIBpcX9H0uHItNjlEfUTKIU=; b=zPXAVQrlhlamvo7H6d/z2huNyu p0PnepBheHac2GIwLMJUXSTOTCa5NGlZdFl2NIj6NcLoMRi5zotqcGjLKm/8ozzLjxKnHXgjPXZnM Puf3sPGdWadz53CEiJt/8QhhjX9wJYVg5WaWb1imuanL9h1TEnWf+1TcKpp/Q9B/IOGw2q8Kh1ENq KdoXaOzrQfjJXhOO3fKcyR7JBHy2lOWddudMjJvmW4V2rZ3SRTxxiR9pmHcX+6wCv7DNLny6RbTfF CtNQ2oEKKOzmRjo6Ap1nTn2Sl465R6Je6vqbBanROcYeZbqBfGjgsR7sz3WLSOE3YKJgptELfyJxW TkegjNLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d0N-0000000ANSF-2l3L; Sat, 11 Oct 2025 17:03:39 +0000 Received: from mout-p-103.mailbox.org ([80.241.56.161]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1v7d0I-0000000ANI2-2vZd for linux-arm-kernel@lists.infradead.org; Sat, 11 Oct 2025 17:03:36 +0000 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4ckVLX6r0Hz9spd; Sat, 11 Oct 2025 19:03:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PV/qyG9vDb+LB23XSMaQgIBpcX9H0uHItNjlEfUTKIU=; b=Hv+mgUvxdIM1lUXd9wCBp8Zbpkhsw8IOnQ+5Z5zTMkt9a96ZDbWjzjx91hjipqSOphPBd6 RuV1u72MAxtf/dZYqBGrmtheqEqBoMiUkZPMQsJdFGfyuxl0XF5urembVtiKgYdhGqeXA/ ehLzUeULzA+50bGYRYKwOoDKkKxETkdY4FChSEqKKQQdW0yTokIeVjEUrxk7mRO8syCUq0 9kSJPdTBE3mJT+sHq9D2v9PGluJkYb3TwO4GOAnRngcGthm/LNPT4tqTS6HN2i50ggvCkx Dm8Wr+gTdcLSNwK0Z3L/+xBdp282B4iBepGdGSvZehiRKT/Fg1i9yAykMEMmXw== From: Marek Vasut DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1760202211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PV/qyG9vDb+LB23XSMaQgIBpcX9H0uHItNjlEfUTKIU=; b=brkdXaIIvSlhvOalFAd0af2iWRhLkJ5AT/BYj7gy9P8nhSK4bqjGSNoGBfFaMsRmRDgAsL JTHjsjYXUZl5BDfFs5uY6JakcCo5yNad9ybyipQWgyJb2xsxTIg7VqQvqa/7DivQo4qYFv FvTwWXVpnt+w1AnoXSfa81WdkiX+4r0TsUsEESjr6QFzja1AzagUiFpliXRGvR0TSOdNH0 a7RUogHkpTstlWAFQX3GXxLYqT+PsVUCbS923bxvOCArtrGZ6rBPpnhINxwDtHFXQgeq/C 5jRNTxqBJKZykGzzXuqtZq+OHBIDFwycJi7izR9b403RRhKO+heHFPh/eQAb3g== To: dri-devel@lists.freedesktop.org Cc: Marek Vasut , Abel Vesa , Conor Dooley , Fabio Estevam , Krzysztof Kozlowski , Laurent Pinchart , Liu Ying , Lucas Stach , Peng Fan , Pengutronix Kernel Team , Rob Herring , Shawn Guo , Thomas Zimmermann , devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org Subject: [PATCH 14/39] drm/imx: dc: fu: Inline FRAC_OFFSET into FetchLayer and FetchWrap Date: Sat, 11 Oct 2025 18:51:29 +0200 Message-ID: <20251011170213.128907-15-marek.vasut@mailbox.org> In-Reply-To: <20251011170213.128907-1-marek.vasut@mailbox.org> References: <20251011170213.128907-1-marek.vasut@mailbox.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-RS-META: gbi86qkmuend4t47n6modi9q5n79f1k1 X-MBO-RS-ID: 12dafd71f199e8d4fad X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251011_100334_924718_80E71AB8 X-CRM114-Status: GOOD ( 12.38 ) 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 Move FRAC_OFFSET into FetchLayer and FetchLayer drivers, because FetchLayer is present on i.MX95 with different FRAC_OFFSET and FetchWrap is not present. Prepare the register offset calculation for i.MX95 addition. No functional change. Signed-off-by: Marek Vasut --- Cc: Abel Vesa Cc: Conor Dooley Cc: Fabio Estevam Cc: Krzysztof Kozlowski Cc: Laurent Pinchart Cc: Liu Ying Cc: Lucas Stach Cc: Peng Fan Cc: Pengutronix Kernel Team Cc: Rob Herring Cc: Shawn Guo Cc: Thomas Zimmermann Cc: devicetree@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: imx@lists.linux.dev Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org --- drivers/gpu/drm/imx/dc/dc-fl.c | 46 +++++++++++++++++++--------------- drivers/gpu/drm/imx/dc/dc-fu.h | 3 --- drivers/gpu/drm/imx/dc/dc-fw.c | 45 ++++++++++++++++++--------------- 3 files changed, 51 insertions(+), 43 deletions(-) diff --git a/drivers/gpu/drm/imx/dc/dc-fl.c b/drivers/gpu/drm/imx/dc/dc-fl.c index 8571871c6a683..a76825dc75fe1 100644 --- a/drivers/gpu/drm/imx/dc/dc-fl.c +++ b/drivers/gpu/drm/imx/dc/dc-fl.c @@ -15,16 +15,19 @@ #include "dc-drv.h" #include "dc-fu.h" -#define BASEADDRESS(x) (0x10 + FRAC_OFFSET * (x)) -#define SOURCEBUFFERATTRIBUTES(x) (0x14 + FRAC_OFFSET * (x)) -#define SOURCEBUFFERDIMENSION(x) (0x18 + FRAC_OFFSET * (x)) -#define COLORCOMPONENTBITS(x) (0x1c + FRAC_OFFSET * (x)) -#define COLORCOMPONENTSHIFT(x) (0x20 + FRAC_OFFSET * (x)) -#define LAYEROFFSET(x) (0x24 + FRAC_OFFSET * (x)) -#define CLIPWINDOWOFFSET(x) (0x28 + FRAC_OFFSET * (x)) -#define CLIPWINDOWDIMENSIONS(x) (0x2c + FRAC_OFFSET * (x)) -#define CONSTANTCOLOR(x) (0x30 + FRAC_OFFSET * (x)) -#define LAYERPROPERTY(x) (0x34 + FRAC_OFFSET * (x)) +#define FRAC_OFFSET 0x28 + +#define BURSTBUFFERMANAGEMENT 0xc +#define BASEADDRESS 0x10 +#define SOURCEBUFFERATTRIBUTES 0x14 +#define SOURCEBUFFERDIMENSION 0x18 +#define COLORCOMPONENTBITS 0x1c +#define COLORCOMPONENTSHIFT 0x20 +#define LAYEROFFSET 0x24 +#define CLIPWINDOWOFFSET 0x28 +#define CLIPWINDOWDIMENSIONS 0x2c +#define CONSTANTCOLOR 0x30 +#define LAYERPROPERTY 0x34 #define FRAMEDIMENSIONS 0x150 struct dc_fl { @@ -98,6 +101,7 @@ static int dc_fl_bind(struct device *dev, struct device *master, void *data) { struct platform_device *pdev = to_platform_device(dev); struct dc_drm_device *dc_drm = data; + unsigned int off_base, off_regs; struct resource *res_pec; void __iomem *base_cfg; struct dc_fl *fl; @@ -130,16 +134,18 @@ static int dc_fl_bind(struct device *dev, struct device *master, void *data) fu->link_id = LINK_ID_FETCHLAYER0; fu->id = DC_FETCHUNIT_FL0; for (i = 0; i < DC_FETCHUNIT_FRAC_NUM; i++) { - fu->reg_baseaddr[i] = BASEADDRESS(i); - fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES(i); - fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION(i); - fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS(i); - fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT(i); - fu->reg_layeroffset[i] = LAYEROFFSET(i); - fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET(i); - fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS(i); - fu->reg_constantcolor[i] = CONSTANTCOLOR(i); - fu->reg_layerproperty[i] = LAYERPROPERTY(i); + off_base = i * FRAC_OFFSET; + fu->reg_baseaddr[i] = BASEADDRESS + off_base; + off_regs = i * FRAC_OFFSET; + fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES + off_regs; + fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION + off_regs; + fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS + off_regs; + fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT + off_regs; + fu->reg_layeroffset[i] = LAYEROFFSET + off_regs; + fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET + off_regs; + fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS + off_regs; + fu->reg_constantcolor[i] = CONSTANTCOLOR + off_regs; + fu->reg_layerproperty[i] = LAYERPROPERTY + off_regs; } fu->reg_burstbuffermanagement = BURSTBUFFERMANAGEMENT; fu->reg_framedimensions = FRAMEDIMENSIONS; diff --git a/drivers/gpu/drm/imx/dc/dc-fu.h b/drivers/gpu/drm/imx/dc/dc-fu.h index 2a330c0abf6a1..3983ef23e40fb 100644 --- a/drivers/gpu/drm/imx/dc/dc-fu.h +++ b/drivers/gpu/drm/imx/dc/dc-fu.h @@ -15,10 +15,7 @@ #include "dc-pe.h" -#define FRAC_OFFSET 0x28 - #define STATICCONTROL 0x8 -#define BURSTBUFFERMANAGEMENT 0xc /* COLORCOMPONENTBITS */ #define R_BITS(x) FIELD_PREP_CONST(GENMASK(27, 24), (x)) diff --git a/drivers/gpu/drm/imx/dc/dc-fw.c b/drivers/gpu/drm/imx/dc/dc-fw.c index dc036121f0d23..7bbe06a840c93 100644 --- a/drivers/gpu/drm/imx/dc/dc-fw.c +++ b/drivers/gpu/drm/imx/dc/dc-fw.c @@ -16,16 +16,19 @@ #define PIXENGCFG_DYNAMIC 0x8 -#define BASEADDRESS(x) (0x10 + FRAC_OFFSET * (x)) -#define SOURCEBUFFERATTRIBUTES(x) (0x14 + FRAC_OFFSET * (x)) -#define SOURCEBUFFERDIMENSION(x) (0x18 + FRAC_OFFSET * (x)) -#define COLORCOMPONENTBITS(x) (0x1c + FRAC_OFFSET * (x)) -#define COLORCOMPONENTSHIFT(x) (0x20 + FRAC_OFFSET * (x)) -#define LAYEROFFSET(x) (0x24 + FRAC_OFFSET * (x)) -#define CLIPWINDOWOFFSET(x) (0x28 + FRAC_OFFSET * (x)) -#define CLIPWINDOWDIMENSIONS(x) (0x2c + FRAC_OFFSET * (x)) -#define CONSTANTCOLOR(x) (0x30 + FRAC_OFFSET * (x)) -#define LAYERPROPERTY(x) (0x34 + FRAC_OFFSET * (x)) +#define FRAC_OFFSET 0x28 + +#define BURSTBUFFERMANAGEMENT 0xc +#define BASEADDRESS 0x10 +#define SOURCEBUFFERATTRIBUTES 0x14 +#define SOURCEBUFFERDIMENSION 0x18 +#define COLORCOMPONENTBITS 0x1c +#define COLORCOMPONENTSHIFT 0x20 +#define LAYEROFFSET 0x24 +#define CLIPWINDOWOFFSET 0x28 +#define CLIPWINDOWDIMENSIONS 0x2c +#define CONSTANTCOLOR 0x30 +#define LAYERPROPERTY 0x34 #define FRAMEDIMENSIONS 0x150 #define CONTROL 0x170 @@ -130,6 +133,7 @@ static int dc_fw_bind(struct device *dev, struct device *master, void *data) struct resource *res_pec; void __iomem *base_pec; void __iomem *base_cfg; + unsigned int off; struct dc_fw *fw; struct dc_fu *fu; int i, id; @@ -167,16 +171,17 @@ static int dc_fw_bind(struct device *dev, struct device *master, void *data) fu->link_id = LINK_ID_FETCHWARP2; fu->id = DC_FETCHUNIT_FW2; for (i = 0; i < DC_FETCHUNIT_FRAC_NUM; i++) { - fu->reg_baseaddr[i] = BASEADDRESS(i); - fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES(i); - fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION(i); - fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS(i); - fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT(i); - fu->reg_layeroffset[i] = LAYEROFFSET(i); - fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET(i); - fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS(i); - fu->reg_constantcolor[i] = CONSTANTCOLOR(i); - fu->reg_layerproperty[i] = LAYERPROPERTY(i); + off = i * FRAC_OFFSET; + fu->reg_baseaddr[i] = BASEADDRESS + off; + fu->reg_sourcebufferattributes[i] = SOURCEBUFFERATTRIBUTES + off; + fu->reg_sourcebufferdimension[i] = SOURCEBUFFERDIMENSION + off; + fu->reg_colorcomponentbits[i] = COLORCOMPONENTBITS + off; + fu->reg_colorcomponentshift[i] = COLORCOMPONENTSHIFT + off; + fu->reg_layeroffset[i] = LAYEROFFSET + off; + fu->reg_clipwindowoffset[i] = CLIPWINDOWOFFSET + off; + fu->reg_clipwindowdimensions[i] = CLIPWINDOWDIMENSIONS + off; + fu->reg_constantcolor[i] = CONSTANTCOLOR + off; + fu->reg_layerproperty[i] = LAYERPROPERTY + off; } fu->reg_burstbuffermanagement = BURSTBUFFERMANAGEMENT; fu->reg_framedimensions = FRAMEDIMENSIONS; -- 2.51.0