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 7F18E31D399 for ; Thu, 11 Dec 2025 20:41:35 +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=1765485697; cv=pass; b=uFARnjrwSoaovGtswQk3sAjf1r6vyvzRaWnsKOYKtRmByLSq6vwmXIDJinYdmSNTnoEbQoqo1bS07WUwGqkipBmOcY8MVdAGYqeLX77UezB+7cccSDRuBFqn/fEjehuqM6CPhlDPfu7ii28EHytUp3Z2EDNBOpn/owyYR23MlEM= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485697; c=relaxed/simple; bh=1i/VvpFv3OHpkZ/UFayV4vxxCehO6OHfeU8jFMrOxmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Jo7NXVi+4N/S8LFeBSRlfE5E9T8y/XDLYQMsBdVe0leCnEeizANqAKFCoDcSLPmajGA2Pf5k0XJG01euBTs2Qs6jeHtVtvd8Y7clPt8VDqbyr0WXQQkVFDtBAlD8/wyqsSDrOLDOTc0sAT7DJ9HHH1lXc+XX+ByhgV6cEJN1RQc= 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=kRHovfU/; 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="kRHovfU/" ARC-Seal: i=1; a=rsa-sha256; t=1765485673; cv=none; d=zohomail.com; s=zohoarc; b=O1GN1e9Bf9z+bXDx3Tqp6IvzzxxjUK1bhGrYrNDsf05IYWg8NHAakZ7e4sJ3Pka7D3B5Jqq/GSoOvzw1ycxMqvVcZP+Anv4oGt+Y6wGgeqofsyiK3+R2/tm+Nd3sZHa6SPXbsmcRBhdTfr65YWJa8qUprg84mvF/h4NoAYHhPnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765485673; 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=Nyr3l7bnOu1q7Gp71+q8X24J4SIx6VTKMAU0SBZa8TVRXo3myoGFIeGrSwI58SMIvugNZ036HtC9VWs5YjTwwRrhAITwUHcvuKS3pO+V90B5NM35UbxsBI2yoC0Jeos8hD6AVbek/CfSJffJUBlYpJU3sXIfugXPLzzHFJdUX7o= 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=1765485673; 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=kRHovfU/F3xMmSLOcPlLccLih3qJyPkzlXEpA3n8DsVnOnKu8IKpeHFMhu6++MtV X7k9HOLlTNqPi/Rb/MVdw2FmWP+hWeB2B7gMleOjy9XPv95oz9qqzezIbokzZ/38kI9 3KTgXzvyblSrbCskjdm7GQDsXDNN1VN+zJYcdAtQ= Received: by mx.zohomail.com with SMTPS id 1765485671283253.77550384595816; Thu, 11 Dec 2025 12:41:11 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 11 Dec 2025 21:40:35 +0100 Subject: [PATCH v4 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: 7bit Message-Id: <20251211-vop2-atomic-fixups-v4-5-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 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; } + if (vop2->version == 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; } @@ -1237,11 +1244,8 @@ static void vop2_plane_atomic_update(struct drm_plane *plane, WARN_ON(src_w < 4); WARN_ON(src_h < 4); - 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 = ALIGN_DOWN(src_w, 4); - } + if (vop2->version == VOP_VERSION_RK3568 && drm_is_afbc(fb->modifier)) + WARN_ON(src_w % 4); act_info = (src_h - 1) << 16 | ((src_w - 1) & 0xffff); dsp_info = (dsp_h - 1) << 16 | ((dsp_w - 1) & 0xffff); -- 2.52.0