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 2F37331D727 for ; Thu, 11 Dec 2025 20:41:28 +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=1765485690; cv=pass; b=OpQfEeMulktryAmngVkmI4DeyQabM0U2EvPWM/UQMDnwDPtvcpiOgAndGK9LThPkfIgLLmDuIPt70fzgY8mOiCiOFxji2RYaXI6s0OJcmtxSHUQ9czQDib0xZibbQjXFFoIrdztPXBje1V26FlRO2UzJGFFrtaQ1yTgVctaVt6w= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765485690; c=relaxed/simple; bh=hoxTyLouUCCqOV1h0WsnRKoR9ie67oP8zsPO9XsAo8c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qk5GxJVxU9+9zB/4fbAGdvckKYCN15JGKwwBlrxU89JRGaUZIRySUCQEEB/bPxE6UtDN4tFpQJA3AG0D+fJS3hfIyqWa5ztwEesyqj61K5rc2eWj/uBCqgj8EuEo4eZnYYw5dvNDf6hHkRd+O83q1f+mZiP6VaN1k9gv57Rm4m4= 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=f/DxjadV; 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="f/DxjadV" ARC-Seal: i=1; a=rsa-sha256; t=1765485665; cv=none; d=zohomail.com; s=zohoarc; b=CVjuaOpiZmFd839DhOl+cDzAiQpexFn18TyuR8/CukHEh3wQVZUbjE5NByDijZobaa8ziAhVvwRFZ+Uru45zpPv7yDOuxfvIci4kNYQUSniZNWojK+MJKgWictjPK26XSWgHMv6rmQp6Ojf5TqdyM50tNQaFy6GPBSUeEFJKeh8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765485665; 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=Bqjznx+qlJqbkI0aOagFx15awVy6F52xRGC/v5nMD1ZMfdrsRa6PdlpuYh6TfgBomjI8PVhPjMVp/8Dl/JvYpzDDfu0MKxG3UlrjonKjcKXBcmWrq4Jaz6nsdYCrUqehwYqs9/Pbp0TPcU6LyycCqZEAau6dst75q/jj21eutCc= 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=1765485665; 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=f/DxjadVpk4/dn1DwIbPhjvwYul9oCf4soLnLmuLbm0VPdefCl+pFJcuqdSXeY04 ZlE3Cpe118iOdlGhos8fFvq47oMY/mt4s/9Qwen+LaApkzIidA6/9wCHUcFJ+OyadBE qyt8ZXf6wyneVrH7jYjiGDaOSCKAr6KD5vLgHwQY= Received: by mx.zohomail.com with SMTPS id 176548566344593.21823898905768; Thu, 11 Dec 2025 12:41:03 -0800 (PST) From: Nicolas Frattaroli Date: Thu, 11 Dec 2025 21:40:33 +0100 Subject: [PATCH v4 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: 7bit Message-Id: <20251211-vop2-atomic-fixups-v4-3-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 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_plane *plane, * This is workaround solution for IC design: * esmart can't support scale down when src_w % 16 == 1. */ - if (!(win->data->feature & WIN_FEATURE_AFBDC)) { - if (src_w > dsp_w && (src_w & 0xf) == 1) { - drm_dbg_kms(vop2->drm, "vp%d %s act_w[%d] MODE 16 == 1\n", - vp->id, win->data->name, src_w); - src_w -= 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 == 1\n", + vp->id, win->data->name, src_w); + src_w -= 1; } if (afbc_en && src_w % 4) { -- 2.52.0