From: Andy Yan <andyshrk@163.com>
To: heiko@sntech.de
Cc: hjc@rock-chips.com, krzk+dt@kernel.org,
devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
derek.foreman@collabora.com, detlev.casanova@collabora.com,
daniel@fooishbar.org, robh@kernel.org,
sebastian.reichel@collabora.com,
Andy Yan <andy.yan@rock-chips.com>
Subject: [PATCH v14 04/13] drm/rockchip: vop2: Merge vop2_cluster/esmart_init function
Date: Wed, 12 Feb 2025 17:34:59 +0800 [thread overview]
Message-ID: <20250212093530.52961-5-andyshrk@163.com> (raw)
In-Reply-To: <20250212093530.52961-1-andyshrk@163.com>
From: Andy Yan <andy.yan@rock-chips.com>
Now these two function share the same logic, the can
be merged as one.
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
---
(no changes since v1)
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 42 +++++---------------
1 file changed, 11 insertions(+), 31 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index a0d961cb5d21..844df4001159 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -2424,18 +2424,18 @@ static int vop2_find_rgb_encoder(struct vop2 *vop2)
return -ENOENT;
}
-static int vop2_cluster_init(struct vop2_win *win)
+static int vop2_regmap_init(struct vop2_win *win, const struct reg_field *regs,
+ int nr_regs)
{
struct vop2 *vop2 = win->vop2;
int i;
- for (i = 0; i < vop2->data->nr_cluster_regs; i++) {
+ for (i = 0; i < nr_regs; i++) {
const struct reg_field field = {
- .reg = (vop2->data->cluster_reg[i].reg != 0xffffffff) ?
- vop2->data->cluster_reg[i].reg + win->offset :
- vop2->data->cluster_reg[i].reg,
- .lsb = vop2->data->cluster_reg[i].lsb,
- .msb = vop2->data->cluster_reg[i].msb
+ .reg = (regs[i].reg != 0xffffffff) ?
+ regs[i].reg + win->offset : regs[i].reg,
+ .lsb = regs[i].lsb,
+ .msb = regs[i].msb
};
win->reg[i] = devm_regmap_field_alloc(vop2->dev, vop2->map, field);
@@ -2446,28 +2446,6 @@ static int vop2_cluster_init(struct vop2_win *win)
return 0;
};
-static int vop2_esmart_init(struct vop2_win *win)
-{
- struct vop2 *vop2 = win->vop2;
- int i;
-
- for (i = 0; i < vop2->data->nr_smart_regs; i++) {
- const struct reg_field field = {
- .reg = (vop2->data->smart_reg[i].reg != 0xffffffff) ?
- vop2->data->smart_reg[i].reg + win->offset :
- vop2->data->smart_reg[i].reg,
- .lsb = vop2->data->smart_reg[i].lsb,
- .msb = vop2->data->smart_reg[i].msb
- };
-
- win->reg[i] = devm_regmap_field_alloc(vop2->dev, vop2->map, field);
- if (IS_ERR(win->reg[i]))
- return PTR_ERR(win->reg[i]);
- }
-
- return 0;
-}
-
static int vop2_win_init(struct vop2 *vop2)
{
const struct vop2_data *vop2_data = vop2->data;
@@ -2484,9 +2462,11 @@ static int vop2_win_init(struct vop2 *vop2)
win->win_id = i;
win->vop2 = vop2;
if (vop2_cluster_window(win))
- ret = vop2_cluster_init(win);
+ ret = vop2_regmap_init(win, vop2->data->cluster_reg,
+ vop2->data->nr_cluster_regs);
else
- ret = vop2_esmart_init(win);
+ ret = vop2_regmap_init(win, vop2->data->smart_reg,
+ vop2->data->nr_cluster_regs);
if (ret)
return ret;
}
--
2.34.1
next prev parent reply other threads:[~2025-02-12 9:36 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-12 9:34 [PATCH v14 00/13] VOP Support for rk3576 Andy Yan
2025-02-12 9:34 ` [PATCH v14 01/13] drm/rockchip: vop2: use devm_regmap_field_alloc for cluster-regs Andy Yan
2025-02-12 9:34 ` [PATCH v14 02/13] drm/rockchip: vop2: Rename TRANSFORM_OFFSET to TRANSFORM_OFFS Andy Yan
2025-02-12 10:59 ` Heiko Stübner
2025-02-13 10:52 ` Andy Yan
2025-02-12 9:34 ` [PATCH v14 03/13] drm/rockchip: vop2: Add platform specific callback Andy Yan
2025-02-12 9:34 ` Andy Yan [this message]
2025-02-14 22:24 ` [PATCH v14 04/13] drm/rockchip: vop2: Merge vop2_cluster/esmart_init function Heiko Stübner
2025-02-15 7:34 ` Andy Yan
2025-02-12 9:35 ` [PATCH v14 05/13] drm/rockchip: vop2: Support for different layer select configuration between VPs Andy Yan
2025-02-12 9:35 ` [PATCH v14 06/13] drm/rockchip: vop2: Introduce vop hardware version Andy Yan
2025-02-12 9:35 ` [PATCH v14 07/13] drm/rockchip: vop2: Register the primary plane and overlay plane separately Andy Yan
2025-02-12 9:35 ` [PATCH v14 08/13] drm/rockchip: vop2: Set plane possible crtcs by possible vp mask Andy Yan
2025-02-12 9:35 ` [PATCH v14 09/13] drm/rockchip: vop2: Add uv swap for cluster window Andy Yan
2025-02-12 9:35 ` [PATCH v14 10/13] dt-bindings: display: vop2: describe constraint SoC by SoC Andy Yan
2025-02-12 9:36 ` [PATCH v14 11/13] dt-bindings: display: vop2: Add missing rockchip,grf property for rk3566/8 Andy Yan
2025-02-12 9:36 ` [PATCH v14 12/13] dt-bindings: display: vop2: Add rk3576 support Andy Yan
2025-02-12 9:36 ` [PATCH v14 13/13] drm/rockchip: vop2: Add support for rk3576 Andy Yan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250212093530.52961-5-andyshrk@163.com \
--to=andyshrk@163.com \
--cc=andy.yan@rock-chips.com \
--cc=daniel@fooishbar.org \
--cc=derek.foreman@collabora.com \
--cc=detlev.casanova@collabora.com \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robh@kernel.org \
--cc=sebastian.reichel@collabora.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®