From nobody Fri Dec 19 11:00:31 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DEFF523F29F; Tue, 18 Feb 2025 11:29:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739878168; cv=none; b=q7CJzyRm73Mrq3dTOuO/C+q6jlhxctrygM9egmzF05O2gBw7byfzzL0+LyiwA8AAy7OV5GBBGiOKtmhecO1/gXR9CPmwhQOwq7372vjliFx0LYZJXYmTJ5peqDUbNfpFXeOtElYA2DfXgCJ7ue3utj/2DsO6HtwCAVsp1oVWuBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739878168; c=relaxed/simple; bh=N1Ebj7SolLqY4B9oj+bbcM0K+lf0Yt1dnRhT0gLgxmg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E3gg2JYlZWtk57urPcBUsbifpErQNX1HIIB/PqlrfZNbfC1R63H4qKvYWk+w1+EN+hzTxjdb2I3qrynpPVcdVYEXX8+ur4MM30vf6c3GGvm7C0brb7NTnr89/PjDzWvLsRTwbysZzPRpVb/6LLxfk5365o9/lCxifdPRxT2Giu0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=gIvTrfuR; arc=none smtp.client-ip=117.135.210.2 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="gIvTrfuR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=FElbK wJG9bbVudahow88EWjSdaPcuW8HWtyI1wDmCXQ=; b=gIvTrfuRh+ISFtQY6u9+h /Fysvpr+issDL9+StHdQoCAFrbPdcfnv2vs5GQ780sw+uHizULIhGY22h4//rpS0 S28YE2x9LDvqwZ/EOs2NorYCnytQAKwi3b8gdVaSe8+q5WKztR7A7SkcasdaPzDt +dBjdU8+821BzbRLGjj6z4= Received: from ProDesk.. (unknown []) by gzga-smtp-mtada-g1-4 (Coremail) with SMTP id _____wD333uybrRnLIPUMQ--.34107S6; Tue, 18 Feb 2025 19:27:54 +0800 (CST) From: Andy Yan 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 Subject: [PATCH v15 04/13] drm/rockchip: vop2: Merge vop2_cluster/esmart_init function Date: Tue, 18 Feb 2025 19:27:31 +0800 Message-ID: <20250218112744.34433-5-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250218112744.34433-1-andyshrk@163.com> References: <20250218112744.34433-1-andyshrk@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD333uybrRnLIPUMQ--.34107S6 X-Coremail-Antispam: 1Uf129KBjvJXoWxWw4UKF1rCF1xJF4rCw1DAwb_yoW5XF13pF W3Gr13Wr4UGFsF9r4kJrn8uF1Fkr12yaykAa48Kw1akwnrKr9FkFn5GF10yr90krWv9Fy2 yF4kK3y3ua429r7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UJR67UUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/xtbBkAn3Xme0bEsv8gAAsZ Content-Type: text/plain; charset="utf-8" From: Andy Yan Now these two function share the same logic, they can be merged as one. Signed-off-by: Andy Yan --- Changes in v15: - Fix nr_regs arguments for smart windows register. 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 32724232c2d5..e3147a58ff0e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2423,18 +2423,18 @@ static int vop2_find_rgb_encoder(struct vop2 *vop2) return -ENOENT; } =20 -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 =3D win->vop2; int i; =20 - for (i =3D 0; i < vop2->data->nr_cluster_regs; i++) { + for (i =3D 0; i < nr_regs; i++) { const struct reg_field field =3D { - .reg =3D (vop2->data->cluster_reg[i].reg !=3D 0xffffffff) ? - vop2->data->cluster_reg[i].reg + win->offset : - vop2->data->cluster_reg[i].reg, - .lsb =3D vop2->data->cluster_reg[i].lsb, - .msb =3D vop2->data->cluster_reg[i].msb + .reg =3D (regs[i].reg !=3D 0xffffffff) ? + regs[i].reg + win->offset : regs[i].reg, + .lsb =3D regs[i].lsb, + .msb =3D regs[i].msb }; =20 win->reg[i] =3D devm_regmap_field_alloc(vop2->dev, vop2->map, field); @@ -2445,28 +2445,6 @@ static int vop2_cluster_init(struct vop2_win *win) return 0; }; =20 -static int vop2_esmart_init(struct vop2_win *win) -{ - struct vop2 *vop2 =3D win->vop2; - int i; - - for (i =3D 0; i < vop2->data->nr_smart_regs; i++) { - const struct reg_field field =3D { - .reg =3D (vop2->data->smart_reg[i].reg !=3D 0xffffffff) ? - vop2->data->smart_reg[i].reg + win->offset : - vop2->data->smart_reg[i].reg, - .lsb =3D vop2->data->smart_reg[i].lsb, - .msb =3D vop2->data->smart_reg[i].msb - }; - - win->reg[i] =3D 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 =3D vop2->data; @@ -2483,9 +2461,11 @@ static int vop2_win_init(struct vop2 *vop2) win->win_id =3D i; win->vop2 =3D vop2; if (vop2_cluster_window(win)) - ret =3D vop2_cluster_init(win); + ret =3D vop2_regmap_init(win, vop2->data->cluster_reg, + vop2->data->nr_cluster_regs); else - ret =3D vop2_esmart_init(win); + ret =3D vop2_regmap_init(win, vop2->data->smart_reg, + vop2->data->nr_smart_regs); if (ret) return ret; } --=20 2.34.1