From nobody Wed Dec 17 06:12: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 D59083328FA for ; Mon, 15 Dec 2025 14:12:56 +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=1765807978; cv=pass; b=OPRJzjtY62FXaZ059M0MDSg7pNb1lAfHAQiQv+1sY/i5X4VojrTChJON5fTOkZVfnfVTSVVlrDcd+V8E31rc3u5NBxnqwJ6n/6fJlK0shrjJIpH2kKBcLEGuLXZjLuHvlRYrh9vwW10BRpsEYKMAsglcba1YwQqSbQoxKkVWCoM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765807978; c=relaxed/simple; bh=3sO7Mcj5CIoJxaPBxyb7708hSWdXMN1EeSAT/ily49U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iMbzbNA3xDvRxFkjYYvLCZL4uQ7WzQjFwQuIcdW6UbiXMqxxkXxnWIqajp4jaro0TkLHK6YHXAeAiXuqboJZvs3CxEGVSZrgyEvRQk0CZ7yWFP8lO0wb5ZfTgESHrrAuXrsXXZLscl4Oxi7TAgF4CXp95QCYdwcWuU6ZrD0wR/4= 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=jOIq6HiD; 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="jOIq6HiD" ARC-Seal: i=1; a=rsa-sha256; t=1765807930; cv=none; d=zohomail.com; s=zohoarc; b=lZ8rFTdi8PmRu+tQO4v+O0xTqoaSQ5nX2ukgNBUgnpyhoezI3uS+dsp8CoozRDgHdDDaUGcRdDeA91/OrPXL8+XRVRdwcvO6eVJVUDuTuIaVR0XU9XVGgAk+yYtcKU+sEig7SF66so6asE08Cd4oNWkGh9kHXHW5o9Q8UOzZx8s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765807930; 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=BrCltiwnJeJBxnCzg3Wzx1kxB2QTTch2UaqTtqQ6q/I=; b=heM+3J9JMnuPyDuF1y/G3JzsOcw6MZBRIVfPFAB5/gjJg4mCugQGvOLxgz/xbKUFgHNVYkWbtndeHjZbf/6Mu3esIJqwwn2zgAXt3a2vt3zZB1W5CjZXEJNY2a3Q+FKNmdjD29c782wZLCjHNqrqZPIKqlMhaoE3VJ++WEgj1e4= 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=1765807930; 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=BrCltiwnJeJBxnCzg3Wzx1kxB2QTTch2UaqTtqQ6q/I=; b=jOIq6HiDjqQ5IHAZXt/4jCuh0XQxPka8HHLJ5oGn3m0UZZTVstqXXEBPkI3EDQnq mMz8IasfLT+h7wjJwuquHYF9TACbep3QXiZJSEFSGdCEAZRQV7bGo1IK7K9RI883KK4 iCc1CAVs0b2B7HtEI2HcZ8nxQfFz8M28s7F46ygg= Received: by mx.zohomail.com with SMTPS id 1765807924696668.2202797637121; Mon, 15 Dec 2025 06:12:04 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 15 Dec 2025 15:09:24 +0100 Subject: [PATCH v5 8/8] drm/rockchip: vop2: Simplify format_mod_supported 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: <20251215-vop2-atomic-fixups-v5-8-83463c075a8d@collabora.com> References: <20251215-vop2-atomic-fixups-v5-0-83463c075a8d@collabora.com> In-Reply-To: <20251215-vop2-atomic-fixups-v5-0-83463c075a8d@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: David Laight , 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 it a little less convoluted, and just directly check if the combination of plane + format + modifier is supported. Signed-off-by: Daniel Stone Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 56 +++++++++++-------------= ---- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 707b48c7e9d8..a0099e4dd4ea 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -367,59 +367,47 @@ static bool is_yuv_output(u32 bus_format) } } =20 -static bool rockchip_afbc(struct drm_plane *plane, u64 modifier) -{ - int i; - - if (modifier =3D=3D DRM_FORMAT_MOD_LINEAR) - return false; - - for (i =3D 0 ; i < plane->modifier_count; i++) - if (plane->modifiers[i] =3D=3D modifier) - return true; - - return false; -} - static bool rockchip_vop2_mod_supported(struct drm_plane *plane, u32 forma= t, u64 modifier) { struct vop2_win *win =3D to_vop2_win(plane); struct vop2 *vop2 =3D win->vop2; + int i; =20 + /* No support for implicit modifiers */ if (modifier =3D=3D DRM_FORMAT_MOD_INVALID) return false; =20 - if (vop2->version =3D=3D VOP_VERSION_RK3568) { - if (vop2_cluster_window(win)) { - if (modifier =3D=3D DRM_FORMAT_MOD_LINEAR) { - drm_dbg_kms(vop2->drm, - "Cluster window only supports format with afbc\n"); - return false; - } - } + /* The cluster window on 3568 is AFBC-only */ + if (vop2->version =3D=3D VOP_VERSION_RK3568 && vop2_cluster_window(win) && + !drm_is_afbc(modifier)) { + drm_dbg_kms(vop2->drm, + "Cluster window only supports format with afbc\n"); + return false; } =20 - if (format =3D=3D DRM_FORMAT_XRGB2101010 || format =3D=3D DRM_FORMAT_XBGR= 2101010) { - if (vop2->version =3D=3D VOP_VERSION_RK3588) { - if (!rockchip_afbc(plane, modifier)) { - drm_dbg_kms(vop2->drm, "Only support 32 bpp format with afbc\n"); - return false; - } - } + /* 10bpc formats on 3588 are AFBC-only */ + if (vop2->version =3D=3D VOP_VERSION_RK3588 && !drm_is_afbc(modifier) && + (format =3D=3D DRM_FORMAT_XRGB2101010 || format =3D=3D DRM_FORMAT_XBG= R2101010)) { + drm_dbg_kms(vop2->drm, "Only support 10bpc format with afbc\n"); + return false; } =20 + /* Linear is otherwise supported everywhere */ if (modifier =3D=3D DRM_FORMAT_MOD_LINEAR) return true; =20 - if (!rockchip_afbc(plane, modifier)) { - drm_dbg_kms(vop2->drm, "Unsupported format modifier 0x%llx\n", - modifier); - + /* Not all format+modifier combinations are allowable */ + if (vop2_convert_afbc_format(format) =3D=3D VOP2_AFBC_FMT_INVALID) return false; + + /* Different windows have different format/modifier support */ + for (i =3D 0; i < plane->modifier_count; i++) { + if (plane->modifiers[i] =3D=3D modifier) + return true; } =20 - return vop2_convert_afbc_format(format) >=3D 0; + return false; } =20 /* --=20 2.52.0