From nobody Wed Dec 17 18:05:39 2025 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2E68722488B; Mon, 9 Dec 2024 12:30:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747433; cv=none; b=YpSkMsBW47Oy3FM3I7ibTOg3JXwf11Z+W1NoeLatbYGvq84J4jLBL/wA//GcqEbxRKnoyn6XKIBak60Xz326aWcPsQML7tx+3+YfkSBzlCN9fkXNUfEkyi00/O0o9HHQzNUzSCcUGHAeC3n6zNjGY9E0PDta1stCjy1cMH1Qmds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733747433; c=relaxed/simple; bh=Ap6AsJhWPaBUo/taP+rQqg50EoeFg0cEU1i+IMg0t1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ol+BUXy8N+eJDg1kLbugyLNjzwzINCiaMCQv3ij4zddc9GwqYks1Fj9pntEHKGcPpiay8s1KZxYx8Tox3q+U0sW2X52O8A0FsE1XgoOEbj+qWPT87lZdGboEjr9Q3H/45CEDS1PxNUjsWPLny0sn7XD5p9/Ix41JacsHjuMxWYs= 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=eK72myrv; arc=none smtp.client-ip=117.135.210.4 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="eK72myrv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=Uexre qH3M5KxsOjGic5xeNRHOajr4xlYzUnHlICmxAQ=; b=eK72myrvcmimG1aAV3rD5 KCyinKCO3fSU7FORWspw1Gn++ng4jqNwjhKe53wqDYh0lWRm7XNTp02b+rV5RIwA 1rinoY32ZFpKmHa/wio4p7jttloiarO3ecNCNG4EPi2x8GKG/eSGUDIiPkSgZECY 54lHEPcir6M/h4B0K6dI74= Received: from ProDesk.. (unknown [58.22.7.114]) by gzsmtp1 (Coremail) with SMTP id PCgvCgD3Woe44lZnubZICA--.5849S9; Mon, 09 Dec 2024 20:29:55 +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 04/18] drm/rockchip: vop2: Fix the windows switch between different layers Date: Mon, 9 Dec 2024 20:29:17 +0800 Message-ID: <20241209122943.2781431-8-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--.5849S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxZw4fWF4DAFW5Cr17Kw4xtFb_yoW5CF13pF 15WrWYgw4UKF4aqF9rtr48uF4Yy397Gay7W3Wxtw1rGa48tr1DJan8Ar9ayryUGFn3uryj yr1Uur909FWUtF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jsF4iUUUUU= X-CM-SenderInfo: 5dqg52xkunqiywtou0bp/1tbiqQqwXmdW3c3WHAACsk Content-Type: text/plain; charset="utf-8" From: Andy Yan Every layer of vop2 should bind a window, and we also need to make sure that this window is not used by other layer. 0x5 is a reserved layer sel value on rk3568, but it will select Cluster3 on rk3588, configure unused layers to 0x5 will lead alpha blending error on rk3588. When we bind a window from layerM to layerN, we move the old window on layerN to layerM. 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 | 38 +++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 1f0fa153c62e..dc4edd65bc9e 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -2541,7 +2541,9 @@ static void vop2_setup_layer_mixer(struct vop2_video_= port *vp) struct drm_plane *plane; u32 layer_sel =3D 0; u32 port_sel; - unsigned int nlayer, ofs; + u8 old_layer_id; + u8 layer_sel_id; + unsigned int ofs; u32 ovl_ctrl; int i; struct vop2_video_port *vp0 =3D &vop2->vps[0]; @@ -2585,9 +2587,28 @@ static void vop2_setup_layer_mixer(struct vop2_video= _port *vp) for (i =3D 0; i < vp->id; i++) ofs +=3D vop2->vps[i].nlayers; =20 - nlayer =3D 0; drm_atomic_crtc_for_each_plane(plane, &vp->crtc) { struct vop2_win *win =3D to_vop2_win(plane); + struct vop2_win *old_win; + + /* + * Find the layer this win bind in old state. + */ + for (old_layer_id =3D 0; old_layer_id < vop2->data->win_size; old_layer_= id++) { + layer_sel_id =3D (layer_sel >> (4 * old_layer_id)) & 0xf; + if (layer_sel_id =3D=3D win->data->layer_sel_id) + break; + } + + /* + * Find the win bind to this layer in old state + */ + for (i =3D 0; i < vop2->data->win_size; i++) { + old_win =3D &vop2->win[i]; + layer_sel_id =3D (layer_sel >> (4 * (plane->state->normalized_zpos + of= s))) & 0xf; + if (layer_sel_id =3D=3D old_win->data->layer_sel_id) + break; + } =20 switch (win->data->phys_id) { case ROCKCHIP_VOP2_CLUSTER0: @@ -2636,13 +2657,12 @@ static void vop2_setup_layer_mixer(struct vop2_vide= o_port *vp) 0x7); layer_sel |=3D RK3568_OVL_LAYER_SEL__LAYER(plane->state->normalized_zpos= + ofs, win->data->layer_sel_id); - nlayer++; - } - - /* configure unused layers to 0x5 (reserved) */ - for (; nlayer < vp->nlayers; nlayer++) { - layer_sel &=3D ~RK3568_OVL_LAYER_SEL__LAYER(nlayer + ofs, 0x7); - layer_sel |=3D RK3568_OVL_LAYER_SEL__LAYER(nlayer + ofs, 5); + /* + * When we bind a window from layerM to layerN, we also need to move the= old + * window on layerN to layerM to avoid one window selected by two or mor= e layers. + */ + layer_sel &=3D ~RK3568_OVL_LAYER_SEL__LAYER(old_layer_id, 0x7); + layer_sel |=3D RK3568_OVL_LAYER_SEL__LAYER(old_layer_id, old_win->data->= layer_sel_id); } =20 vop2_writel(vop2, RK3568_OVL_LAYER_SEL, layer_sel); --=20 2.34.1