From nobody Fri Dec 19 14:38: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 1D35D2D877C for ; Sat, 6 Dec 2025 20:46:18 +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=1765053981; cv=pass; b=l/eAN1qEu8kzmsarpcKUl3docXSlmgJcn41TAojKs/7kBZhfnVdjaVv8N++TbpqNxjMlQk9QIrLak4ESeUmAUlkU+XlybeaP/bluqJblUMl80dy0RcbFx1s2GJW9OYy0WPQMWG+8iQbOBxz1C2Qf8YprNfeKi+8GPTjb3ZI7zKs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765053981; c=relaxed/simple; bh=qXE5LhM6iSNg485hQXPiKU/8V9xmLOfcub8MBixUei0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ItvubumYjbnaRhZxZ7iPnFhZ3IOQJ9c/qmMx2Do8sWOfwSxqG1UuH1WWArX4go6yEiKEGEznSw0bHef74zUDbmqOp1Pk/s6YY7dIHuMofG7cO7e5I9BMv2gdUUkfHX/vZeOUQONnHC7BTdc32YlFN+8KLJ7q8O2sHOgCq6RoEfg= 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=aTyfgzyK; 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="aTyfgzyK" ARC-Seal: i=1; a=rsa-sha256; t=1765053952; cv=none; d=zohomail.com; s=zohoarc; b=kbaWUB1PCJgkXehwdOxd353El/GAykILQlBOFl+lWSuhXiIwzoXIwPYiS8BT0pAytMXqU012w+NkRKAdG+aMFxEj7C5UKLChZQ6nLIqGztmoJ+UfouGXYBYmqKTy/w61KG12dj/RM/QzV7H1omi1eZ5WpVchtIfCqqv/JlHm78U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765053952; 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=G0aqthGYccBDaPtwYeA4PF5vLiTR97ZedQGGVTxxz9Q=; b=cSR8ERIVx2tHdMREAFZYtHP6SY3jl/CJ5y2mYqwyLGQtLyCPdKNa75TypoxXOWpJY3hRkjNN7Csbeuj4FFThPGR2uzOHNY7+wAbnOVLc+IxKDMMUYJ8Gr+aT6utNjdz6TA5rDxrxr4sz9ttcyx6EZxrFTc0es+Z+1/iq7XlwEfM= 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=1765053952; 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=G0aqthGYccBDaPtwYeA4PF5vLiTR97ZedQGGVTxxz9Q=; b=aTyfgzyKGnXfRTuJdzCV7aKoniLCMwC/BIinK4PTLHvPG63CSWdKjiEzlqfnsNim Pji2aEnq5ozhcw3MWyfIYNsFMhqDx+YcGGLY9u9/dVK3Eo5MELFPjS9GRRrP4DlvoRb SOHaI0wS4l0vSgiZr3Fqpok2yCXU7OV6JBOSlxM0= Received: by mx.zohomail.com with SMTPS id 1765053951890283.3847103890606; Sat, 6 Dec 2025 12:45:51 -0800 (PST) From: Nicolas Frattaroli Date: Sat, 06 Dec 2025 21:45:14 +0100 Subject: [PATCH v2 4/8] drm/rockchip: vop2: Enforce scaling workaround 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-4-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 It seems only cluster windows are capable of applying downscaling when the source region has an odd width. Instead of applying a workaround inside atomic_update, fail the plane check if this is requested. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 9d715d7659af..bc1ed0ffede0 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -998,6 +998,7 @@ static int vop2_plane_atomic_check(struct drm_plane *pl= ane, struct drm_crtc *crtc =3D pstate->crtc; struct drm_crtc_state *cstate; struct vop2_video_port *vp; + struct vop2_win *win =3D to_vop2_win(plane); struct vop2 *vop2; const struct vop2_data *vop2_data; struct drm_rect *dest =3D &pstate->dst; @@ -1065,6 +1066,16 @@ static int vop2_plane_atomic_check(struct drm_plane = *plane, return -EINVAL; } =20 + /* + * This is workaround solution for IC design: + * esmart can't support scale down when src_w % 16 =3D=3D 1. + */ + if (!vop2_cluster_window(win) && src_w > dest_w && (src_w & 1)) { + drm_dbg_kms(vop2->drm, + "eSmart windows cannot downscale odd-width source regions\n"); + return -EINVAL; + } + return 0; } =20 @@ -1226,16 +1237,6 @@ static void vop2_plane_atomic_update(struct drm_plan= e *plane, WARN_ON(src_w < 4); WARN_ON(src_h < 4); =20 - /* - * This is workaround solution for IC design: - * esmart can't support scale down when src_w % 16 =3D=3D 1. - */ - if (!vop2_cluster_window(win) && src_w > dsp_w && (src_w & 1)) { - drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 =3D=3D 1\n", - vp->id, win->data->name, src_w); - src_w -=3D 1; - } - 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); --=20 2.52.0