From mboxrd@z Thu Jan 1 00:00:00 1970 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 0316731D72D for ; Thu, 11 Dec 2025 20:41:36 +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=1765485698; cv=pass; b=e3hFBIPVY4HtkxwxcWWqjwMBKAl1+5o0OKevMmK7Gu9w1zb6xr2kgrDzApzMB/PDuKbS/YBC8K2le2Y42CtjKj+6aEW/MrsrmYOanHV84qZJJtfwGgE1Vl+JDjBp3wT1SFdJMvwPWMg9RS6I4OiaYFO6ax1qjFiXlGV15bI+aAA= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485698; c=relaxed/simple; bh=fLFJQl9FaH4IIauBQwO2yduvT5F32Kne5N3RtmxPoDc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aRUbr4UAKTDIpqhKwPegM9zf3zmpDE+WAxyKdrj5gkdoVB0+yZ+zTuJypnWUskBz8s0zgXUt5IjFBzGUFScU5bK74QZuMcfjGNSOboRf+16cdmwhhkGN/0WfQjIeZXlx43b9PVRyw20LhxBwwUEDd7Yky2DgAy4avMDrAJkb3sI= 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=dc67R15q; 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="dc67R15q" ARC-Seal: i=1; a=rsa-sha256; t=1765485675; cv=none; d=zohomail.com; s=zohoarc; b=SM93lxQiW4LcweqKqMcty4X7vhp0z4V6JTB0K1qbtUwf8malv2yqlGimsFCq5fSA3yHXNNgjI5iirnwc5xdFbuHgTpkI53+PtxApQRzvFSpAhL8x1WhpNzGAUbajNU+SC6Va+EwcImmUgyQCZjrWfq2fbw3BTSk3I+g8xmiRYnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765485675; 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=QIQN7Mfe3rRMl2qTWZlCtYbXq8tihpYciZ+DDNnUGgk=; b=hpRkuwh8oY1JK3u1Zj7txor7wTP1w8pqgSHCXm59req2dAtNGsCUQv5Q1grx+1r08tTD3O0u2XMXMukh6npFhgghvx+mHEqed0RfNq6eRtX6wK0w1TVUpA1zU91l+crIplgjTSGna9Xy6kUNnDZMp/l9R3eg986I1ab0iW/cfM8= 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=1765485675; 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=QIQN7Mfe3rRMl2qTWZlCtYbXq8tihpYciZ+DDNnUGgk=; b=dc67R15qE7h2gQIpnZwnHae5HPmeY5B/Njm0VtEpXLpHj76mnk7+JJB7kVUMFc1G 2aX4oBNOTshoRinmrRmvIKu4ryhXMdeBSUHbK64ViluTt1EQ5CF80h9iBOAhVHDgOaI gZSuNbrQwYffi7jdSG9k1rxkfdV2MfQ2wD0X7EMk= Received: by mx.zohomail.com with SMTPS id 1765485675086720.2234025840241; Thu, 11 Dec 2025 12:41:15 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 11 Dec 2025 21:40:36 +0100 Subject: [PATCH v4 6/8] drm/rockchip: vop2: Enforce AFBC transform stride align 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: 7bit Message-Id: <20251211-vop2-atomic-fixups-v4-6-5d50eda26bf8@collabora.com> References: <20251211-vop2-atomic-fixups-v4-0-5d50eda26bf8@collabora.com> In-Reply-To: <20251211-vop2-atomic-fixups-v4-0-5d50eda26bf8@collabora.com> To: Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Chaoyi Chen Cc: dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Stone , kernel@collabora.com, Nicolas Frattaroli X-Mailer: b4 0.14.3 From: Daniel Stone Make sure we can't break the hardware by requesting an unsupported configuration. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index a029ed73dda7..1d12e00ec49f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1083,6 +1083,15 @@ static int vop2_plane_atomic_check(struct drm_plane *plane, return -EINVAL; } + if (drm_is_afbc(fb->modifier) && + pstate->rotation & + (DRM_MODE_REFLECT_X | DRM_MODE_ROTATE_90 | DRM_MODE_ROTATE_270) && + (fb->pitches[0] << 3) / vop2_get_bpp(fb->format) % 64) { + drm_dbg_kms(vop2->drm, + "AFBC buffers must be 64-pixel aligned for horizontal rotation or mirroring\n"); + return -EINVAL; + } + return 0; } @@ -1290,9 +1299,6 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, * with WIN_VIR_STRIDE. */ stride = (fb->pitches[0] << 3) / bpp; - if ((stride & 0x3f) && (xmirror || rotate_90 || rotate_270)) - drm_dbg_kms(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n", - vp->id, win->data->name, stride); /* It's for head stride, each head size is 16 byte */ stride = ALIGN(stride, block_w) / block_w * 16; -- 2.52.0