From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7031527D786; Tue, 27 May 2025 17:33:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367191; cv=none; b=q1efYo3vTgW0QC+OLPoqUDHi+zoKj+ryg8fYFwNzG8XTLD3qbRLy6yM6IUzkjyx3AgNfjr7K+JRie3CfgrVN8GcVoeBPBVuV/vN0FZ4qjRS2ga+RQ/jrniZdHujcIz7TdOL2n5ipuW7EQHv7G/V3bfL7iXKqIi8Xi4Zex4J33eU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748367191; c=relaxed/simple; bh=CxmHixaqJLFOkRMA1zSPaB8I+8btbnhamV0VyNf+wwU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CvB8/8eG6Mem3craGmP0b1LwHYGSZw+4Mn3MDFcxsC9/uDlzifeqTv7VTCSpRygWpdHWUJg4eO2Ifq8kQ96reA9x/zrK2dZxeq0uo3vRDv5d6sZ3i3RgcEWs7wSibCzihfERLRBiHTgBY5VPHJX4/LmrR7Y6awFGGxdtbgpDi+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=b4Zhpnn2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="b4Zhpnn2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1D16C4CEE9; Tue, 27 May 2025 17:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748367191; bh=CxmHixaqJLFOkRMA1zSPaB8I+8btbnhamV0VyNf+wwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b4Zhpnn2iyYqEaeVHaGyrdfrYtU1PEIAoP5z5z+ERTRVclTxjxvaz6IDyflOBTKXE RZuFxBxeALnFLJ6J++350AsSAmRTSVPVZQVKjNVXxekLJOgwkGqTzcbPzyU1uc7nTA FjcWQIH0S3dSI6d7BPFXIFu4GRVKWOiCs95QmAuA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Yan , Detlev Casanova , Heiko Stuebner , Sasha Levin , Michael Riesch Subject: [PATCH 6.14 307/783] drm/rockchip: vop2: Add uv swap for cluster window Date: Tue, 27 May 2025 18:21:44 +0200 Message-ID: <20250527162525.572146806@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250527162513.035720581@linuxfoundation.org> References: <20250527162513.035720581@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Yan [ Upstream commit e7aae9f6d762139f8d2b86db03793ae0ab3dd802 ] The Cluster windows of upcoming VOP on rk3576 also support linear YUV support, we need to set uv swap bit for it. As the VOP2_WIN_UV_SWA register defined on rk3568/rk3588 is 0xffffffff, so this register will not be touched on these two platforms. Signed-off-by: Andy Yan Tested-by: Michael Riesch # on RK3568 Tested-by: Detlev Casanova Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20250303034436.192400-4-andyshrk@163.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 17a98845fd31b..64029237358d8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1547,10 +1547,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, rb_swap = vop2_win_rb_swap(fb->format->format); vop2_win_write(win, VOP2_WIN_RB_SWAP, rb_swap); - if (!vop2_cluster_window(win)) { - uv_swap = vop2_win_uv_swap(fb->format->format); - vop2_win_write(win, VOP2_WIN_UV_SWAP, uv_swap); - } + uv_swap = vop2_win_uv_swap(fb->format->format); + vop2_win_write(win, VOP2_WIN_UV_SWAP, uv_swap); if (fb->format->is_yuv) { vop2_win_write(win, VOP2_WIN_UV_VIR, DIV_ROUND_UP(fb->pitches[1], 4)); -- 2.39.5