From nobody Fri Dec 19 11:32:20 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 9EF3E320A30 for ; Tue, 9 Dec 2025 11:15:53 +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=1765278955; cv=pass; b=PSRkvkH63sU5MNDfsUyVudxoLjvwnx7DD/Xs8t5jraUeIxU1ljMecN2kFFQ+NBQf2fH5h1S5abLJKltFVeneGNKeu3F8KawX8PyXZ4V18JgapYwAcZAreg/yllOGFuPadULtVKsxSBNkwNjt0WcYRmAEaaziDobcEVF/kRxL+a0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765278955; c=relaxed/simple; bh=hoxTyLouUCCqOV1h0WsnRKoR9ie67oP8zsPO9XsAo8c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HkLNZOd1h5SDSiBTPR2sTImDhJM5yk2sYXQNWr8CntVCrd9O9aQnk632BA7joFaNdpa931LI0Q9YuB4qkjMCqeQ0FH5txVzNuvWT+8etTaTMcJmsi1UH1QY/Tg7EKYyAH4hU9+bf1xzYFAWPxmrJsCeX7Ok+QYcZ+ocQ2nTUoG0= 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=hgfjnUwK; 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="hgfjnUwK" ARC-Seal: i=1; a=rsa-sha256; t=1765278902; cv=none; d=zohomail.com; s=zohoarc; b=XC4SC3KkKQ7GO3dIKZW6VrkIe5LB95jLxGpeMIq18SM3ZtChpHATaju+CTP+QRZ4mHgQqaIOX6lSOO+EBhKmR+hFdrgIozll6wtPMzj+gfUwLqf9gPYunNtJlPBor2RA2lomDipvREAgb1hIdi0Oz6BygQAT1euBfIUNsA/qD5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765278902; 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=Yix2VtVAthNOkhvZWCl2bJyUJbLX6oYb/22YOA7QIzE=; b=OTs1CxtkcufyquRlMA3AhY4I/ehCeO8a77ex6dECwBRISDWtDwMTUTKevCghOje3b6F7GsxEA82+HmIxIYFVov8Ts7oa5IT0oINklAD4YrReKq99NQxkGMrcgxoggqECn3JLvk1QcXAWv6nPhEGOx9Uj/86BqCsRaA5ZbNH4WNQ= 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=1765278902; 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=Yix2VtVAthNOkhvZWCl2bJyUJbLX6oYb/22YOA7QIzE=; b=hgfjnUwKg4ZYtlC9LS6jxO/Qe9EYMeD+GLooSCAcVT65Ywz65E6T6IM/gmlj6pnj XZAw1w58abuhIGuIxy3Hl+2vj/UdDTdk/oyqX9kypzHB5jT7OensadB3VBFj3ITu8K6 iZiayudZcqRaQlCM4Fbl5cpEIgDwzWghtWidITKw= Received: by mx.zohomail.com with SMTPS id 1765278900902951.2741005817111; Tue, 9 Dec 2025 03:15:00 -0800 (PST) From: Nicolas Frattaroli Date: Tue, 09 Dec 2025 12:14:16 +0100 Subject: [PATCH v3 3/8] drm/rockchip: vop2: Fix Esmart test condition 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-3-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 If we want to find out if a window is Esmart or not, test for not being a cluster window, rather than AFBDC presence. No functional effect as only cluster windows support AFBC decode. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 81b3eba07095..9d715d7659af 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1230,12 +1230,10 @@ static void vop2_plane_atomic_update(struct drm_pla= ne *plane, * This is workaround solution for IC design: * esmart can't support scale down when src_w % 16 =3D=3D 1. */ - if (!(win->data->feature & WIN_FEATURE_AFBDC)) { - if (src_w > dsp_w && (src_w & 0xf) =3D=3D 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 (!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; } =20 if (afbc_en && src_w % 4) { --=20 2.52.0