From nobody Wed Dec 17 18:02:28 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C573B221DA3; Mon, 9 Dec 2024 12:30:30 +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=1733747433; cv=none; b=XyWZFm/vH5lwnwxHPalhQ8G8PLCgEIH9ES2ExlFXcsgFiwIi/cSp/fbFWkQ5R938o5Gbs5WV/vzdXRmMGZwDyCjMVAfg4NGC0YHNnz1T/GA6258pz5kkoTPcPyH1sK7815XmtFxc5AB8e319K5zpZTM2tA3hgzzh/nSfKjl1K68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747433; c=relaxed/simple; bh=CGC5GQ4ONq6+RLsKFHSnNHj8N58SlnSh1DgTYXuKKQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h1q9/79aKsGMDugmWAncCJxPtCde22vbR4fscNck3ZJaZzDv2EHnjHobO/NRiso+ImsN+rDNzCrVgWhce4rvUT9vzceTl/45vQccEoLPAqTkA9ezu1JpUgBge6Oyd7p+0d32yW/WrKW2v7cd+wO+mrEjUHndflsjyKVx9Tu5Y9Y= 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=fBynfFHv; 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="fBynfFHv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=UwbtS HWOXa48utF78GzXwYwePSY8oTGL1QzJc84Ijuo=; b=fBynfFHvS55tzvkcko1hQ ofdlcriuIW1U3V+6bxpO4FUav1rsg9T0n691JDPR/2cPXVptkTla5H8lWxqHft2s jPQhrOAUbsN1icD1bh86Y0p134azBhA85cWO8W7ayD7kF4mJzq7dRs/osJsfaHbr T50ct+cGImkLXIUKFlspz4= Received: from ProDesk.. (unknown [58.22.7.114]) by gzsmtp1 (Coremail) with SMTP id PCgvCgD3Woe44lZnubZICA--.5849S7; Mon, 09 Dec 2024 20:29:54 +0800 (CST) From: Andy Yan To: heiko@sntech.de Cc: hjc@rock-chips.com, krzk+dt@kernel.org, s.hauer@pengutronix.de, 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, Andy Yan Subject: [PATCH v5 02/18] drm/rockchip: vop2: Fix cluster windows alpha ctrl regsiters offset Date: Mon, 9 Dec 2024 20:29:15 +0800 Message-ID: <20241209122943.2781431-6-andyshrk@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241209122943.2781431-1-andyshrk@163.com> References: <20241209122943.2781431-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: PCgvCgD3Woe44lZnubZICA--.5849S7 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4xJr1xCF17KF47JF4UCFg_yoW8urWkpF 17Ar98Xr47KFsIgr1xJFWDuryfKws2kFWxJF9xKw1agry3Kr9rC3Zrua4DCry5JFy7Cr42 k39xG347uF4jkF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jsF4iUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqQqwXmdW3c3WHAAAsm Content-Type: text/plain; charset="utf-8" From: Andy Yan The phy_id of cluster windws are not increase one for each window. Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver") Tested-by: Derek Foreman Signed-off-by: Andy Yan --- (no changes since v1) drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index d1169aa8ff5e..d0b2b881ff07 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2370,7 +2370,6 @@ static int vop2_find_start_mixer_id_for_vp(struct vop= 2 *vop2, u8 port_id) =20 static void vop2_setup_cluster_alpha(struct vop2 *vop2, struct vop2_win *m= ain_win) { - u32 offset =3D (main_win->data->phys_id * 0x10); struct vop2_alpha_config alpha_config; struct vop2_alpha alpha; struct drm_plane_state *bottom_win_pstate; @@ -2378,6 +2377,7 @@ static void vop2_setup_cluster_alpha(struct vop2 *vop= 2, struct vop2_win *main_wi u16 src_glb_alpha_val, dst_glb_alpha_val; bool premulti_en =3D false; bool swap =3D false; + u32 offset =3D 0; =20 /* At one win mode, win0 is dst/bottom win, and win1 is a all zero src/to= p win */ bottom_win_pstate =3D main_win->base.state; @@ -2396,6 +2396,22 @@ static void vop2_setup_cluster_alpha(struct vop2 *vo= p2, struct vop2_win *main_wi vop2_parse_alpha(&alpha_config, &alpha); =20 alpha.src_color_ctrl.bits.src_dst_swap =3D swap; + + switch (main_win->data->phys_id) { + case ROCKCHIP_VOP2_CLUSTER0: + offset =3D 0x0; + break; + case ROCKCHIP_VOP2_CLUSTER1: + offset =3D 0x10; + break; + case ROCKCHIP_VOP2_CLUSTER2: + offset =3D 0x20; + break; + case ROCKCHIP_VOP2_CLUSTER3: + offset =3D 0x30; + break; + } + vop2_writel(vop2, RK3568_CLUSTER0_MIX_SRC_COLOR_CTRL + offset, alpha.src_color_ctrl.val); vop2_writel(vop2, RK3568_CLUSTER0_MIX_DST_COLOR_CTRL + offset, --=20 2.34.1