From nobody Fri Dec 19 14:38:17 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 B81042DCBE3 for ; Sat, 6 Dec 2025 20:46:24 +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=1765053987; cv=pass; b=IISTwHf58tt6TH20yvQ1CDYCRFpr34mvn7f2l+mkVXEX0qFsEtoaFKiAlJLqlzNtQ7TuTs8R0Q8Guxt7wYH0Q6tLv2VRzGyG+OIXf/4dcoSoO/Kbgf1iwCPxtCCMlK/x+jHOXpQ/e2k5nlDdoUoq77u09NfcnQpm3C3Dm3Qwpq0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765053987; c=relaxed/simple; bh=/1jIqERbF5HVQJB+iiR0WtKNfV9vq1OynICIFs+YOTk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uW9dXLxsg/7I5/nJVK2E8KLLXVS5X3rX9sSy/fTjAWCsVOkOqjMgYDOcHmO7WhNJ/9XLExZiiAZUU8TMYs0ZcumATJ6+OiNAq//F+f88y9uq+6+Dje9LpLgF2/mm9KPqHb1/Pkehh1RZxTEQX+XfhPdxi5upXBsGgbxMLpFmU0I= 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=hkeEnB/I; 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="hkeEnB/I" ARC-Seal: i=1; a=rsa-sha256; t=1765053956; cv=none; d=zohomail.com; s=zohoarc; b=ITPQ220Dv+ja9WoCT0KDih4EzAOaRP1kG1Bm+CXUiYnjTFKj5FbN6CStKaKVlJ1Jp51amjO1SHzTziIne9vayFz6fIal/gBAQOCX9ehWLuWR6rvu8BgSpaRF7iV6pCt7Fd7d3Ho0IuaShGDKO7pbCteLMS5AXjNqN+gfjha8PBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765053956; 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=OXrmn9V5yp3R+LcTXtaXe7SnaMWebiHUR5EHbA4dxz0=; b=VHRXiZhNr5QD5PVq3NztbIBms1mW3gOvn+E15yHCZVB4V9/KywJ7kOp0iorHNMK0/Fuf2DW1MGWnJjEH3SaZEDtM+E8vCOkc4iIjjPbeQv/D5/zs5wA2S2ej9ivJj1HTjKzmUTvgC7ZT4CQwEluc7bn6h3Vv8CTNMfjgFRa/WeM= 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=1765053956; 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=OXrmn9V5yp3R+LcTXtaXe7SnaMWebiHUR5EHbA4dxz0=; b=hkeEnB/IzscPr3AQllUK6pmj6eSojy92DRBqPtlI7xuaV2TlPPdtoNTX9mRwpTfo SOZ2GUh0MTkP2ZPfwQTdvBx8b+Iwsc2T6+RAtQ6MgBvHa4NGEq/SGBnWf4Kk6FiqQwb M1F7UeRaYSe82GRe45vrBN3sAvpcDOOYuURdZPXI= Received: by mx.zohomail.com with SMTPS id 1765053955301342.1403973857058; Sat, 6 Dec 2025 12:45:55 -0800 (PST) From: Nicolas Frattaroli Date: Sat, 06 Dec 2025 21:45:15 +0100 Subject: [PATCH v2 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: <20251206-vop2-atomic-fixups-v2-5-7fb45bbfbebd@collabora.com> References: <20251206-vop2-atomic-fixups-v2-0-7fb45bbfbebd@collabora.com> In-Reply-To: <20251206-vop2-atomic-fixups-v2-0-7fb45bbfbebd@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Stone , 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] 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 bc1ed0ffede0..e23213337104 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-byte 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