github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/rockchip: vop2: Merge vop2_cluster/esmart_init function

Browse Source 
Now these two function share the same logic, they can
be merged as one.

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20250218112744.34433-5-andyshrk@163.com
This commit is contained in:
Andy Yan 2025-02-18 19:27:31 +08:00 committed by Heiko Stuebner
parent 328e688599
commit 145c9b3689
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View File

@ -2434,18 +2434,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);
@ -2456,28 +2456,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;
@ -2494,9 +2472,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_smart_regs);
if (ret)
return ret;
}