From nobody Fri Dec 19 11:32:19 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 228E52DF13A for ; Tue, 9 Dec 2025 11:15:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765278947; cv=pass; b=dO3TFW6A83sTV2X1LGO+x15FT92YQRyCqSRnyQsa9+THQ3vk86mk9K1iidRumdDUedZ8KT6V3BpwlVRR2XcB9LsC0GPhssKNw4zck+DFxwMZ9UI4+4UyFYHzhkyBsI6axJYbo5TAz5MFGZqBKgEU6qsq8n3Rwk2iFBaCsMgLSHk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765278947; c=relaxed/simple; bh=1i/VvpFv3OHpkZ/UFayV4vxxCehO6OHfeU8jFMrOxmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YjXEOBDUfeW3UrUeYoCXVlbJn1wBBXJj3+4QugwvtQr9i2RFFT6SjUn9zATZ6ngpB9zAkKuUqCLvOzrfq5wnm8qOWJ92hBazoi6oL5H48/UF/Lg4I1/dU8QrpJASd7C/Yu3BBVadHmE4iQx3SWaEBwTsitW7Ol1rZA/kvMfTHpY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b=AvEef7IF; arc=pass smtp.client-ip=136.143.188.112 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=collabora.com header.i=nicolas.frattaroli@collabora.com header.b="AvEef7IF" ARC-Seal: i=1; a=rsa-sha256; t=1765278910; cv=none; d=zohomail.com; s=zohoarc; b=EG0l7NEOkFy/3D2p1fbSjykkavUC+ZqKuSinMrdKzBQP2ximO5LswyX5QgwfaH36NprG7X+ui3K2rtSqMBJGV4G9owp6/DXAgmoDnQzsHQ+X92Ab+yB4fMkOn72AyV38bx6k0qpoESfm2A95N2GMqTU/KwksuHBqopgWZiNI2/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765278910; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZLt345x+m80QdbohyKM4Hq5RZfs7ADEKLCvNEvG5VIo=; b=X30pna4CRhCeVghT3Z3hxgmWpJLW02BL+z8Hk9y0Q73d0zTqPxXuKhLBN6wF2Z9FAI/NY8pW2UncGJ3wiTLf4LOhtc+89hPP2n5ndj0zTBLxqCMsVy3wS0l5HmhlgrvBxpNuygqzoSuMpWlslFaxn1uNlmzBUQHXJ/MDwPoKgnY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=nicolas.frattaroli@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1765278910; s=zohomail; d=collabora.com; i=nicolas.frattaroli@collabora.com; h=From:From:Date:Date:Subject:Subject:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Message-Id:References:In-Reply-To:To:To:Cc:Cc:Reply-To; bh=ZLt345x+m80QdbohyKM4Hq5RZfs7ADEKLCvNEvG5VIo=; b=AvEef7IFkZ5K82IYQ6lqWENvOWNwwxBxpM2bo99abRJr4oahnTfaN5wGHaLY2gGZ VEKGdmgVpiXeYBOdOrJwBF0ygTq9OrF4Wj9qpqzo5NqHmA5S356umczo5tdmEZPbrBj p5/vOJNA7h7apQ9+IgWgLu5dqWiddvz+bZcyRIFQ= Received: by mx.zohomail.com with SMTPS id 1765278909282948.4385184735341; Tue, 9 Dec 2025 03:15:09 -0800 (PST) From: Nicolas Frattaroli Date: Tue, 09 Dec 2025 12:14:18 +0100 Subject: [PATCH v3 5/8] drm/rockchip: vop2: Enforce AFBC source alignment in plane_check Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251209-vop2-atomic-fixups-v3-5-07c48f0f1f0d@collabora.com> References: <20251209-vop2-atomic-fixups-v3-0-07c48f0f1f0d@collabora.com> In-Reply-To: <20251209-vop2-atomic-fixups-v3-0-07c48f0f1f0d@collabora.com> To: Chaoyi Chen , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Daniel Stone , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.14.3 From: Daniel Stone Planes can only source AFBC framebuffers at multiples of 4px wide on RK3566/RK3568. Instead of clipping on all SoCs when the user asks for an unaligned source rectangle, reject the configuration in the plane's atomic check on RK3566/RK3568 only. Signed-off-by: Daniel Stone [Make RK3566/RK3568 specific, reword message, s/byte/pixel/] Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 6d4f22872e67..a029ed73dda7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1076,6 +1076,13 @@ static int vop2_plane_atomic_check(struct drm_plane = *plane, return -EINVAL; } =20 + if (vop2->version =3D=3D VOP_VERSION_RK3568 && drm_is_afbc(fb->modifier) = && src_w % 4) { + drm_dbg_kms(vop2->drm, + "AFBC source rectangles must be 4-pixel aligned; is %d\n", + src_w); + return -EINVAL; + } + return 0; } =20 @@ -1237,11 +1244,8 @@ static void vop2_plane_atomic_update(struct drm_plan= e *plane, WARN_ON(src_w < 4); WARN_ON(src_h < 4); =20 - if (afbc_en && src_w % 4) { - drm_dbg_kms(vop2->drm, "vp%d %s src_w[%d] not 4 pixel aligned\n", - vp->id, win->data->name, src_w); - src_w =3D ALIGN_DOWN(src_w, 4); - } + if (vop2->version =3D=3D VOP_VERSION_RK3568 && drm_is_afbc(fb->modifier)) + WARN_ON(src_w % 4); =20 act_info =3D (src_h - 1) << 16 | ((src_w - 1) & 0xffff); dsp_info =3D (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff); --=20 2.52.0