From nobody Thu Dec 18 13:48:51 2025 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2AE70224AE2; Thu, 6 Feb 2025 06:45:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738824350; cv=none; b=GuyNCXITdT3XWNWy3LHjSPVd1nwkD4/B5Dy/SRoF7nPE7/e2oUx+GxTfjKGQ79l3/iaG3XVhMkTG3L/t48FBKzxu+X6MC4L+Ji1T4BJHo+wJmQo2zQtOXUzbZh7a509djDXrpTUiSqxnv8PCMht4GICd8x+lqz9byfD+UaEKUh4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738824350; c=relaxed/simple; bh=Q6HXO/n2Mb/vCu3yXYYePRmJwRyEHHIynQWwce1Qouo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WgKcAbjWUi0Z2E5LTzDxVK6tlfsRvRIpKtZE/OcMtsrxnHEi5YjuV7JYVo7eCh/Bev35qGncq41lJTAv+Y5R4EBHzfjlXlUcgbVLYgImjsrXFreMt0axEzU9lwPqjn5LkDQmKiKwzGw+VsxllIBC047s273Gx3mrgQPSTt3++Vg= 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=gwvHgV1G; arc=none smtp.client-ip=220.197.31.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="gwvHgV1G" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=zlwQ/ zugAITGUW6CmnYVDBT+3S9dhbJfYNreL5Qv5dI=; b=gwvHgV1GEDoW4MPcIWFbd xUFgmkDp8hac3v85fPKzST22G+7gORxQsHU1fCJVpjiXTAPevKIy2E4TnUKDikjD JY1i9W3z9H9UDjNj3NbXOAW22FsdV4KI+jJzcMzIedGZhahlr0E4JD2cex2gQsYe qWHT+2Zian5tq7qpH38GVM= Received: from ProDesk.. (unknown []) by gzga-smtp-mtada-g1-0 (Coremail) with SMTP id _____wD3fyNsWqRnb3bDKQ--.52146S6; Thu, 06 Feb 2025 14:45:08 +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 v13 04/13] drm/rockchip: vop2: Merge vop2_cluster/esmart_init function Date: Thu, 6 Feb 2025 14:44:32 +0800 Message-ID: <20250206064457.11396-5-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250206064457.11396-1-andyshrk@163.com> References: <20250206064457.11396-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: _____wD3fyNsWqRnb3bDKQ--.52146S6 X-Coremail-Antispam: 1Uf129KBjvJXoWxWw4UKF17CrWktr18AFykAFb_yoW5Xr1DpF W3Jr43Xr4UGFsF9r4kJrn8uF1Fkr12yaykAa48KwnIkwnrKF9FkFn5JF10yr90krWvkFy2 yFs7K3y3ua429r7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jbb1nUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqAXrXmekT+DQdgABsT Content-Type: text/plain; charset="utf-8" From: Andy Yan Now these two function share the same logic, the can be merged as one. Signed-off-by: Andy Yan --- (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 f7e2df1431b0..29a81ff152f3 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2398,18 +2398,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); @@ -2420,28 +2420,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; @@ -2458,9 +2436,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_cluster_regs); if (ret) return ret; } --=20 2.34.1