From nobody Thu Apr 16 12:25:03 2026 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 2AAEF3C196F; Fri, 27 Feb 2026 19:21:38 +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=1772220101; cv=pass; b=QlcVXEuT6gnGjhanJnDNyQlsyGfHx0qKh8Ms9XA5wLnuXGtvmESA6Y0GmFJKCVdU244+DTfH8TWtBQnLBsgINCim4aZENqN/MGUNlMcfZ7rttBti9izeGPQwm4p1384e1ijwbZ1AAurHxHl+G6CP/t82yXN5bOw9mNlaOpYolG8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220101; c=relaxed/simple; bh=1cCiPGMcroBbqrKQli5X/v6Op9oChqJ7ye+kSfmb0Ko=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VbQrRzi4zjQIxTOzjzqNdTWVa1QscdHSWY8crqbc+C5C8qnFnvha33lNmeKcTcPwKl9TtcsyR8IDIeQsudrYfFz0TOS8GO1tazswdOiFEaef6dk5K/foieWtasKNmut7TCOWBiznA+n/fSgMMYfYy94pFbqoLNz+JZQpMfJSSh0= 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=ALaO+RUu; 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="ALaO+RUu" ARC-Seal: i=1; a=rsa-sha256; t=1772220043; cv=none; d=zohomail.com; s=zohoarc; b=JGMRsMIfxoMGP7fGDGO2Q7Rrvv/gpLTotDfrBB329bKfFs25d+EweSKGqRNx9hsT1do2/M3GbcuY2gsYAe95osj8r9iQVV7DfqwKbRXxYcE8b/9GltpsouKK7/9o2oeQC3eCMy5RTjGVvGEH2wwEwhH6wWm2c9WgsQD5d4zYKa8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220043; 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=JGfV0R4Z96tYL3Bf2XqpwWlEz7+KZEZ8gusjeuqSK2Q=; b=nfczNW1oUkfsGqeRzAuLYebcpBi8Cwb4VHh29XovLBYFptoS6j/u9pAJpUGGpi5EVM8dua5EXN4+c71iXBUFWrM7gEomwe4jWoTxX6U7W2BiF1w99I0QA2P1/5OScbBry0mIKiDbAlvvJPUqiI9GyX+VoiF5uBeMJgajyofNS64= 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=1772220043; 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=JGfV0R4Z96tYL3Bf2XqpwWlEz7+KZEZ8gusjeuqSK2Q=; b=ALaO+RUuvYXGccCfTACukQlAU1epUJzVVUVcLx7JaYhVdSGzH5eqWpF+hXbcvWDi oeG9mu4TYQH/wQuBcsrxDqDEnCmdj66BS6JNnhpa36EHEG6zgTZeJtpGnUwC4QxIEz0 JMBq1I/4Tf6gi5e/bQO8pIbdyI3P1drCH/uW1dls= Received: by mx.zohomail.com with SMTPS id 1772220041335611.1012695620195; Fri, 27 Feb 2026 11:20:41 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:06 +0100 Subject: [PATCH v9 01/19] drm/amd/display: Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A 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: <20260227-color-format-v9-1-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Werner Sembach , Andri Yngvason X-Mailer: b4 0.14.3 From: Werner Sembach Remove unnecessary SIGNAL_TYPE_HDMI_TYPE_A check that was performed in the drm_mode_is_420_only() case, but not in the drm_mode_is_420_also() && force_yuv420_output case. Without further knowledge if YCbCr 4:2:0 is supported outside of HDMI, there is no reason to use RGB when the display reports drm_mode_is_420_only() even on a non HDMI connection. This patch also moves both checks in the same if-case. This eliminates an extra else-if-case. Signed-off-by: Werner Sembach Signed-off-by: Andri Yngvason Tested-by: Andri Yngvason Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 2fe9044e1e91..6eac9a273f87 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6718,12 +6718,9 @@ static void fill_stream_properties_from_drm_display_= mode( timing_out->v_border_top =3D 0; timing_out->v_border_bottom =3D 0; /* TODO: un-hardcode */ - if (drm_mode_is_420_only(info, mode_in) - && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) - timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; - else if (drm_mode_is_420_also(info, mode_in) - && aconnector - && aconnector->force_yuv420_output) + if (drm_mode_is_420_only(info, mode_in) || + (aconnector && aconnector->force_yuv420_output && + drm_mode_is_420_also(info, mode_in))) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FO= RMAT_YCBCR422)) && aconnector --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 3854A3D669C; Fri, 27 Feb 2026 19:21:45 +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=1772220109; cv=pass; b=MNkxodx0AGPW00qSQ0V/5vCEgyUEQwMv0crvohrEikGBvcsA2L4dBYF+RUrppMcWOHB1mNp2OJ4tEieW3jTi8W1VEPF7lTDGO9MqcSgQmTV6/iv99xW/LVMB1d8JTwOFCwBjcP2aWmxQG74raU7iiugTzAGeSU7AlyIgzmSLqB4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220109; c=relaxed/simple; bh=gMjC6jolCxRIIl/kov/4N37pt1BmCQFKJjOL8AEap1M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qzmCLvnukDd9ZwavhBA7cm3R10L3pOoJhdWGCiIXEU1ppJRlRjco7Q9Rz/eS+DuVk+h2YaYLGCOPWCad0KiEA4SLPxsLejM1EzSJiBiJdRTbQk2FDtLiBOYeGsqAD5zY/O0OVNWztyP4gXFXPTITWklfeF4CVcea+iJtOZS1VYY= 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=bHCDEHXo; 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="bHCDEHXo" ARC-Seal: i=1; a=rsa-sha256; t=1772220051; cv=none; d=zohomail.com; s=zohoarc; b=SknKv+6cAc18yw4F7vK4FjhMOwFhI8kjIZPT9vXnC3TjR3Z0zzfDSHhlMrBLwcY9Tkq2n425ol7aJ0iUBSc0YheRxOLhV68qKLBWerAwIYXkyeHFMO4TeXoLuVV2/WbKVDaBehlEyptlrP5YGjxiO8f19md/Jlc9gK+Y2tN4KNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220051; 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=ZzEac91TXYy4kNWimrhLZoyJ3LnuRkNIF2YrHGcVcgg=; b=FDe+1fSGRQxgTVdh1LHmljU2uOmo3QuWoGjB94EgQx4UEeB8mbZF8ri4HVab1I8QOCIcgg/sErOYtaRCmBkE7MKTu5rv1FsfVRsU2rkq0Jut/H47hk1BJxcl1ZCFjKCKZE4eb3/GD0TyVu97p9wM7DB2CVfuyyp66f+JZqVI1NA= 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=1772220051; 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=ZzEac91TXYy4kNWimrhLZoyJ3LnuRkNIF2YrHGcVcgg=; b=bHCDEHXoZcxZXzMma3bA7TIHpSlGMlOz0rLhmwmT2YbZL+A0a54LeEJ6zW7LMxWX XEesnyPaa3+u5BOxuEl/zbewiSBygbXeibZ/C6rvCAj2s3LSCMjw1ZIR9My+Rtg6UkG zCJe5CRDmxDXOqn23BVZkQTVw5AgEWv9QE/u2VGQ= Received: by mx.zohomail.com with SMTPS id 177222004958080.72500365298845; Fri, 27 Feb 2026 11:20:49 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:07 +0100 Subject: [PATCH v9 02/19] drm: Add new general DRM property "color format" 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: <20260227-color-format-v9-2-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Andri Yngvason , Werner Sembach , Marius Vlad X-Mailer: b4 0.14.3 From: Andri Yngvason Add a new general DRM property named "color format" which can be used by userspace to request the display driver to output a particular color format. Possible options are: - auto (setup by default, driver internally picks the color format) - rgb - ycbcr444 - ycbcr422 - ycbcr420 Drivers should advertise from this list which formats they support. Together with this list and EDID data from the sink we should be able to relay a list of usable color formats to users to pick from. Signed-off-by: Werner Sembach Signed-off-by: Andri Yngvason Signed-off-by: Marius Vlad Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/drm_atomic_helper.c | 5 ++ drivers/gpu/drm/drm_atomic_uapi.c | 11 ++++ drivers/gpu/drm/drm_connector.c | 124 ++++++++++++++++++++++++++++++++= ++++ include/drm/drm_connector.h | 103 ++++++++++++++++++++++++++++++ 4 files changed, 243 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index 26953ed6b53e..b7753454b777 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -737,6 +737,11 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, if (old_connector_state->max_requested_bpc !=3D new_connector_state->max_requested_bpc) new_crtc_state->connectors_changed =3D true; + + if (old_connector_state->color_format !=3D + new_connector_state->color_format) + new_crtc_state->connectors_changed =3D true; + } =20 if (funcs->atomic_check) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic= _uapi.c index 87de41fb4459..e7ce79bb161e 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -931,6 +931,15 @@ static int drm_atomic_connector_set_property(struct dr= m_connector *connector, state->privacy_screen_sw_state =3D val; } else if (property =3D=3D connector->broadcast_rgb_property) { state->hdmi.broadcast_rgb =3D val; + } else if (property =3D=3D connector->color_format_property) { + if (val > INT_MAX || !drm_connector_color_format_valid(val)) { + drm_dbg_atomic(connector->dev, + "[CONNECTOR:%d:%s] unknown color format %llu\n", + connector->base.id, connector->name, val); + return -EINVAL; + } + + state->color_format =3D val; } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val); @@ -1016,6 +1025,8 @@ drm_atomic_connector_get_property(struct drm_connecto= r *connector, *val =3D state->privacy_screen_sw_state; } else if (property =3D=3D connector->broadcast_rgb_property) { *val =3D state->hdmi.broadcast_rgb; + } else if (property =3D=3D connector->color_format_property) { + *val =3D state->color_format; } else if (connector->funcs->atomic_get_property) { return connector->funcs->atomic_get_property(connector, state, property, val); diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index 23dcc504ffe7..a4907e15dfc5 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1388,6 +1388,18 @@ static const u32 hdmi_colorspaces =3D BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65) | BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER); =20 +static const u32 hdmi_colorformats =3D + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + +static const u32 dp_colorformats =3D + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + /* * As per DP 1.4a spec, 2.2.5.7.5 VSC SDP Payload for Pixel Encoding/Color= imetry * Format Table 2-120 @@ -2649,6 +2661,99 @@ int drm_mode_create_hdmi_colorspace_property(struct = drm_connector *connector, } EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property); =20 +/** + * drm_mode_create_color_format_property - create color format property + * @connector: connector to create the color format property on + * @supported_color_formats: bitmask of bit-shifted &enum drm_output_color= _format + * values the connector supports + * + * Called by a driver to create a color format property. Must be attached = to + * the desired connector afterwards. + * + * @supported_color_formats should only include color formats the connector + * type can actually support. + * + * Returns: + * 0 on success, negative errno on error + */ +int drm_mode_create_color_format_property(struct drm_connector *connector, + unsigned long supported_color_formats) +{ + struct drm_device *dev =3D connector->dev; + struct drm_prop_enum_list enum_list[DRM_CONNECTOR_COLOR_FORMAT_COUNT]; + unsigned int i =3D 0; + unsigned long fmt; + + if (connector->color_format_property) + return 0; + + if (!supported_color_formats) { + drm_err(dev, "No supported color formats provided on [CONNECTOR:%d:%s]\n= ", + connector->base.id, connector->name); + return -EINVAL; + } + + if (supported_color_formats & ~GENMASK(DRM_OUTPUT_COLOR_FORMAT_COUNT - 1,= 0)) { + drm_err(dev, "Unknown color formats provided on [CONNECTOR:%d:%s]\n", + connector->base.id, connector->name); + return -EINVAL; + } + + switch (connector->connector_type) { + case DRM_MODE_CONNECTOR_HDMIA: + case DRM_MODE_CONNECTOR_HDMIB: + if (supported_color_formats & ~hdmi_colorformats) { + drm_err(dev, "Color formats not allowed for HDMI on [CONNECTOR:%d:%s]\n= ", + connector->base.id, connector->name); + return -EINVAL; + } + break; + case DRM_MODE_CONNECTOR_DisplayPort: + case DRM_MODE_CONNECTOR_eDP: + if (supported_color_formats & ~dp_colorformats) { + drm_err(dev, "Color formats not allowed for DP on [CONNECTOR:%d:%s]\n", + connector->base.id, connector->name); + return -EINVAL; + } + break; + } + + enum_list[0].name =3D "AUTO"; + enum_list[0].type =3D DRM_CONNECTOR_COLOR_FORMAT_AUTO; + + for_each_set_bit(fmt, &supported_color_formats, DRM_OUTPUT_COLOR_FORMAT_C= OUNT) { + switch (fmt) { + case DRM_OUTPUT_COLOR_FORMAT_RGB444: + enum_list[++i].type =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR444: + enum_list[++i].type =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR422: + enum_list[++i].type =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR422; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR420: + enum_list[++i].type =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + break; + default: + drm_warn(dev, "Unknown supported format %ld on [CONNECTOR:%d:%s]\n", + fmt, connector->base.id, connector->name); + continue; + } + enum_list[i].name =3D drm_hdmi_connector_get_output_format_name(fmt); + } + + connector->color_format_property =3D + drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "color format", + enum_list, i + 1); + + if (!connector->color_format_property) + return -ENOMEM; + + return 0; +} +EXPORT_SYMBOL(drm_mode_create_color_format_property); + /** * drm_mode_create_dp_colorspace_property - create dp colorspace property * @connector: connector to create the Colorspace property on. @@ -2866,6 +2971,25 @@ int drm_connector_attach_max_bpc_property(struct drm= _connector *connector, } EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); =20 +/** + * drm_connector_attach_color_format_property - attach "color format" prop= erty + * @connector: connector to attach color format property on. + * + * This is used to add support for requesting a color format on a connecto= r. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_connector_attach_color_format_property(struct drm_connector *conne= ctor) +{ + struct drm_property *prop =3D connector->color_format_property; + + drm_object_attach_property(&connector->base, prop, DRM_CONNECTOR_COLOR_FO= RMAT_AUTO); + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_color_format_property); + /** * drm_connector_attach_hdr_output_metadata_property - attach "HDR_OUTPUT_= METADA" property * @connector: connector to attach the property on. diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 4af91e252fbd..b5bc93856ad1 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -579,6 +579,91 @@ enum drm_output_color_format { DRM_OUTPUT_COLOR_FORMAT_YCBCR420, }; =20 +/* Do not forget to adjust after modifying &enum drm_output_color_format */ +#define DRM_OUTPUT_COLOR_FORMAT_COUNT 4 + +/** + * enum drm_connector_color_format - Connector Color Format Request + * + * This enum, unlike &enum drm_output_color_format, is used to specify req= uests + * for a specific color format on a connector through the DRM "color forma= t" + * property. The difference is that it has an "AUTO" value to specify that + * no specific choice has been made. + */ +enum drm_connector_color_format { + /** + * @DRM_CONNECTOR_COLOR_FORMAT_AUTO: The driver or display protocol + * helpers should pick a suitable color format. All implementations of a + * specific display protocol must behave the same way with "AUTO", but + * different display protocols do not necessarily have the same "AUTO" + * semantics. + * + * For HDMI, "AUTO" picks RGB, but falls back to YCbCr 4:2:0 if the + * bandwidth required for full-scale RGB is not available, or the mode + * is YCbCr 4:2:0-only, as long as the mode and output both support + * YCbCr 4:2:0. + * + * For display protocols other than HDMI, the recursive bridge chain + * format selection picks the first chain of bridge formats that works, + * as has already been the case before the introduction of the "color + * format" property. Non-HDMI bridges should therefore either sort their + * bus output formats by preference, or agree on a unified auto format + * selection logic that's implemented in a common state helper (like + * how HDMI does it). + */ + DRM_CONNECTOR_COLOR_FORMAT_AUTO =3D 0, + + /** + * @DRM_CONNECTOR_COLOR_FORMAT_RGB444: RGB output format + */ + DRM_CONNECTOR_COLOR_FORMAT_RGB444, + + /** + * @DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: YCbCr 4:4:4 output format (ie. + * not subsampled) + */ + DRM_CONNECTOR_COLOR_FORMAT_YCBCR444, + + /** + * @DRM_CONNECTOR_COLOR_FORMAT_YCBCR422: YCbCr 4:2:2 output format (ie. + * with horizontal subsampling) + */ + DRM_CONNECTOR_COLOR_FORMAT_YCBCR422, + + /** + * @DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: YCbCr 4:2:0 output format (ie. + * with horizontal and vertical subsampling) + */ + DRM_CONNECTOR_COLOR_FORMAT_YCBCR420, +}; + +/* Do not forget to adjust after modifying &enum drm_connector_color_forma= t */ +#define DRM_CONNECTOR_COLOR_FORMAT_COUNT 5 + +/** + * drm_connector_color_format_valid - Validate drm_connector_color_format = value + * @fmt: value to check against all values of &enum drm_connector_color_fo= rmat + * + * Checks whether the passed in value of @fmt is one of the allowable valu= es in + * &enum drm_connector_color_format. + * + * Returns: %true if it's a valid value for the enum, %false otherwise. + */ +static inline bool __pure +drm_connector_color_format_valid(enum drm_connector_color_format fmt) +{ + switch (fmt) { + case DRM_CONNECTOR_COLOR_FORMAT_AUTO: + case DRM_CONNECTOR_COLOR_FORMAT_RGB444: + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR422: + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: + return true; + default: + return false; + } +} + const char * drm_hdmi_connector_get_output_format_name(enum drm_output_color_format fmt= ); =20 @@ -1129,6 +1214,13 @@ struct drm_connector_state { */ enum drm_colorspace colorspace; =20 + /** + * @color_format: State variable for Connector property to request + * color format change on Sink. This is most commonly used to switch + * between RGB to YUV and vice-versa. + */ + enum drm_connector_color_format color_format; + /** * @writeback_job: Writeback job for writeback connectors * @@ -2127,6 +2219,12 @@ struct drm_connector { */ struct drm_property *colorspace_property; =20 + /** + * @color_format_property: Connector property to set the suitable + * color format supported by the sink. + */ + struct drm_property *color_format_property; + /** * @path_blob_ptr: * @@ -2529,6 +2627,9 @@ int drm_mode_create_dp_colorspace_property(struct drm= _connector *connector, int drm_mode_create_content_type_property(struct drm_device *dev); int drm_mode_create_suggested_offset_properties(struct drm_device *dev); =20 +int drm_mode_create_color_format_property(struct drm_connector *connector, + unsigned long supported_color_formats); + int drm_connector_set_path_property(struct drm_connector *connector, const char *path); int drm_connector_set_tile_property(struct drm_connector *connector); @@ -2610,6 +2711,8 @@ bool drm_connector_has_possible_encoder(struct drm_co= nnector *connector, struct drm_encoder *encoder); const char *drm_get_colorspace_name(enum drm_colorspace colorspace); =20 +int drm_connector_attach_color_format_property(struct drm_connector *conne= ctor); + /** * drm_for_each_connector_iter - connector_list iterator macro * @connector: &struct drm_connector pointer used as cursor --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 89E643D5222; Fri, 27 Feb 2026 19:21:44 +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=1772220107; cv=pass; b=Vux/ESbvBrz4e7ucNR7Py2hqrift/piFgEYCDds4FN6TobJ05tSVaQdMooU1lNTMoYdYFKqjcHNXFr7BlOaDPg89ZLvZcTbKnmh1xXftl7Xw41U/MNxV5/LEvt91XBJHaN/j0OzZm/zS4qSdjcI5dB0J58xPhynyo1Ej+SEFZ5E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220107; c=relaxed/simple; bh=PQwuPK/+l4Sz04cY23LX1F6jY3+4oYvHcU7fB/7EHfM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nFH3qLdUebFJoLsTqcT+IlxFXvLMconpcBGwN1eZiK3pAETuf4HBB0LtMc1D/YSEb/VctvM8MByqt7E62PCxqA/FYQt10vqPw5nkisnfgsiNzRWnQr9YhY2J1j1pXVdblSeWoaJb56YXWzKpQql/VSoMBo8WDSEMVwxMMdXzJZI= 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=CLaYwmKp; 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="CLaYwmKp" ARC-Seal: i=1; a=rsa-sha256; t=1772220059; cv=none; d=zohomail.com; s=zohoarc; b=a7lFIvyCcJsH9DCvDr4jZHEDLNIq1Hq76GliARJV+zQn0Pgg/lMiAJByeVcFg/RSmi3fmxWIpWGBLTJizZRvy4k5QNVgg7AmOdo3WBPNE3DLCM+7FgqLw8Y7LDEOpu2iklQauZgjoNCz6JGkrnV0l5Ow0/uK9uS3vXeZk2LHmKs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220059; 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=hg3JbOf51qGFiNWUz4/s1v5VBKG+/JhvVIcP9q/nOnU=; b=lHOS1T8Hrps+SdPfmbeeSAxjwFnkDJutw/Qi6k2llpvTv2O09SQ+Y4E94JQUz1cwwi7Lat1vQLD8Dn6YYJqo2OHlJ1vihu5AS9OG3w+wzo5HQSt1GwKAOyznZOFL3xYoW9hRtyZcKIC1h6FjhF0ivDRDv8VkgYz3jyQ+FJuXxrA= 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=1772220059; 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=hg3JbOf51qGFiNWUz4/s1v5VBKG+/JhvVIcP9q/nOnU=; b=CLaYwmKpY8Xjs9BOCDkT58HyGwWipr+AcLwrrKsgqAciegkltLKvTPMSNJaC3pew +uN3EdkSJvr9UIH8mnnHjBpHlFyJT9xeJ9QhtW8ilUrL38tXhI/G1mDgOpb/Y8LshGE zn6CvXQM1O3Cq1OqxQgt291EYOi6nxUoHb3gaK1Y= Received: by mx.zohomail.com with SMTPS id 177222005703079.58928466955979; Fri, 27 Feb 2026 11:20:57 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:08 +0100 Subject: [PATCH v9 03/19] drm/bridge: Act on the DRM color format property 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: <20260227-color-format-v9-3-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 The new DRM color format property allows userspace to request a specific color format on a connector. In turn, this fills the connector state's color_format member to switch color formats. Make drm_bridges consider the color_format set in the connector state during the atomic bridge check. For bridges that represent HDMI bridges, rely on whatever format the HDMI logic set. Reject any output bus formats that do not correspond to the requested color format. Non-HDMI last bridges with DRM_CONNECTOR_COLOR_FORMAT_AUTO set will end up choosing the first output format that functions to make a whole recursive bridge chain format selection succeed. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/drm_bridge.c | 89 ++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 6d8947419940..5938fba0a983 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -1117,6 +1117,47 @@ static int select_bus_fmt_recursive(struct drm_bridg= e *first_bridge, return ret; } =20 +static bool __pure bus_format_is_color_fmt(u32 bus_fmt, enum drm_connector= _color_format fmt) +{ + if (fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) + return true; + + switch (bus_fmt) { + case MEDIA_BUS_FMT_FIXED: + return true; + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_RGB121212_1X36: + case MEDIA_BUS_FMT_RGB161616_1X48: + return fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_YUV12_1X36: + case MEDIA_BUS_FMT_YUV16_1X48: + return fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_VYUY8_1X16: + case MEDIA_BUS_FMT_YUYV8_1X16: + case MEDIA_BUS_FMT_YVYU8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_YUYV10_1X20: + case MEDIA_BUS_FMT_VYUY10_1X20: + case MEDIA_BUS_FMT_YVYU10_1X20: + case MEDIA_BUS_FMT_UYVY12_1X24: + case MEDIA_BUS_FMT_VYUY12_1X24: + case MEDIA_BUS_FMT_YUYV12_1X24: + case MEDIA_BUS_FMT_YVYU12_1X24: + return fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR422; + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + case MEDIA_BUS_FMT_UYYVYY12_0_5X36: + case MEDIA_BUS_FMT_UYYVYY16_0_5X48: + return fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + default: + return false; + } +} + /* * This function is called by &drm_atomic_bridge_chain_check() just before * calling &drm_bridge_funcs.atomic_check() on all elements of the chain. @@ -1160,6 +1201,7 @@ drm_atomic_bridge_chain_select_bus_fmts(struct drm_br= idge *bridge, struct drm_encoder *encoder =3D bridge->encoder; struct drm_bridge_state *last_bridge_state; unsigned int i, num_out_bus_fmts =3D 0; + enum drm_connector_color_format fmt; u32 *out_bus_fmts; int ret =3D 0; =20 @@ -1201,13 +1243,58 @@ drm_atomic_bridge_chain_select_bus_fmts(struct drm_= bridge *bridge, out_bus_fmts[0] =3D MEDIA_BUS_FMT_FIXED; } =20 + /* + * On HDMI connectors, use the output format chosen by whatever does the + * HDMI logic. For everyone else, just trust that the bridge out_bus_fmts + * are sorted by preference for %DRM_CONNECTOR_COLOR_FORMAT_AUTO, as + * bus_format_is_color_fmt() always returns true for AUTO. + */ + if (last_bridge->ops & DRM_BRIDGE_OP_HDMI) { + drm_dbg_kms(last_bridge->dev, + "HDMI bridge requests format %s\n", + drm_hdmi_connector_get_output_format_name( + conn_state->hdmi.output_format)); + switch (conn_state->hdmi.output_format) { + case DRM_OUTPUT_COLOR_FORMAT_RGB444: + fmt =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR444: + fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR422: + fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR422; + break; + case DRM_OUTPUT_COLOR_FORMAT_YCBCR420: + fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + break; + default: + ret =3D -EINVAL; + goto out_free_bus_fmts; + } + } else { + fmt =3D conn_state->color_format; + drm_dbg_kms(last_bridge->dev, "Non-HDMI bridge requests format %d\n", fm= t); + } + for (i =3D 0; i < num_out_bus_fmts; i++) { + if (!bus_format_is_color_fmt(out_bus_fmts[i], fmt)) { + drm_dbg_kms(last_bridge->dev, + "Skipping bus format 0x%04x as it doesn't match format %d\n", + out_bus_fmts[i], fmt); + ret =3D -ENOTSUPP; + continue; + } ret =3D select_bus_fmt_recursive(bridge, last_bridge, crtc_state, conn_state, out_bus_fmts[i]); - if (ret !=3D -ENOTSUPP) + if (ret !=3D -ENOTSUPP) { + drm_dbg_kms(last_bridge->dev, + "Found bridge chain ending with bus format 0x%04x\n", + out_bus_fmts[i]); break; + } } =20 +out_free_bus_fmts: kfree(out_bus_fmts); =20 return ret; --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 D5A50421EEB; Fri, 27 Feb 2026 19:21:51 +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=1772220115; cv=pass; b=fP3xQh+Sw/Q6UxmkkCO/lB/wFY0nl5zmqatIZ8yHxUrwrZ7nwxC5jnD0tvPDWNKMJFCtZSfuNs8MkcaNDkUZjdaLJtSggmh3RQzlom4DMggqsNdP6b4mn9t84/GsXZxYqK/jVDx6Zlo1jE6LsL5Jk0PpWmQ8yhq90hPFqb4QweA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220115; c=relaxed/simple; bh=8/6dZLGyHaumszjvnOlf9NZOsCJG7tfdI+VYSP9mNTA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GBps0rBM/tjrAX1DgmjAvszxIETWR29tduaXW5aDNIUOCNupFwCdYlBP95iwO3GPjSPn7NPR0wB2rd3Kraql6A3gUq9AuSD+ePryviqRTnbUr/XhFI2rcKXgOmTchH7hdWO3wE+eu7XLElGrQq2PHP+/zt1f+BFctyFaK5w+Rm4= 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=QMCG0Fg2; 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="QMCG0Fg2" ARC-Seal: i=1; a=rsa-sha256; t=1772220065; cv=none; d=zohomail.com; s=zohoarc; b=CuDtymhFYBZKAp4fGdd2gpif9YWaDf+JeJJ+ImGvix0qeFNETuBWQYtYhBYgpq2I0cQZWyl8wedtjuDSVmeAtCaPhLCGrr7h+4ymI9tVVoVBKC+Akczk8diUbBb1f9CSCxPDjbWny+3athkkW70ihT6H/b6uF4HzAPhN3vJqVxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220065; 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=7CRAmTFQCtq+1fmVyGcK9BYvQbCYnvTEoio6+jtAKiI=; b=mTa+TVkdHMYMHNKMjOktCKWVMRJx9eYj+RS0KdfuRzaCtRC5+/aUNpVr2QCDookul3xyGjfdpg+s/R165cjnw1HCou14Y1KeDawNtHXFahh7Ypwv3swcMpjqz9e+rbh7StYlu0c+CZyPZ8BMqO01MRC2AhceMQ11gjZqjhIuDfA= 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=1772220065; 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=7CRAmTFQCtq+1fmVyGcK9BYvQbCYnvTEoio6+jtAKiI=; b=QMCG0Fg20PpjZuW8trMWkofAxH7FKBIRjKUH4CvoPnIVYAUQK/cOUnYa0YaMcIYM fW+uEEikuPV4avBJ+GMz1OsAE64w6citd4HdGmbZpeLn45Jyc+AqTD9jyYVOASm4iUf b1bSBQKn6YiHj44iq7zUkCfA7P+z194if/V6TaV8= Received: by mx.zohomail.com with SMTPS id 1772220064429633.5205645122492; Fri, 27 Feb 2026 11:21:04 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:09 +0100 Subject: [PATCH v9 04/19] drm/display: hdmi-state-helper: Act on color format DRM property 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: <20260227-color-format-v9-4-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 With the introduction of the "color format" DRM property, which allows userspace to request a specific color format, the HDMI state helper should implement this. Implement it by translating the requested drm_connector_color_format to a drm_output_color_format enum value as per the logic HDMI should use for this: Auto is translated to RGB, and a fallback to YUV420 is only performed if the original color format was auto. Signed-off-by: Nicolas Frattaroli Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 28 +++++++++++++++++++++= ++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/= drm/display/drm_hdmi_state_helper.c index 9f3b696aceeb..31c6d55fa995 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -669,10 +669,34 @@ hdmi_compute_config(const struct drm_connector *conne= ctor, unsigned int max_bpc =3D clamp_t(unsigned int, conn_state->max_bpc, 8, connector->max_bpc); + enum drm_output_color_format fmt; int ret; =20 - ret =3D hdmi_compute_format_bpc(connector, conn_state, mode, max_bpc, - DRM_OUTPUT_COLOR_FORMAT_RGB444); + switch (conn_state->color_format) { + case DRM_CONNECTOR_COLOR_FORMAT_AUTO: + case DRM_CONNECTOR_COLOR_FORMAT_RGB444: + fmt =3D DRM_OUTPUT_COLOR_FORMAT_RGB444; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: + fmt =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR444; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR422: + fmt =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR422; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: + fmt =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR420; + break; + default: + drm_dbg_kms(connector->dev, "HDMI does not support color format '%d'.\n", + conn_state->color_format); + return -EINVAL; + } + + ret =3D hdmi_compute_format_bpc(connector, conn_state, mode, max_bpc, fmt= ); + + if (conn_state->color_format !=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) + return ret; + if (ret) { if (connector->ycbcr_420_allowed) { ret =3D hdmi_compute_format_bpc(connector, conn_state, --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 9DCFC43DA53; Fri, 27 Feb 2026 19:23:26 +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=1772220207; cv=pass; b=Iiaq4ctuuJZQutoK/HsgM3fS+Aut9WdToGXXoWraKn9peULCj7SLf8ZrKH/YKCz+j/5q+TpHSya9QTMWP64NyZyC97+bUQ5/quJD76ZAe/RFf6Co487eVJcVglSuGxJhgUQY8qchW7fmLMEfh460r4huBcIQdiJI0PXRa6M1qP4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220207; c=relaxed/simple; bh=ejP62Kjtg/2JKNVhFp8QBVSK7/U0+35sFdnpTPz2zoM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uzVfea9BMAZqnT17TlGxltGcesWA96RDls9QgPJQ04k7cFdsTJwmT0LxRBPl7WjnqzYRyIyeC+JFsI1droC78Y7+Pb1O7C+NXyipp+EwvgxF5wHOJvHtpv9OGxgQXnC/+xWAcvB40REPBWo5wUFly5oDVE7PyQIQ45yxhcbqgn8= 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=ia18J4PH; 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="ia18J4PH" ARC-Seal: i=1; a=rsa-sha256; t=1772220073; cv=none; d=zohomail.com; s=zohoarc; b=V16G2IyxSBQEmtZGu/ZWPpanB1eWageappNlvSiA3tOcgydY4VR6JLrTHzV5hm7/+vBQ8KsomH7dDoaWJ1ZkzPWlpIF0enWOlbDOpRNX8aaRiFkAQajMA4R7NtCugl949XrjGk/ejSfr43tvzWfd33x13jn2A18O8Ukw+ZvbyZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220073; 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=WgsZAA03vPLPQvC4vGSXIBXCjP15MRYh/zrtI4ZTP0A=; b=h/CwTkglduHQLcwpJpLvu7dbqE1qO7uI9W31N+2dI67DjPuVyDWbVZNhuUNVcoTkArBdwzFd0dvoxiiN4QmDwij3csHiYtogsb1hhyV2eResQGiM4gLOHIagkK2xgz65Qdu2G56HdpY5w7EbTLKbxFbddLmO1/F3JQdIBUX6euw= 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=1772220073; 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=WgsZAA03vPLPQvC4vGSXIBXCjP15MRYh/zrtI4ZTP0A=; b=ia18J4PHdAMjkpW/Lf0G2ikxkOS1YSvWX0J+/pvzgph/v+8Fl6nQdRE4RRx4R8WK 76lZnJOJfrQINKFmboB81tYQDUucfgzzxiTARtaVPxLoj9ByuQ/GrIdaoIzDffsd1+b HQMbnjiE9seWfoBoLI+gnKXIRMdXK/QfY43/7y3Q= Received: by mx.zohomail.com with SMTPS id 1772220071839440.65825347098655; Fri, 27 Feb 2026 11:21:11 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:10 +0100 Subject: [PATCH v9 05/19] drm/display: hdmi-state-helper: Try subsampling in mode_valid 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: <20260227-color-format-v9-5-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 drm_hdmi_connector_mode_valid assumes modes are only valid if they work with RGB. The reality is more complex however: YCbCr 4:2:0 chroma-subsampled modes only require half the pixel clock that the same mode would require in RGB. This leads to drm_hdmi_connector_mode_valid rejecting perfectly valid 420-only or 420-also modes. Fix this by checking whether the mode is 420-capable first. If so, then proceed by checking it with DRM_OUTPUT_COLOR_FORMAT_YCBCR420 so long as the connector has legalized 420, otherwise error out. If the mode is not 420-capable, check with RGB as was previously always the case. Fixes: 47368ab437fd ("drm/display: hdmi: add generic mode_valid helper") Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/display/drm_hdmi_state_helper.c b/drivers/gpu/= drm/display/drm_hdmi_state_helper.c index 31c6d55fa995..5dc61b752e2b 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -934,8 +934,21 @@ drm_hdmi_connector_mode_valid(struct drm_connector *co= nnector, const struct drm_display_mode *mode) { unsigned long long clock; + enum drm_output_color_format fmt; + + if (drm_mode_is_420_only(&connector->display_info, mode)) { + if (connector->ycbcr_420_allowed) + fmt =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR420; + else + return MODE_NO_420; + } else if (drm_mode_is_420_also(&connector->display_info, mode) && + connector->ycbcr_420_allowed) { + fmt =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR420; + } else { + fmt =3D DRM_OUTPUT_COLOR_FORMAT_RGB444; + } =20 - clock =3D drm_hdmi_compute_mode_clock(mode, 8, DRM_OUTPUT_COLOR_FORMAT_RG= B444); + clock =3D drm_hdmi_compute_mode_clock(mode, 8, fmt); if (!clock) return MODE_ERROR; =20 --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 D7BBD3EBF02; Fri, 27 Feb 2026 19:22:12 +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=1772220135; cv=pass; b=ZiyygCEQBaj5S68RPg1rDJrcX2AxD5jDKXnPhROK6t8DuQyBj5vEKbX/jgzspupVcko2rsOPmal5cPLlpFahB2B6k/ZaRlvkLFPsuBKw5p/dhk52JgREeS1SVDWPVD7utYuiKzNVgqxttT4H+sYgn0MTbJolzA/+2w2wzPEEimQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220135; c=relaxed/simple; bh=FpQmXHbJ+N/sLielz/oHhthPuilt03stcDUyY3rB37o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CejqHvXizcTZ/PVA1p/KIC3kzcQ6AaqOGllIh5H16eAnj28xqjZDETSy/TY7Cc4z3UOvINWlvZqD6cw8EQmd/lYqE+iOm7owt+fHnbbS3H4UGQ7RjWANV9YP9G4IW8BGRMylZdcNgfnMAo94WTTpzHuzmFr/U9ehsrg7on9uJ5E= 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=Jq5odVA6; 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="Jq5odVA6" ARC-Seal: i=1; a=rsa-sha256; t=1772220081; cv=none; d=zohomail.com; s=zohoarc; b=C6kMG6CKB6qTUaob9v5ajEWW2PzE6gKopQuKaaqT/fkMj1IIEpDfflkEy39ef69WdEaV/KCc4zERIq2jj8jb8wF65yLU9woVWjQ2KFht4btsWgTX/EPozCY3UeTIJMvy8R6/fnNjfKVIfFhFRhGLOpNEqnRaCBTH2BlRSMpXxVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220081; 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=TbCg/jTWYrSU1uxg/nE401HfG7dQWXtj3RiNuAgMJUs=; b=ihJlY2bret+9JH8azrbknTE9Tx8RUvjB+P80Cojz/ZGNlEhj4Qt9wRxNcx9ATYoc0A7rkIU9hgSy4e4L7saPzua9R9OgPUiOnAiIcmrXm3GmiGxOMRr4O6i0nqI48Lr9HvDlHQ9/7c3qjalu2nmZLzfDuBBSWn5tlQ+kRk3Mw/k= 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=1772220081; 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=TbCg/jTWYrSU1uxg/nE401HfG7dQWXtj3RiNuAgMJUs=; b=Jq5odVA6N2fbr6lbN6ble8MfyCHJupk5L73erkd5nheT3hIUDgICGashPe/TopbO fZOULE5WUAaIHgQnL7v5d8ttLkh7PunFPLxhynxmCMUEe6lfBU8VYdVMVuM5PdePsy/ Tw1x1935uW1WhrPPTIcltr6PvP++Szcuslgs1Yuc= Received: by mx.zohomail.com with SMTPS id 177222007993146.23002789405052; Fri, 27 Feb 2026 11:21:19 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:11 +0100 Subject: [PATCH v9 06/19] drm/i915: Implement the "color format" DRM property 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: <20260227-color-format-v9-6-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Werner Sembach , Andri Yngvason , Marius Vlad X-Mailer: b4 0.14.3 This includes RGB, YUV420, YUV444 and Auto. Auto will pick RGB, unless the mode being asked for is YUV420-only, in which case it picks YUV420. Should the explicitly requested color format not be supported by the sink, then an error is returned to userspace, so that it can make a better choice. Co-developed-by: Werner Sembach Signed-off-by: Werner Sembach Co-developed-by: Andri Yngvason Signed-off-by: Andri Yngvason Co-developed-by: Marius Vlad Signed-off-by: Marius Vlad Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/i915/display/intel_connector.c | 11 ++++ drivers/gpu/drm/i915/display/intel_connector.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 71 ++++++++++++++++++++--= --- drivers/gpu/drm/i915/display/intel_dp.h | 4 ++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 55 +++++++++++++++++++- drivers/gpu/drm/i915/display/intel_hdmi.c | 72 ++++++++++++++++++++--= ---- 6 files changed, 185 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/d= rm/i915/display/intel_connector.c index 7ef9338d67ab..fb443aa7e0c0 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -38,6 +38,10 @@ #include "intel_hdcp.h" #include "intel_panel.h" =20 +static const u32 supported_colorformats =3D BIT(DRM_OUTPUT_COLOR_FORMAT_RG= B444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + static void intel_connector_modeset_retry_work_fn(struct work_struct *work) { struct intel_connector *connector =3D container_of(work, typeof(*connecto= r), @@ -321,6 +325,13 @@ intel_attach_dp_colorspace_property(struct drm_connect= or *connector) drm_connector_attach_colorspace_property(connector); } =20 +void +intel_attach_colorformat_property(struct drm_connector *connector) +{ + if (!drm_mode_create_color_format_property(connector, supported_colorform= ats)) + drm_connector_attach_color_format_property(connector); +} + void intel_attach_scaling_mode_property(struct drm_connector *connector) { diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/d= rm/i915/display/intel_connector.h index 0aa86626e646..fe6149d1d559 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.h +++ b/drivers/gpu/drm/i915/display/intel_connector.h @@ -31,6 +31,7 @@ void intel_attach_broadcast_rgb_property(struct drm_conne= ctor *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector); void intel_attach_hdmi_colorspace_property(struct drm_connector *connector= ); void intel_attach_dp_colorspace_property(struct drm_connector *connector); +void intel_attach_colorformat_property(struct drm_connector *connector); void intel_attach_scaling_mode_property(struct drm_connector *connector); void intel_connector_queue_modeset_retry_work(struct intel_connector *conn= ector); void intel_connector_cancel_modeset_retry_work(struct intel_connector *con= nector); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915= /display/intel_dp.c index 025e906b63a9..926df8b56a67 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1178,7 +1178,7 @@ dfp_can_convert(struct intel_dp *intel_dp, return false; } =20 -static enum intel_output_format +enum intel_output_format intel_dp_output_format(struct intel_connector *connector, enum intel_output_format sink_format) { @@ -3324,17 +3324,24 @@ intel_dp_compute_output_format(struct intel_encoder= *encoder, struct intel_connector *connector =3D intel_dp->attached_connector; const struct drm_display_info *info =3D &connector->base.display_info; const struct drm_display_mode *adjusted_mode =3D &crtc_state->hw.adjusted= _mode; - bool ycbcr_420_only; + enum drm_connector_color_format actual_format; int ret; =20 - ycbcr_420_only =3D drm_mode_is_420_only(info, adjusted_mode); + if ((conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420 = && + drm_mode_is_420(info, adjusted_mode)) || + (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO && + drm_mode_is_420_only(info, adjusted_mode))) + crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR420; + else if (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR= 444) + crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR444; + else + crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; =20 - if (ycbcr_420_only && !connector->base.ycbcr_420_allowed) { + if (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 && + !connector->base.ycbcr_420_allowed) { drm_dbg_kms(display->drm, - "YCbCr 4:2:0 mode but YCbCr 4:2:0 output not possible. Falling back= to RGB.\n"); - crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; - } else { - crtc_state->sink_format =3D intel_dp_sink_format(connector, adjusted_mod= e); + "YCbCr 4:2:0 mode requested but unsupported by connector.\n"); + return -EINVAL; } =20 crtc_state->output_format =3D intel_dp_output_format(connector, crtc_stat= e->sink_format); @@ -3342,9 +3349,20 @@ intel_dp_compute_output_format(struct intel_encoder = *encoder, ret =3D intel_dp_compute_link_config(encoder, crtc_state, conn_state, respect_downstream_limits); if (ret) { - if (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 || - !connector->base.ycbcr_420_allowed || - !drm_mode_is_420_also(info, adjusted_mode)) + /* + * If no valid link config can be found due to bandwidth constraints, + * degrade from RGB/YCbCr 4:4:4 to YCbCr 4:2:0 if permitted by + * the source and sink. + */ + if (!connector->base.ycbcr_420_allowed) + return ret; + /* No point in trying YCbCr420 a second time. */ + if (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420) + return ret; + if (!drm_mode_is_420(info, adjusted_mode)) + return ret; + /* If a non-AUTO color format is chosen, don't fall back. */ + if (conn_state->color_format) return ret; =20 crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR420; @@ -3352,9 +3370,36 @@ intel_dp_compute_output_format(struct intel_encoder = *encoder, crtc_state->sink_format); ret =3D intel_dp_compute_link_config(encoder, crtc_state, conn_state, respect_downstream_limits); + if (ret) + return ret; } =20 - return ret; + if (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) + return 0; + + switch (crtc_state->sink_format) { + case INTEL_OUTPUT_FORMAT_RGB: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR444: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR420: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + break; + default: + drm_dbg_kms(display->drm, "Intel format %d has no connector equivalent\n= ", + crtc_state->sink_format); + return -EINVAL; + } + + if (actual_format !=3D conn_state->color_format) { + drm_dbg_kms(display->drm, "Requested connector color format %d, got %d\n= ", + conn_state->color_format, actual_format); + return -EINVAL; + } + + return 0; } =20 void @@ -6828,6 +6873,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, st= ruct drm_connector *_connec intel_attach_dp_colorspace_property(&connector->base); } =20 + intel_attach_colorformat_property(&connector->base); + if (intel_dp_has_gamut_metadata_dip(&dp_to_dig_port(intel_dp)->base)) drm_connector_attach_hdr_output_metadata_property(&connector->base); =20 diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915= /display/intel_dp.h index b0bbd5981f57..ebc63156e73f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -203,6 +203,10 @@ bool intel_dp_compute_config_limits(struct intel_dp *i= ntel_dp, void intel_dp_get_dsc_sink_cap(u8 dpcd_rev, const struct drm_dp_desc *desc, bool is_branch, struct intel_connector *connector); +enum intel_output_format +intel_dp_output_format(struct intel_connector *connector, + enum intel_output_format sink_format); + bool intel_dp_has_gamut_metadata_dip(struct intel_encoder *encoder); =20 bool intel_dp_link_params_valid(struct intel_dp *intel_dp, int link_rate, diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/= i915/display/intel_dp_mst.c index fb5396a46d1b..5c95d718b5b3 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -702,10 +702,13 @@ static int mst_stream_compute_config(struct intel_enc= oder *encoder, struct intel_atomic_state *state =3D to_intel_atomic_state(conn_state->st= ate); struct intel_crtc *crtc =3D to_intel_crtc(pipe_config->uapi.crtc); struct intel_dp *intel_dp =3D to_primary_dp(encoder); + enum drm_connector_color_format actual_format; struct intel_connector *connector =3D to_intel_connector(conn_state->connector); const struct drm_display_mode *adjusted_mode =3D &pipe_config->hw.adjusted_mode; + const struct drm_display_info *info =3D + &connector->base.display_info; int num_joined_pipes; int ret =3D -EINVAL; =20 @@ -716,10 +719,53 @@ static int mst_stream_compute_config(struct intel_enc= oder *encoder, if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN) return -EINVAL; =20 - pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; - pipe_config->output_format =3D INTEL_OUTPUT_FORMAT_RGB; + if ((conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420 = && + drm_mode_is_420(info, adjusted_mode)) || + (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO && + drm_mode_is_420_only(info, adjusted_mode))) { + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR420; + } else if (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCB= CR444) { + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR444; + } else if (conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUT= O || + conn_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_RGB444) { + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; + } else { + drm_dbg_kms(display->drm, "Requested format %d unsupported.\n", + conn_state->color_format); + return -EINVAL; + } + + if (pipe_config->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 && + !connector->base.ycbcr_420_allowed) { + drm_dbg_kms(display->drm, + "YCbCr 4:2:0 mode requested but unsupported by connector.\n"); + return -EINVAL; + } + + pipe_config->output_format =3D intel_dp_output_format(connector, pipe_con= fig->sink_format); pipe_config->has_pch_encoder =3D false; =20 + /* Validate that the right format was picked if explicitly requested */ + if (conn_state->color_format !=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) { + switch (pipe_config->output_format) { + case INTEL_OUTPUT_FORMAT_RGB: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR444: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR420: + actual_format =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + break; + } + + if (actual_format !=3D conn_state->color_format) { + drm_dbg_kms(display->drm, "Requested connector color format %d, got %d\= n", + conn_state->color_format, actual_format); + return -EINVAL; + } + } + for_each_joiner_candidate(connector, adjusted_mode, num_joined_pipes) { if (num_joined_pipes > 1) pipe_config->joiner_pipes =3D GENMASK(crtc->pipe + num_joined_pipes - 1, @@ -1690,6 +1736,11 @@ static int mst_topology_add_connector_properties(str= uct intel_dp *intel_dp, if (connector->base.max_bpc_property) drm_connector_attach_max_bpc_property(&connector->base, 6, 12); =20 + connector->base.color_format_property =3D + intel_dp->attached_connector->base.color_format_property; + if (connector->base.color_format_property) + intel_attach_colorformat_property(&connector->base); + return drm_connector_set_path_property(&connector->base, pathprop); } =20 diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i9= 15/display/intel_hdmi.c index 05e898d10a2b..6b685d9a458e 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2270,33 +2270,73 @@ static int intel_hdmi_compute_output_format(struct = intel_encoder *encoder, struct intel_connector *connector =3D to_intel_connector(conn_state->conn= ector); const struct drm_display_mode *adjusted_mode =3D &crtc_state->hw.adjusted= _mode; const struct drm_display_info *info =3D &connector->base.display_info; - bool ycbcr_420_only =3D drm_mode_is_420_only(info, adjusted_mode); + enum drm_connector_color_format req_fmt =3D conn_state->color_format; + enum drm_connector_color_format actual_fmt; int ret; =20 - crtc_state->sink_format =3D - intel_hdmi_sink_format(crtc_state, connector, ycbcr_420_only); - - if (ycbcr_420_only && crtc_state->sink_format !=3D INTEL_OUTPUT_FORMAT_YC= BCR420) { - drm_dbg_kms(display->drm, - "YCbCr 4:2:0 mode but YCbCr 4:2:0 output not possible. Falling back= to RGB.\n"); - crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; - } + if (!req_fmt) + crtc_state->sink_format =3D + intel_hdmi_sink_format(crtc_state, connector, + drm_mode_is_420_only(info, adjusted_mode)); + else if (req_fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444) + crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR444; + else + crtc_state->sink_format =3D + intel_hdmi_sink_format(crtc_state, connector, + req_fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420); =20 crtc_state->output_format =3D intel_hdmi_output_format(crtc_state); ret =3D intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream_= limits); if (ret) { - if (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 || - !crtc_state->has_hdmi_sink || - !connector->base.ycbcr_420_allowed || - !drm_mode_is_420_also(info, adjusted_mode)) + /* + * If no valid link config can be found due to bandwidth constraints, + * degrade from RGB/YCbCr 4:4:4 to YCbCr 4:2:0 if permitted by + * the source and sink. + */ + if (!connector->base.ycbcr_420_allowed) + return ret; + /* No point in trying YCbCr420 a second time. */ + if (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420) + return ret; + if (!drm_mode_is_420(info, adjusted_mode)) + return ret; + /* If a non-AUTO color format is chosen, don't fall back. */ + if (req_fmt) return ret; =20 crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR420; crtc_state->output_format =3D intel_hdmi_output_format(crtc_state); ret =3D intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream= _limits); + if (ret) + return ret; } =20 - return ret; + if (req_fmt =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) + return 0; + + switch (crtc_state->sink_format) { + case INTEL_OUTPUT_FORMAT_RGB: + actual_fmt =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR444: + actual_fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + break; + case INTEL_OUTPUT_FORMAT_YCBCR420: + actual_fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420; + break; + default: + drm_dbg_kms(display->drm, "Intel format %d has no connector equivalent\n= ", + crtc_state->sink_format); + return -EINVAL; + } + + if (req_fmt !=3D actual_fmt) { + drm_dbg_kms(display->drm, "Requested connector color format %d, got %d\n= ", + req_fmt, actual_fmt); + return -EINVAL; + } + + return 0; } =20 static bool intel_hdmi_is_cloned(const struct intel_crtc_state *crtc_state) @@ -2689,8 +2729,10 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_h= dmi, struct drm_connector *_ if (DISPLAY_VER(display) >=3D 10) drm_connector_attach_hdr_output_metadata_property(&connector->base); =20 - if (!HAS_GMCH(display)) + if (!HAS_GMCH(display)) { drm_connector_attach_max_bpc_property(&connector->base, 8, 12); + intel_attach_colorformat_property(&connector->base); + } } =20 /* --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 5FCA9350A3D; Fri, 27 Feb 2026 19:24:17 +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=1772220258; cv=pass; b=dNLzgxOoyvGHN/Z1JntwXbnivIqTl7feNyr0fZSZegCYcWjF+CF77Ei7h3yZ5T6P2OMB1BeUJO3gGD5YpbWTrSFfZ3cFAlzmrZThpTxn/bUrr87FOtTUJn9uIxg2DCrHo2gPCGwUVM8BFQFCxYkaiN1CF4Uq5UrLFO3+mfjBjTU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220258; c=relaxed/simple; bh=QVATh9A9tTtpCx/qF1jCnbLeTeBJhn/K8x0Ar1zVbfo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=COtjLWzUruuigwLTY7PIuxKcWDrxcVJVpiIfNVCZzmfsTLNkajIb5xhP1hhAauVY+7JRfPZJfuDsEYDPlmd7VoAM1P0M0oxPThywC8rJVhx3Yr9VugburjwrcSEwKckkvxVeSKyst53rcfhUGeFfDqFPxlHYm2+ZmT5FelfKE1k= 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=L9LP4uD0; 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="L9LP4uD0" ARC-Seal: i=1; a=rsa-sha256; t=1772220089; cv=none; d=zohomail.com; s=zohoarc; b=ktWvDy576iOuxf+FWtecj3INmBM0XfuoUnDHmuTxVXQyAq5u1UCwB6s92+2Wqu8iHCKfwYva7dProPYV48NTyq7arhNNyI00pmqLHuaeyXK6O9TIr8mGrVCE5So9DdAov/lnfo+pVCP4do9liM1xoTggzd5Ls71W4RuhMich8sA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220089; 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=bhp04bWBa4pMtPdC/otMJTL+LJacM9lgkcNMvxs4WIU=; b=bZawtLWI9OCmbjrTISH07f2CfzYkYlfd63D2zsx923cprkO+QMz2lFjGsiY6f1ztp8AEu6eNBUE1rOV6vWNhDo/3rw1aJlWTrnFHkrzSUun57VSv5KZZrnKPUNJpM1QXepJ2ZYrnohjNO5+EQ4SDwgQqkNukjLEZITCkCk3m74w= 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=1772220089; 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=bhp04bWBa4pMtPdC/otMJTL+LJacM9lgkcNMvxs4WIU=; b=L9LP4uD0yptRbCVnRnbrCapVpYql7M5xDNatASv8QgoWdxcuDVGyotfids2Q67xC 0BbOfq+WImYJ33ZBYeeds6Jx8uYcVJS7krVrXBgdjTlZ6Eae+X9EQaOeGoqm86I+PdV n/ZORowJCbyZQE/61cafErnxVthrtCk4dm/WLIh4= Received: by mx.zohomail.com with SMTPS id 1772220087963228.84882629978767; Fri, 27 Feb 2026 11:21:27 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:12 +0100 Subject: [PATCH v9 07/19] drm/amdgpu: Implement "color format" DRM property 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: <20260227-color-format-v9-7-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Werner Sembach , Andri Yngvason , Marius Vlad X-Mailer: b4 0.14.3 The "color format" DRM property allows userspace to explicitly pick a color format to use. If an unsupported color format is requested, userspace will be given an error instead of silently having its request disobeyed. The default case, which is AUTO, picks YCbCr 4:2:0 if it's a 4:2:0-only mode, and RGB in all other cases. Co-developed-by: Werner Sembach Signed-off-by: Werner Sembach Co-developed-by: Andri Yngvason Signed-off-by: Andri Yngvason Co-developed-by: Marius Vlad Signed-off-by: Marius Vlad Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 89 ++++++++++++++++++= +--- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 13 ++++ 2 files changed, 92 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gp= u/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 6eac9a273f87..f67577775f9b 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6700,11 +6700,14 @@ static void fill_stream_properties_from_drm_display= _mode( const struct dc_stream_state *old_stream, int requested_bpc) { + bool is_dp_or_hdmi =3D dc_is_hdmi_signal(stream->signal) || dc_is_dp_sign= al(stream->signal); struct dc_crtc_timing *timing_out =3D &stream->timing; const struct drm_display_info *info =3D &connector->display_info; struct amdgpu_dm_connector *aconnector =3D NULL; struct hdmi_vendor_infoframe hv_frame; struct hdmi_avi_infoframe avi_frame; + bool want_420; + bool want_422; ssize_t err; =20 if (connector->connector_type !=3D DRM_MODE_CONNECTOR_WRITEBACK) @@ -6717,20 +6720,41 @@ static void fill_stream_properties_from_drm_display= _mode( timing_out->h_border_right =3D 0; timing_out->v_border_top =3D 0; timing_out->v_border_bottom =3D 0; - /* TODO: un-hardcode */ - if (drm_mode_is_420_only(info, mode_in) || - (aconnector && aconnector->force_yuv420_output && - drm_mode_is_420_also(info, mode_in))) + + want_420 =3D (aconnector && aconnector->force_yuv420_output) || + (connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBC= R420); + want_422 =3D (aconnector && aconnector->force_yuv422_output) || + (connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_YCBC= R422); + + if (drm_mode_is_420_only(info, mode_in) && + (want_420 || connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR= _FORMAT_AUTO)) { timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; - else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FO= RMAT_YCBCR422)) - && aconnector - && aconnector->force_yuv422_output) + } else if (drm_mode_is_420_also(info, mode_in) && want_420) { + timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; + } else if ((info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) = && + want_422 && is_dp_or_hdmi) { timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR422; - else if ((connector->display_info.color_formats & BIT(DRM_OUTPUT_COLOR_FO= RMAT_YCBCR444)) - && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) + } else if (connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMA= T_YCBCR444 && + (info->color_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444)) && + is_dp_or_hdmi) { timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR444; - else + } else if (connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMA= T_RGB444 || + connector_state->color_format =3D=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO)= { timing_out->pixel_encoding =3D PIXEL_ENCODING_RGB; + } else { + /* + * If a format was explicitly requested but the requested format + * can't be satisfied, set it to an invalid value so that an + * error bubbles up to userspace. This way, userspace knows it + * needs to make a better choice. + */ + if (connector_state->color_format !=3D DRM_CONNECTOR_COLOR_FORMAT_AUTO) + timing_out->pixel_encoding =3D PIXEL_ENCODING_UNDEFINED; + else if (drm_mode_is_420_only(info, mode_in)) + timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; + else + timing_out->pixel_encoding =3D PIXEL_ENCODING_RGB; + } =20 timing_out->timing_3d_format =3D TIMING_3D_FORMAT_NONE; timing_out->display_color_depth =3D convert_color_depth_from_display_info( @@ -8080,6 +8104,38 @@ static enum dc_status dm_validate_stream_and_context= (struct dc *dc, return dc_result; } =20 +static enum dc_status +dm_validate_stream_color_format(const struct drm_connector_state *drm_stat= e, + const struct dc_stream_state *stream) +{ + enum dc_pixel_encoding encoding; + + if (!drm_state->color_format) + return DC_OK; + + switch (drm_state->color_format) { + case DRM_CONNECTOR_COLOR_FORMAT_AUTO: + case DRM_CONNECTOR_COLOR_FORMAT_RGB444: + encoding =3D PIXEL_ENCODING_RGB; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: + encoding =3D PIXEL_ENCODING_YCBCR444; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR422: + encoding =3D PIXEL_ENCODING_YCBCR422; + break; + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: + encoding =3D PIXEL_ENCODING_YCBCR420; + break; + default: + encoding =3D PIXEL_ENCODING_UNDEFINED; + break; + } + + return encoding =3D=3D stream->timing.pixel_encoding ? + DC_OK : DC_UNSUPPORTED_VALUE; +} + struct dc_stream_state * create_validate_stream_for_sink(struct drm_connector *connector, const struct drm_display_mode *drm_mode, @@ -8126,6 +8182,9 @@ create_validate_stream_for_sink(struct drm_connector = *connector, if (dc_result =3D=3D DC_OK) dc_result =3D dm_validate_stream_and_context(adev->dm.dc, stream); =20 + if (dc_result =3D=3D DC_OK) + dc_result =3D dm_validate_stream_color_format(drm_state, stream); + if (dc_result !=3D DC_OK) { drm_dbg_kms(connector->dev, "Pruned mode %d x %d (clk %d) %s %s -- %s\n= ", drm_mode->hdisplay, @@ -8949,6 +9008,12 @@ static const u32 supported_colorspaces =3D BIT(DRM_MODE_COLORIMETRY_BT2020_RGB) | BIT(DRM_MODE_COLORIMETRY_BT2020_YCC); =20 +static const u32 supported_colorformats =3D + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int connector_type, @@ -9070,6 +9135,10 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_d= isplay_manager *dm, =20 if (adev->dm.hdcp_workqueue) drm_connector_attach_content_protection_property(&aconnector->base, tru= e); + + if (!drm_mode_create_color_format_property(&aconnector->base, + supported_colorformats)) + drm_connector_attach_color_format_property(&aconnector->base); } =20 if (connector_type =3D=3D DRM_MODE_CONNECTOR_eDP) { diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/= drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 7be50e8c0636..11638a6df9de 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -52,6 +52,12 @@ =20 #define PEAK_FACTOR_X1000 1006 =20 +static const u32 supported_colorformats =3D + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + /* * This function handles both native AUX and I2C-Over-AUX transactions. */ @@ -679,6 +685,13 @@ dm_dp_add_mst_connector(struct drm_dp_mst_topology_mgr= *mgr, if (connector->max_bpc_property) drm_connector_attach_max_bpc_property(connector, 8, 16); =20 + connector->color_format_property =3D master->base.color_format_property; + if (connector->color_format_property) { + if (!drm_mode_create_color_format_property(&aconnector->base, + supported_colorformats)) + drm_connector_attach_color_format_property(&aconnector->base); + } + connector->vrr_capable_property =3D master->base.vrr_capable_property; if (connector->vrr_capable_property) drm_connector_attach_vrr_capable_property(connector); --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 E098A3D5222; Fri, 27 Feb 2026 19:22:23 +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=1772220145; cv=pass; b=IOGv3gcjCmG5BTNKtcQcLWBqb/fTypo+X729t5RsZwaCCQnEUf7AELGzceRMeGxXrCOh7lyHFKAA9OIftwELvs+JoQjUSHIxUAp9yHZKkH8pnbf/yAFazjC5wCmC16LnLAdJ9u0YQ8MTHxgAXVKavbZFGlWl6MsIOFX84+x0UAA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220145; c=relaxed/simple; bh=33Ww8J2K75Ej72XAJU8c8NggzCA+pSde82fd+km3Om4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NyFy9o0rAMbQl2lW/N1Mz50VuMwhJocKslsu1XHjWT/rQEoXsgeOtlK+kT0pJIByJBMN0fF1swdvPzuqvZAonhy91YwF/buYWp6b+eJti7cWdAXzbthKvYqsJESjvsEr8jrAaJbjLXjToWfPNfhqyMNDZEvZEyPNPPYnWoxN45s= 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=iBytIcMY; 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="iBytIcMY" ARC-Seal: i=1; a=rsa-sha256; t=1772220097; cv=none; d=zohomail.com; s=zohoarc; b=X851BuYrAOQe5dKnV3F6vHm39l7qGKYl94waSkGAf/OerbPDIh2pTEMNXISJxZe7HR90yRafNtxTwQiJoNFw/qWuKwKUr0cpGntlyc+QFl2AwCepQQzBroJgPhAXRZzbc+7lBrf4OipyxKcuk7uZpTpI0BoKTF+hlsmhjajLQzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220097; 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=I6mnIoMwQGSuHjHjLVfRnXnzAB6xS7ZmlkuOJOt+Ckg=; b=JT7T3ssGWI6PlEZbsUKRsryo+NtnfB3mg17nMlzLovS/fnqquaNRAH1hyic9jkl7AjOwA3At2eslzTCrNMWN5DQQNn9XzUYU+HUlSZz0Zq5egXLymzzSmsw3bs2pVuSxjq+n/kf+jNCpPInePexnwgvoWLaUjuvDmXLetUK76oo= 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=1772220097; 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=I6mnIoMwQGSuHjHjLVfRnXnzAB6xS7ZmlkuOJOt+Ckg=; b=iBytIcMYBz0Au1zq1eszN/Qe5StE1C8xxH4O85phHbJgheajFy6caHO1VLu3S7Tr CgkCRWNfqP7K0wWNmsWFkoax9l0CA74mILxcFMnpT0IQdNTZBwcs88Q2JAfUGfhYNI1 jZFgmwroUGpsfK0EsYex3RruTUIGP4OdyXbTHkN0= Received: by mx.zohomail.com with SMTPS id 1772220095523648.4626705291115; Fri, 27 Feb 2026 11:21:35 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:13 +0100 Subject: [PATCH v9 08/19] drm/rockchip: Add YUV422 output mode constants for VOP2 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: <20260227-color-format-v9-8-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Andy Yan X-Mailer: b4 0.14.3 The Rockchip display controller has a general YUV422 output mode, and some SoC-specific connector-specific output modes for RK3576. Add them, based on the values in downstream and the TRM (dsp_out_mode in RK3576 TRM Part 2, register POST*_CTRL_POST_DSP_CTRL). Reviewed-by: Andy Yan Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/= rockchip/rockchip_drm_drv.h index 2e86ad00979c..4705dc6b8bd7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -30,10 +30,14 @@ #define ROCKCHIP_OUT_MODE_P565 2 #define ROCKCHIP_OUT_MODE_BT656 5 #define ROCKCHIP_OUT_MODE_S888 8 +#define ROCKCHIP_OUT_MODE_YUV422 9 #define ROCKCHIP_OUT_MODE_S888_DUMMY 12 #define ROCKCHIP_OUT_MODE_YUV420 14 /* for use special outface */ #define ROCKCHIP_OUT_MODE_AAAA 15 +/* SoC specific output modes */ +#define ROCKCHIP_OUT_MODE_YUV422_RK3576_DP 12 +#define ROCKCHIP_OUT_MODE_YUV422_RK3576_HDMI 13 =20 /* output flags */ #define ROCKCHIP_OUTPUT_DSI_DUAL BIT(0) --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 1B087350A3D; Fri, 27 Feb 2026 19:23:42 +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=1772220223; cv=pass; b=Dkg9498u0FjitLtuhCbH+tCchKdcSS28+VUjQ4A6YVjdfUrhGu31+7noxSV+lHTuHAwjJFPDNe402C8ec5Vohn9Hn2AbhVHiblIiz3PAFsV3BoICHLeImauq3jWMKl/GJLzLTun+CE7Ul7TqrBQ5EJrWtr19gG9BBLbG8mIzAvI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220223; c=relaxed/simple; bh=aofyhEbMaL60N7WvX0FkZ8CNdPkgnbdqfv/2Itq/FY8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=I2ywGXmXTL/j1y9wQA4jrTgVJApUt/J7Q29mWd6QnO+H6lr4fwKR48CBy7Ey5ra7oEtwiD7vujfaMmR53mH5g1lnEb8FKo0VRpb3v4gnNnc03q5rz101q3yk+RqC4vVhXiMMvErp1kWf5Zvnpk3RYzt9ETj/QOiahmUo1txWtoE= 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=jnnqqo2x; 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="jnnqqo2x" ARC-Seal: i=1; a=rsa-sha256; t=1772220105; cv=none; d=zohomail.com; s=zohoarc; b=AULN7JGgjOc1bXvJUcILNtklwAlcAHAUODbZmYPhTkw8rMvYxZ07KJt/0NwDvW9oRlA/odRaBFS6xvkO9oSyj6jAY+mNfCwQQtFM5hhBkn2dU/iJSFSn6G/3c42hCnzrLaqGLtW5aKR9T6B/oCMnEEcXF/xu7Cpn6DLYvtEirsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220105; 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=rwxTJdKl/d602FDC0mIdoL/MoUbuZ1KesTpLdFtLuuU=; b=mrZPpBujWnBgaMm2nB21cYNG3FLrZCEIttOGSLjO+RW7fmM3bJDRo1grMEZIdKDZ+ew/DzZrhwIdTGatRGwf3JXWz7YfjvQjf1j13tY0Ed7ZJ25wE/G4MS/jDIX5qHtzA0mRKmg9qCEmL7j6Ivsjwcb0TiFjRkrTz8zDlNi2TFw= 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=1772220105; 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=rwxTJdKl/d602FDC0mIdoL/MoUbuZ1KesTpLdFtLuuU=; b=jnnqqo2xRwPEUp4Wu+KlzmADBMNj335HkPyKkHUsVqJBnbzkz2gXqu35J1jpZVxc UlQ+acSOOziz2TmauK500hzYFUy6fg198i+7PL9TfCkk4pZKok1jk6pPevLre2Gyqi1 GWPe5XUUPiccvhWtbE8XkcdQv44bH1YcSB4w3lvY= Received: by mx.zohomail.com with SMTPS id 1772220103079110.57047502546686; Fri, 27 Feb 2026 11:21:43 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:14 +0100 Subject: [PATCH v9 09/19] drm/rockchip: vop2: Add RK3576 to the RG swap special case 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: <20260227-color-format-v9-9-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Andy Yan X-Mailer: b4 0.14.3 Much like RK3588, RK3576 requires an RG swap to be performed for YUV444 8-bit and YUV444 10-bit bus formats. Add its version to the already existing check for RK3588, so that YUV444 output is correct on this platform. Fixes: 944757a4cba6 ("drm/rockchip: vop2: Add support for rk3576") Reviewed-by: Andy Yan Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index a195f5c819a2..39c64296174f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -337,7 +337,8 @@ static bool vop2_output_uv_swap(u32 bus_format, u32 out= put_mode) =20 static bool vop2_output_rg_swap(struct vop2 *vop2, u32 bus_format) { - if (vop2->version =3D=3D VOP_VERSION_RK3588) { + if (vop2->version =3D=3D VOP_VERSION_RK3588 || + vop2->version =3D=3D VOP_VERSION_RK3576) { if (bus_format =3D=3D MEDIA_BUS_FMT_YUV8_1X24 || bus_format =3D=3D MEDIA_BUS_FMT_YUV10_1X30) return true; --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 7696044BCAC; Fri, 27 Feb 2026 19:23:52 +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=1772220233; cv=pass; b=VNPqWduLw3xpUuGdBGH5bP6MCqT47GIBxM2XMkaHCefCWy9UqZDGK3toVSDYp4sn0ZCBW0iBBThEIdozCOSv5BvnqV0EDqAPXBT7cTskanng9NvONfb4COj5zfVTpPl8EeJ5V7dtgNN8hQb9Icg3ERtkXpl3WAQGkhIplvpTCSg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220233; c=relaxed/simple; bh=yWGG5/ob4U2fNAEFbn9nht2mK/+g3TCaeXT/LxIEOtQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tcgQhi49aNCOTcOyHQqhoZ6ayCBCZ1C5W1gYVssxecqlLFpLBysnfKb9DdHgXr+I0AkiPMCopovPTLQN3AHo9A4zU3agFvkPGmDMYde1i6U2LERz5Ve05cB0gJ5K7i7fU/kjHcoIUaHz2Tu5xXH20Q0fQy5b6V8PH+AB3GHhkYw= 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=OAT0rU3n; 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="OAT0rU3n" ARC-Seal: i=1; a=rsa-sha256; t=1772220111; cv=none; d=zohomail.com; s=zohoarc; b=bsHrprkm55T8boFqsNoJqacOSEMII6d5JmV7CQd16eSDk5z66oAt2K3FjiMh4EamtvnfA3fImKXG8rEeQVz3JY7+PzPYVlrQoKsSRzJcckbDc98cLnQiqpzdP91UC4t4KjqLAgiSYPETjpXsTs99DE56ArIUpvSmSU7Kkq0pfuY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220111; 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=IDxTyd4/XBpqSKcrq+B2Z7kB7UuQuSq9lTwP/+9WOEE=; b=QTd9SJrsGwcTy5aXDJ4SDFy+2HsU4J8w+S1fW6WQXw0ynP4VQ+YL0Y4mfFtZ/plFSIQq8THLii2zJZtr7o39X6vvYs4dt9jhUN0CVXF4hpRdvNvEMbIN5WSUe8xAl5O2aldcQ5hH/Vroe4Wd/HDpHiPSzR5CB8WiiViGRHYOg08= 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=1772220111; 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=IDxTyd4/XBpqSKcrq+B2Z7kB7UuQuSq9lTwP/+9WOEE=; b=OAT0rU3nYG5qYMoQIwN3C6ntBvdtWzoyLXfiDhN7D9HRMvirjBSqzgid8YsPRh55 XiX5coDfSdCm9/xYlNVN/XEgOhgEpaOVg0xnEZSXfKPKd3MxFGutI8A0F+kMRTUZs5A c25sp9ka5oZyZuIhURcUJnf+2ZnxbK2HfODYyJKI= Received: by mx.zohomail.com with SMTPS id 1772220110660858.4104769861244; Fri, 27 Feb 2026 11:21:50 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:15 +0100 Subject: [PATCH v9 10/19] drm/rockchip: vop2: Recognise 10-bit YUV422 as YUV format 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: <20260227-color-format-v9-10-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 The Rockchip VOP2 video output driver has a "is_yuv_output" function, which returns true when a given bus format is a YUV format, and false otherwise. This switch statement is lacking the bus format used for YUV422 10-bit. Add the two component orderings of the YUV422 10-bit bus formats to the switch statement. Fixes: 604be85547ce ("drm/rockchip: Add VOP2 driver") Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 39c64296174f..46d49bc98ddb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -352,6 +352,8 @@ static bool is_yuv_output(u32 bus_format) switch (bus_format) { case MEDIA_BUS_FMT_YUV8_1X24: case MEDIA_BUS_FMT_YUV10_1X30: + case MEDIA_BUS_FMT_YUYV10_1X20: + case MEDIA_BUS_FMT_UYVY10_1X20: case MEDIA_BUS_FMT_UYYVYY8_0_5X24: case MEDIA_BUS_FMT_UYYVYY10_0_5X30: case MEDIA_BUS_FMT_YUYV8_2X8: --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 C72D33D3CF5; Fri, 27 Feb 2026 19:22:49 +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=1772220173; cv=pass; b=R6rwarJ+XQxNFLEu5ZUt7aNtoZ9mzKkU923ya+1cDI/0Cger1vJGN+aTYgiXiSvtH6Z0Sc+BStNFcch6CjNXhq7fMT1KI8hpb0cUXM/UjbzjpLtHPX9J+puyGv9QOMuH9AaoCDYzq0LcT8+3Qm/DeLSlTd1MLT9sMHaDm12ogWI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220173; c=relaxed/simple; bh=WGZjo+6soo5Jtu9mzXu9aS7MCB4e2xfmWJFw8wctFGA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=n6udhGDuYhPHhlJbuNjcbTeSOENeoxJd9ncJyLJdDBE8dLsx6d+w+I/FITfWNp8BbyoV8P/KdBdck3dQei6b1gCgxjbhKvoy9V/ESmJhkR6W6VJqXf8BbjmjlZDCMR4TxdBYCLvx7pIUqZQfTG5KkhC169zRU9H2qCl31L4TtFo= 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=FCQMRaTm; 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="FCQMRaTm" ARC-Seal: i=1; a=rsa-sha256; t=1772220119; cv=none; d=zohomail.com; s=zohoarc; b=HGefAuyV7Z86TAf3c2ktn/DGrVxzXXNznQFdj3quvlHCjD8UQniUxZVE/URgJmg9YXiyoWKAe5Hash+XovPwO4lwbBOdMNrqIBXrg+jrylmaP9X7mC97TjoooJmenmmVT7BTAThANjM6hwW2sJegHVIyRtGBTLu3wGkMTatH53Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220119; 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=JjTun7V4sdMrqY3oz515484Kw69CJtG/jWkM2sUF4Ss=; b=cb1m7/v6sA8VsDcXrsA/uvRfYY5dJLBYTZf+DIY5sg+qtOv2HgMtSna8Fi7Hr0afps5pGH8iNx/DeL2FsEhCDPpUxJCTXjbgBeGn8FmgNKc4LA1+e6039TzaEDpUtvGRV4qSGrBgtJExasDAkKGaN6Uz86bcu5IhHfs+7qB1I2Q= 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=1772220119; 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=JjTun7V4sdMrqY3oz515484Kw69CJtG/jWkM2sUF4Ss=; b=FCQMRaTmPigIOjlI1urf+atZZ3keQut7Gb+ePe5AFni3r337VcdS36AjVwx74Xng Da64bVYSeuhZG9jsFIJJADlolsrht9dGYsKh4YpfmdhOP4UlXOaY2BvMUVLkjTg1nlj 8iXW34XJ2cos7QYg2uzCbShI3eC9tVeMj6AD4roE= Received: by mx.zohomail.com with SMTPS id 177222011824838.13779248824392; Fri, 27 Feb 2026 11:21:58 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:16 +0100 Subject: [PATCH v9 11/19] drm/rockchip: vop2: Set correct output format for RK3576 YUV422 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: <20260227-color-format-v9-11-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli , Andy Yan X-Mailer: b4 0.14.3 For RK3576 to be able to output YUV422 signals, it first needs to be able to pick the right output mode in the display controller to do so. The RK3576 hardware specifies different output formats depending on the used display protocol. Adjust the written register value based on the SoC and connector, so other users of vcstate->output_mode don't have to care about this. Reviewed-by: Andy Yan Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 46d49bc98ddb..205ecf06abdf 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1686,6 +1686,22 @@ static void vop2_crtc_atomic_enable(struct drm_crtc = *crtc, if (vcstate->output_mode =3D=3D ROCKCHIP_OUT_MODE_AAAA && !(vp_data->feature & VOP2_VP_FEATURE_OUTPUT_10BIT)) out_mode =3D ROCKCHIP_OUT_MODE_P888; + else if (vcstate->output_mode =3D=3D ROCKCHIP_OUT_MODE_YUV422 && + vop2->version =3D=3D VOP_VERSION_RK3576) + switch (vcstate->output_type) { + case DRM_MODE_CONNECTOR_DisplayPort: + case DRM_MODE_CONNECTOR_eDP: + out_mode =3D ROCKCHIP_OUT_MODE_YUV422_RK3576_DP; + break; + case DRM_MODE_CONNECTOR_HDMIA: + out_mode =3D ROCKCHIP_OUT_MODE_YUV422_RK3576_HDMI; + break; + default: + drm_err(vop2->drm, "Unknown DRM_MODE_CONNECTOR %d\n", + vcstate->output_type); + vop2_unlock(vop2); + return; + } else out_mode =3D vcstate->output_mode; =20 --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 3555C41B379; Fri, 27 Feb 2026 19:22:52 +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=1772220179; cv=pass; b=QBaP0sWjc+HogLef9s4xRUj3867fkT/8FSfJwVelQ/dnr3e25YeV4gQ96cMuP6l+RtJLZls1ZmuNdTDsMC1PjnOO4mjDZuMXWtUpj1sYMHx1lBNxEsXMOZlnVj/fPmxnewc0uWQFwkDG5bKa+8RfZqDT3YM/ADOo2W5aYn6i/WI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220179; c=relaxed/simple; bh=97pAhfLduGmajlq5XCjV1KSFkPcZORlIqmavVJvYZVE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qOu+Ulk4z7obrRt2kz6lY16LUlT9xlQUNci4xBhrcdl8NNg35amuyOV2Ba+4s+dWLgpVi1n9Z/cQcKd+mH+CtQui22niE2qS+BOSecwqbVq/iloTqOorATmlL5SgGbxomZhYuDA4qTGCCIsl7cL4FRI+zH+5h50X8Tu9HDRZTxI= 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=WOS2jtS9; 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="WOS2jtS9" ARC-Seal: i=1; a=rsa-sha256; t=1772220127; cv=none; d=zohomail.com; s=zohoarc; b=gmELs3Nl/vS1UrpyYAF2cyf1WSvQbOzQBUye0NbDy5BsujxiWibWCTm3V7ilHip8F30hCudB6DhAm1vLwsf/T8a6ExpV7+mC4ybOUuZ6a8wrNm0zD4cISwDtqoIV17/kMM4MXYsudveWZ3hRcqfATS1PMViC+LHGK3JMkCxysOA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220127; 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=/k5/BqEah/aoOJSil87LueDqk+SxhPr5/f7eVZQF6Ak=; b=dZvQnJDQeuvipgnF2pQJ+a5/1DxsOQ4ONtUws0ECjw1mmMgrqHOFxbfABhYYDe2YNwAbt92NIm3TrUtsCUYbyjqBcEdv+Ll/v0BjMRjNngiWocjdqaaiL2dPQ5jjj2FJBJZZHDnb9BqiZe7CWUND6OqF8yl6S6Vk2fuQRFg76Jk= 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=1772220127; 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=/k5/BqEah/aoOJSil87LueDqk+SxhPr5/f7eVZQF6Ak=; b=WOS2jtS92hr5dcpbdmXKLe2XTEk4g7filaYDOnN7N+dK5HK/pfrNmdLQFZlFv1DB h2lchROahOTivvDujSgHkJzL6ejcUUnuH1s2sZmZ1/iEyK06km6cHDBR+1rLbwo7nYt hzrIIsQFoXe3RNNJ/DQ8WBghMInBqXZNCCIjeLUE= Received: by mx.zohomail.com with SMTPS id 1772220125698172.56653551643058; Fri, 27 Feb 2026 11:22:05 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:17 +0100 Subject: [PATCH v9 12/19] drm/bridge: dw-hdmi-qp: Implement atomic_get_output_bus_fmts 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: <20260227-color-format-v9-12-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 The atomic_get_output_bus_fmts callback is used by the DRM bridge layer to recursively select a suitable output format in a bridge chain. As a bridge that outputs to HDMI, dw-hdmi-qp will have its output formats determined by which formats the platform-specific integration of the hardware supports, and the chosen HDMI output bit depth. Implement this callback. The returned u32* buffer is supposed to be freed by the caller of this callback, as specified by the callback's documentation. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 64 ++++++++++++++++++++++++= ++++ 1 file changed, 64 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index d649a1cf07f5..4556494f9bb1 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -749,6 +750,68 @@ static struct i2c_adapter *dw_hdmi_qp_i2c_adapter(stru= ct dw_hdmi_qp *hdmi) return adap; } =20 +static u32* +dw_hdmi_qp_bridge_get_output_bus_fmts(struct drm_bridge *bridge, + struct drm_bridge_state *bridge_state, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + unsigned int *num_output_fmts) +{ + unsigned int num_fmts =3D 0; + u32 *out_fmts; + + /* + * bridge->supported_formats is a bit field of the HDMI_COLORSPACE_* enum= s. + * These enums are defined by the HDMI standard, and currently top out at + * 7. Consequently, BIT(7) is the highest bit that will be set here, unle= ss + * the standard runs out of reserved pixel formats. Therefore, hweight8() + * will give an accurate count of how many bus formats we'll output. + */ + out_fmts =3D kmalloc_array(hweight8(bridge->supported_formats), sizeof(u3= 2), + GFP_KERNEL); + if (!out_fmts) { + *num_output_fmts =3D 0; + return NULL; + } + + switch (conn_state->hdmi.output_bpc) { + case 12: + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_RGB121212_1X36; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_YUV12_1X36; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYVY12_1X24; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYYVYY12_0_5X36; + break; + case 10: + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_RGB101010_1X30; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_YUV10_1X30; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYVY10_1X20; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYYVYY10_0_5X30; + break; + default: + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_RGB888_1X24; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_YUV8_1X24; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYVY8_1X16; + if (bridge->supported_formats & BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)) + out_fmts[num_fmts++] =3D MEDIA_BUS_FMT_UYYVYY8_0_5X24; + break; + } + + *num_output_fmts =3D num_fmts; + + return out_fmts; +} + static void dw_hdmi_qp_bridge_atomic_enable(struct drm_bridge *bridge, struct drm_atomic_state *state) { @@ -1192,6 +1255,7 @@ static int dw_hdmi_qp_cec_transmit(struct drm_bridge = *bridge, u8 attempts, #endif /* CONFIG_DRM_DW_HDMI_QP_CEC */ =20 static const struct drm_bridge_funcs dw_hdmi_qp_bridge_funcs =3D { + .atomic_get_output_bus_fmts =3D dw_hdmi_qp_bridge_get_output_bus_fmts, .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, .atomic_reset =3D drm_atomic_helper_bridge_reset, --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 5B08744A730; Fri, 27 Feb 2026 19:22:57 +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=1772220179; cv=pass; b=hzEsQ54J1tss7WB3iODMbRpxYMtnKWMi4fnzyE3DlsINUsEGjq1LoZpWJZkeu3cOcaLfYdOwigWln22KKSRfEeQ1qJk+X6Bjhve5jLrCxEiZfwcOAdBfKSP7YhMXieQUnXTLWJvTVbHeup+2MZMwGbdcR+fyyWTXEa3xypzJOQA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220179; c=relaxed/simple; bh=TCh04P9mYsqOrcyx/wt7GmcSAIbBSZQMM/gwC+h8lpQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GxXd3MTkGFr0Az3SVEZDQcWlPYczAtU3E5AcM6q0JJafbF/QE47LUWRGAlKzt2NUC1gU8q8Rc6aC5nHxLoLljKXvSKesLrYuo8ECpaUBmujtKVdqhKDHjxvM17WpDgvbZ0NnA0bXhem3kZsmIaERo3TZpFVtvTzzr09wmfUGBzQ= 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=XX0dXOB2; 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="XX0dXOB2" ARC-Seal: i=1; a=rsa-sha256; t=1772220135; cv=none; d=zohomail.com; s=zohoarc; b=ZIUg+weCXCAscP9WCV8HepPF0KiXQgyiJ1Zla1g5iKv8+vYfwjlPyqDN3B+EanSH64lx+ZYEtfsi8dgn/iccZCuOufnG7pYzR9mMYGmoWZbGx2Kk8sRdVLvOrNhgcISdrqycX98ezjpxOXRtQWPgTIoNweVBOzLbD7wKi9+WoOE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220135; 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=aAKo1twm4zvOU57OmqnMmeCHmOgUWQwHKdY/derPNZ0=; b=OBAq2jze4z2WoiOacfWhIFL1eDHgTyyRtmoRYmMlorZ4ewOFetSyWw7UJ46a75yyz2/lqaupApBBIkonP1XUPWxrzZ71PD3cf4J71GUNVtMs1JGm0b8d9L3549+iikdHpnwTJXVILZNEM1oQFp3lrPX7iwyR5+o/7HLFx4ccacw= 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=1772220135; 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=aAKo1twm4zvOU57OmqnMmeCHmOgUWQwHKdY/derPNZ0=; b=XX0dXOB2d5m8mnM4KRsdjdgfN6BRmSJ0lwyrc1pbi6K8NueBsXtmMBtuLIQ5wfJH sT6FopKtjTow9lm9vPo66jbeL3XzsjkYjNAs17YDI/VHRAStYJzrBTG6ryGFgFw/lBL 1TVHMCP8D49HxEPnDU5fT4MXaCHsp3ugno6Vhwrw= Received: by mx.zohomail.com with SMTPS id 177222013309246.87188588056961; Fri, 27 Feb 2026 11:22:13 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:18 +0100 Subject: [PATCH v9 13/19] drm/rockchip: dw_hdmi_qp: Implement "color format" DRM property 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: <20260227-color-format-v9-13-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 Switch between requested color formats by setting the right bus formats, configuring the VO GRF registers, and setting the right output mode. To do this, the encoder's atomic_check queries the bus format of the first bridge, which was determined by the bridge chain recursive format selection. Pick the input format if it's !FIXED, otherwise, pick the output format. The previously unused GRF register color format defines are redone as well. Both RK3588 and RK3576 use the same defines; it didn't look like this as there was a typo in the previously (unused) definition. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 107 +++++++++++++++++++++= +--- 1 file changed, 98 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index 1a09bcc96c3e..e2fa1aa53394 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -43,10 +44,6 @@ #define RK3576_8BPC 0x0 #define RK3576_10BPC 0x6 #define RK3576_COLOR_FORMAT_MASK GENMASK(7, 4) -#define RK3576_RGB 0x9 -#define RK3576_YUV422 0x1 -#define RK3576_YUV444 0x2 -#define RK3576_YUV420 0x3 #define RK3576_CECIN_MASK BIT(3) =20 #define RK3576_VO0_GRF_SOC_CON14 0x0038 @@ -74,8 +71,6 @@ #define RK3588_8BPC 0x0 #define RK3588_10BPC 0x6 #define RK3588_COLOR_FORMAT_MASK GENMASK(3, 0) -#define RK3588_RGB 0x0 -#define RK3588_YUV420 0x3 #define RK3588_SCLIN_MASK BIT(9) #define RK3588_SDAIN_MASK BIT(10) #define RK3588_MODE_MASK BIT(11) @@ -87,6 +82,11 @@ #define HOTPLUG_DEBOUNCE_MS 150 #define MAX_HDMI_PORT_NUM 2 =20 +#define RK_COLOR_FMT_RGB 0x0 +#define RK_COLOR_FMT_YUV422 0x1 +#define RK_COLOR_FMT_YUV444 0x2 +#define RK_COLOR_FMT_YUV420 0x3 + struct rockchip_hdmi_qp { struct device *dev; struct regmap *regmap; @@ -115,6 +115,33 @@ static struct rockchip_hdmi_qp *to_rockchip_hdmi_qp(st= ruct drm_encoder *encoder) return container_of(rkencoder, struct rockchip_hdmi_qp, encoder); } =20 +/** + * dw_hdmi_qp_rockchip_bus_fmt_to_reg - converts a bus format to a GRF reg= value + * @bus_fmt: One of the MEDIA_BUS_FMT_s allowed by this driver's atomic_ch= eck + * + * Returns: an unshifted value to be written to the COLOR_FORMAT GRF regis= ter + * on success, or %-EINVAL if the bus format is not supported. + */ +static int __pure dw_hdmi_qp_rockchip_bus_fmt_to_reg(u32 bus_fmt) +{ + switch (bus_fmt) { + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB101010_1X30: + return RK_COLOR_FMT_RGB; + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + return RK_COLOR_FMT_YUV422; + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + return RK_COLOR_FMT_YUV444; + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + return RK_COLOR_FMT_YUV420; + } + + return -EINVAL; +} + static void dw_hdmi_qp_rockchip_encoder_enable(struct drm_encoder *encoder) { struct rockchip_hdmi_qp *hdmi =3D to_rockchip_hdmi_qp(encoder); @@ -130,29 +157,83 @@ static void dw_hdmi_qp_rockchip_encoder_enable(struct= drm_encoder *encoder) hdmi->ctrl_ops->enc_init(hdmi, to_rockchip_crtc_state(crtc->state)); } =20 +/** + * dw_hdmi_qp_rockchip_get_vop_format - get the bus format VOP should outp= ut + * @encoder: pointer to a &struct drm_encoder + * @conn_state: pointer to the current atomic &struct drm_connector_state + * + * Determines which bus format the Rockchip video processor should output = as + * to feed into the bridge chain. + * + * Returns a MEDIA_BUS_FMT_* on success, or %0 on error. + */ +static u32 dw_hdmi_qp_rockchip_get_vop_format(struct drm_encoder *encoder, + struct drm_connector_state *conn_state) +{ + struct drm_bridge *bridge __free(drm_bridge_put) =3D NULL; + struct drm_bridge_state *bstate; + + bridge =3D drm_bridge_chain_get_first_bridge(encoder); + if (!bridge) + return 0; + + bstate =3D drm_atomic_get_bridge_state(conn_state->state, bridge); + if (!bstate) + return 0; + + if (bstate->input_bus_cfg.format !=3D MEDIA_BUS_FMT_FIXED) + return bstate->input_bus_cfg.format; + + return bstate->output_bus_cfg.format; +} + static int dw_hdmi_qp_rockchip_encoder_atomic_check(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state, struct drm_connector_state *conn_state) { - struct rockchip_hdmi_qp *hdmi =3D to_rockchip_hdmi_qp(encoder); struct rockchip_crtc_state *s =3D to_rockchip_crtc_state(crtc_state); + struct rockchip_hdmi_qp *hdmi =3D to_rockchip_hdmi_qp(encoder); union phy_configure_opts phy_cfg =3D {}; + u32 ingest_fmt; int ret; =20 + ingest_fmt =3D dw_hdmi_qp_rockchip_get_vop_format(encoder, conn_state); + if (!ingest_fmt) + return -EINVAL; + if (hdmi->tmds_char_rate =3D=3D conn_state->hdmi.tmds_char_rate && - s->output_bpc =3D=3D conn_state->hdmi.output_bpc) + s->output_bpc =3D=3D conn_state->hdmi.output_bpc && + s->bus_format =3D=3D ingest_fmt) return 0; =20 + switch (ingest_fmt) { + case MEDIA_BUS_FMT_RGB888_1X24: + case MEDIA_BUS_FMT_RGB101010_1X30: + case MEDIA_BUS_FMT_YUV8_1X24: + case MEDIA_BUS_FMT_YUV10_1X30: + s->output_mode =3D ROCKCHIP_OUT_MODE_AAAA; + break; + case MEDIA_BUS_FMT_UYVY8_1X16: + s->output_mode =3D ROCKCHIP_OUT_MODE_YUV422; + break; + case MEDIA_BUS_FMT_UYYVYY8_0_5X24: + case MEDIA_BUS_FMT_UYYVYY10_0_5X30: + s->output_mode =3D ROCKCHIP_OUT_MODE_YUV420; + break; + default: + return -EINVAL; + } + phy_cfg.hdmi.tmds_char_rate =3D conn_state->hdmi.tmds_char_rate; phy_cfg.hdmi.bpc =3D conn_state->hdmi.output_bpc; =20 ret =3D phy_configure(hdmi->phy, &phy_cfg); if (!ret) { hdmi->tmds_char_rate =3D conn_state->hdmi.tmds_char_rate; - s->output_mode =3D ROCKCHIP_OUT_MODE_AAAA; s->output_type =3D DRM_MODE_CONNECTOR_HDMIA; s->output_bpc =3D conn_state->hdmi.output_bpc; + s->bus_format =3D ingest_fmt; } else { dev_err(hdmi->dev, "Failed to configure phy: %d\n", ret); } @@ -382,6 +463,7 @@ static void dw_hdmi_qp_rk3588_io_init(struct rockchip_h= dmi_qp *hdmi) static void dw_hdmi_qp_rk3576_enc_init(struct rockchip_hdmi_qp *hdmi, struct rockchip_crtc_state *state) { + int color =3D dw_hdmi_qp_rockchip_bus_fmt_to_reg(state->bus_format); u32 val; =20 if (state->output_bpc =3D=3D 10) @@ -389,12 +471,16 @@ static void dw_hdmi_qp_rk3576_enc_init(struct rockchi= p_hdmi_qp *hdmi, else val =3D FIELD_PREP_WM16(RK3576_COLOR_DEPTH_MASK, RK3576_8BPC); =20 + if (likely(color >=3D 0)) + val |=3D FIELD_PREP_WM16(RK3576_COLOR_FORMAT_MASK, color); + regmap_write(hdmi->vo_regmap, RK3576_VO0_GRF_SOC_CON8, val); } =20 static void dw_hdmi_qp_rk3588_enc_init(struct rockchip_hdmi_qp *hdmi, struct rockchip_crtc_state *state) { + int color =3D dw_hdmi_qp_rockchip_bus_fmt_to_reg(state->bus_format); u32 val; =20 if (state->output_bpc =3D=3D 10) @@ -402,6 +488,9 @@ static void dw_hdmi_qp_rk3588_enc_init(struct rockchip_= hdmi_qp *hdmi, else val =3D FIELD_PREP_WM16(RK3588_COLOR_DEPTH_MASK, RK3588_8BPC); =20 + if (likely(color >=3D 0)) + val |=3D FIELD_PREP_WM16(RK3588_COLOR_FORMAT_MASK, color); + regmap_write(hdmi->vo_regmap, hdmi->port_id ? RK3588_GRF_VO1_CON6 : RK3588_GRF_VO1_CON3, val); --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 3DAC4361DD9; Fri, 27 Feb 2026 19:23:08 +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=1772220189; cv=pass; b=NdLxx8PR+w2ph2aUZ/BP5HUHWAh6qlzZ2M9jmIw+itWbER/Z48v6Go2K3LRyt8A+nUjRc7ar0OS4RiCzUS0c83lVeWZA6A3KepudttrPFJERcvy4dJD3bRVl86E5cyfIfk7vb51+JcOGehe1j/yblqkjwdMoezStv7vHhElAH9M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220189; c=relaxed/simple; bh=JJ4Y1Jwj7uyPDGqG1InJXLV/MvcrLzEtefH4FX4IRF8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dnGvClytN1J3SPNGDgaDGpoeIZwYkfWuLV3GB2RMQ9QpwBnGtGK+PP3BbezYhzW0jHm8LvwbVxsFzi4KZWO+V/JqDnjjgGg1Vqe+32kwkRjwknypRiKo6+AFtzqGMT2u5ENPJ6YOVtxms5XaFlIevpqeV5045mR9Dy6w9kAHtZY= 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=heiaU3AL; 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="heiaU3AL" ARC-Seal: i=1; a=rsa-sha256; t=1772220142; cv=none; d=zohomail.com; s=zohoarc; b=YAU6BwdAJ7wEvYFHk9Hh9wGXk//KhxkMFQRc1o/fr2LsRub313dasK/7zmUFjxiD/XJiW0tetUNSBFkAt0RFm35CsKd1AitnR1qyCmpacdbu2wZvf6dGvacHNbGF+y8i188IRZ/8IxRSQyguFSw0gJ0+RPOPxUmUZtKw+ShvAB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220142; 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=Zbv1svLNiELU2nwPQbaiNz8rD89KKv3/KBIEB/KjLZ4=; b=To92WGSXuPSzu5ldQB+Vi05uDmvNhPRT83GgnmU7jlaeQnLimwqL+aCAqcsOAD3lf1TK00h0mTmU3qympb475thWIHxxO0TZ4MKxnODktnIl55C3DV4+HRw8ifJpA0pKo2D+zp6cZ8ucma/0KksZShlLM4kLpzqGy6wJ56w3DTo= 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=1772220141; 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=Zbv1svLNiELU2nwPQbaiNz8rD89KKv3/KBIEB/KjLZ4=; b=heiaU3ALL/XBsRGvzi+ohkf9IU+k2IZO3zVKhxpSm4KWldqJDmfgpoyDj38X3CtQ 2SsVoGrAZscGN9K7bASueuSiT9uU2jU3Woz+npP69r/qq9/Uykvvh5dHyZEwcB7Ivjk +p9kboqCaUfv7Zny0aPqoNtW0j+//EZ3y36hMjyQ= Received: by mx.zohomail.com with SMTPS id 1772220140565558.7417148774391; Fri, 27 Feb 2026 11:22:20 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:19 +0100 Subject: [PATCH v9 14/19] drm/rockchip: dw_hdmi_qp: Set supported_formats platdata 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: <20260227-color-format-v9-14-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 With the introduction of the supported_formats member in the dw-hdmi-qp platform data struct, drivers that have access to this information should now set it. Set it in the rockchip dw_hdmi_qp glue driver. This allows this information to be passed down to the dw-hdmi-qp core, which sets it in the bridge it creates, and consequently will allow the common HDMI bridge code to act on it. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c b/drivers/gpu/d= rm/rockchip/dw_hdmi_qp-rockchip.c index e2fa1aa53394..ec78c6895334 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -601,6 +601,10 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev= , struct device *master, plat_data.phy_data =3D hdmi; plat_data.max_bpc =3D 10; =20 + plat_data.supported_formats =3D BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422); + encoder =3D &hdmi->encoder.encoder; encoder->possible_crtcs =3D drm_of_find_possible_crtcs(drm, dev->of_node); =20 --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 D2A62350A3D; Fri, 27 Feb 2026 19:23:15 +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=1772220196; cv=pass; b=HaWKnTxR0xW2VOTdMF/iynHFZgcEDi2GOfhYcSuJQsv8o2kZUnD4mu5kmxaeYjVdRz0caZzGt9xT+C4eRR152kKSOp5Xrgjf8Q5F6B1kt1DQ5YOkkbSy6DHtDrSxTpc3faTcERQAtHW4UTwoZDL/zx352OLjfFXB/qY/igNqaKs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220196; c=relaxed/simple; bh=oBSWN62IibnFnCQmLpbIv44lsRqqdBguI+hZv9qNSBA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jjLJnFVT8KfydY1nduERLIOIf774IqDcRt3gCluT/tPT5oW+VwyKyQiGD0gv1ioXZHb5pyMbKlFUrH/zsyNZ+KWouz0cPzQxsf7hjojWq7ewr/9CumvrCKHbfT/2zKVJlUEJ26O9Nb7/N/oJltf7trAfdI+dhK+bMqIMFdBANfc= 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=C3irqXu1; 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="C3irqXu1" ARC-Seal: i=1; a=rsa-sha256; t=1772220150; cv=none; d=zohomail.com; s=zohoarc; b=EdZCg6fGs+j9LtRPVxCG0zu66UEeFOmvEZy6vT6SL261Eglpz9QfO/O74eXTEKVtNlyGkmBSziSmI2eECZlElGBRqTBGlttvydMPXhdphzsFtj3xPOJn8X2mW3+q194/mBPOlNzLai/YH0goWNAOcUbi1IMa7RhCqj7omE4zARQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220150; 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=rGz8JSV3iqEGvq9K50R3G03AepayDjOIXyFue+QKcWA=; b=gGiyxColW+r7sTUAUxFs3EYN5OSRr5oAIqbRSKijeSTfi0ptFhEM91AlsIuzRvC1paVwyHc4oH3U0AUwVRguXeE3VCxnAhr3FerS6uxc5cKSr+C2ZZ0Rzz/bvCloDSY5jHS/6WZ6GVUMmltr+GLJO2+OzbJwaFREA2C9lfghUfU= 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=1772220149; 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=rGz8JSV3iqEGvq9K50R3G03AepayDjOIXyFue+QKcWA=; b=C3irqXu1g5kX6QRmI3AC8yhAA2P6knyUVYIFUnlyLJj1qop7R09A34c/KFAwzkJS qgkXZ5TjKHQxJkubRSjkXXAVpiF73TJsgrFChmRVPDzwkAqJ7b8RJsxN2XgbtoTvNVc ZXJqzb47HraEQ7VWcnKBspHS1DAWn3MdMzQxuVw0= Received: by mx.zohomail.com with SMTPS id 1772220147956614.5353699061003; Fri, 27 Feb 2026 11:22:27 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:20 +0100 Subject: [PATCH v9 15/19] drm/connector: Register color format property on HDMI connectors 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: <20260227-color-format-v9-15-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 The drmm_connector_hdmi_init function can figure out what DRM color formats are supported by a particular connector based on the supported HDMI format bitmask that's passed in. Use it to register the drm color format property. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/drm_connector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index a4907e15dfc5..0f4e24446a9e 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -627,6 +627,9 @@ int drmm_connector_hdmi_init(struct drm_device *dev, if (max_bpc > 8) drm_connector_attach_hdr_output_metadata_property(connector); =20 + if (!drm_mode_create_color_format_property(connector, supported_formats)) + drm_connector_attach_color_format_property(connector); + connector->hdmi.funcs =3D hdmi_funcs; =20 return 0; --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 81C833A1D1A; Fri, 27 Feb 2026 19:23:23 +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=1772220204; cv=pass; b=BR9K54rKvd+qsoPkB27VZ1mgXyku7o53F8vKut7SLdD8bzN0yvQy2qkrs3UPUB6gL7R6Gc7Tc5pBAQs8nknE99v2AUf+uYyWMJxGYwvOPpthA5lKScTrmwk0kg+HJ64EgmE9s++BaRQ2YF0kTzqqHDvNU8hHJqq6VupmINEg/gs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220204; c=relaxed/simple; bh=7i8f4Csa8L49OxZvBjIK2AYm9iejmy8gZ7fL8wGe4p4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=teHKnMWTtuk38bix1A7wUtx8NWF4n+DXI+z3a0ejUjVU2+Yo6Sb9xNAQh7b64Ee6ls/nq2eRDZc2S0op6Qremrw9Y1eeX5nNcF1gZafZIhQ3GWb1lL3pHbwF9s23w5GRvoVVTQDbYREdBcqXxLy6KL2/ZirADx5OuvOE/brK38E= 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=dosr26IT; 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="dosr26IT" ARC-Seal: i=1; a=rsa-sha256; t=1772220158; cv=none; d=zohomail.com; s=zohoarc; b=nL+HbFzEyfE7OZ8vguNzVm1yzOMlLX7uYODJPxu5CXxy0ZRylF3PYDT+jX2yVLBMf1aZbeuOsPfxzOIK27tFCeD1WoyXlbAtk4VWGWAQ/mehcYu34+5vPydhtufzs3GKsHPv/mUzIBCgggBJruree/fnulpSLNHvPnCHrwOQta4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220158; 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=oBUEH9z6fnnMMO3qVEtl/mVjCKKVwrQw2lUD6hVHl4g=; b=melB5lpHfH8O+RrpmxwH/HBF4t6VKa401CMMhULkAHCMktiNH928H7LcnmUHRMfA2uis/TXd6f1Akl91lI6HgGjdrfiXdF0op6BbccQuPYomZYZ88UwjaozUBPkvrXCfatKX0a42wanpP7IBD8WBTgtHThgOTkF6lrjfAeSWdTA= 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=1772220158; 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=oBUEH9z6fnnMMO3qVEtl/mVjCKKVwrQw2lUD6hVHl4g=; b=dosr26ITHkE/cwB7OJ3ie5+TxllQyjXHVtgg9UWc4JAOOXLZDiGrDjP1PESFwA/s Ok52Ebt70YlF7hEmW6n4/xQKgt3CyycBp/5JR1Ia+s69WZABcM9A78325N7A8enIyuo doSll/XAXnjT5V4DmAfWbKHROUAzR/UEH0v9PKp8= Received: by mx.zohomail.com with SMTPS id 1772220155381505.28346650399897; Fri, 27 Feb 2026 11:22:35 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:21 +0100 Subject: [PATCH v9 16/19] drm/tests: hdmi: Add tests for the color_format property 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: <20260227-color-format-v9-16-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 Add some KUnit tests to check the color_format property is working as expected with the HDMI state helper. Existing tests are extended to also test the DRM_CONNECTOR_COLOR_FORMAT_AUTO case, in order to avoid duplicating test cases. For the explicitly selected color format cases, parameterized tests are added. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 236 +++++++++++++++++= ++++ 1 file changed, 236 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/g= pu/drm/tests/drm_hdmi_state_helper_test.c index a4357efaa983..3444c93c615f 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -60,6 +60,23 @@ static struct drm_display_mode *find_preferred_mode(stru= ct drm_connector *connec return preferred; } =20 +static struct drm_display_mode *find_420_only_mode(struct drm_connector *c= onnector) +{ + struct drm_device *drm =3D connector->dev; + struct drm_display_mode *mode; + + mutex_lock(&drm->mode_config.mutex); + list_for_each_entry(mode, &connector->modes, head) { + if (drm_mode_is_420_only(&connector->display_info, mode)) { + mutex_unlock(&drm->mode_config.mutex); + return mode; + } + } + mutex_unlock(&drm->mode_config.mutex); + + return NULL; +} + static int set_connector_edid(struct kunit *test, struct drm_connector *co= nnector, const void *edid, size_t edid_len) { @@ -1547,6 +1564,7 @@ static void drm_test_check_max_tmds_rate_bpc_fallback= _yuv420(struct kunit *test) * RGB/10bpc * - The chosen mode has a TMDS character rate lower than the display * supports in YUV422/12bpc. + * - The HDMI connector state's color format property is unset (i.e. AUTO) * * Then we will prefer to keep the RGB format with a lower bpc over * picking YUV422. @@ -1609,6 +1627,7 @@ static void drm_test_check_max_tmds_rate_bpc_fallback= _ignore_yuv422(struct kunit =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); + KUNIT_ASSERT_EQ(test, conn_state->color_format, DRM_CONNECTOR_COLOR_FORMA= T_AUTO); =20 KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 10); KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FO= RMAT_RGB444); @@ -1626,6 +1645,7 @@ static void drm_test_check_max_tmds_rate_bpc_fallback= _ignore_yuv422(struct kunit * RGB/8bpc * - The chosen mode has a TMDS character rate lower than the display * supports in YUV420/12bpc. + * - The HDMI connector state's color format property is unset (i.e. AUTO) * * Then we will prefer to keep the RGB format with a lower bpc over * picking YUV420. @@ -1687,6 +1707,7 @@ static void drm_test_check_max_tmds_rate_bpc_fallback= _ignore_yuv420(struct kunit =20 conn_state =3D conn->state; KUNIT_ASSERT_NOT_NULL(test, conn_state); + KUNIT_ASSERT_EQ(test, conn_state->color_format, DRM_CONNECTOR_COLOR_FORMA= T_AUTO); =20 KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_bpc, 8); KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FO= RMAT_RGB444); @@ -2198,6 +2219,217 @@ static void drm_test_check_disable_connector(struct= kunit *test) drm_modeset_acquire_fini(&ctx); } =20 +struct color_format_test_param { + enum drm_connector_color_format fmt; + enum drm_output_color_format expected; + int expected_ret; + const char *desc; +}; + +/* Test that if: + * - an HDMI connector supports RGB, YUV444, YUV422, and YUV420 + * - the display supports RGB, YUV444, YUV422, and YUV420 + * - the "color format" property is set + * then, for the preferred mode, for a given "color format" option: + * - DRM_CONNECTOR_COLOR_FORMAT_AUTO results in an output format of RGB + * - DRM_CONNECTOR_COLOR_FORMAT_YCBCR422 results in an output format of YU= V422 + * - DRM_CONNECTOR_COLOR_FORMAT_YCBCR420 results in an output format of YU= V420 + * - DRM_CONNECTOR_COLOR_FORMAT_YCBCR444 results in an output format of YU= V444 + * - DRM_CONNECTOR_COLOR_FORMAT_RGB results in an HDMI output format of RGB + */ +static void drm_test_check_hdmi_color_format(struct kunit *test) +{ + const struct color_format_test_param *param =3D test->param_value; + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_info *info; + struct drm_display_mode *preferred; + int ret; + + priv =3D drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444), + 12, + &dummy_connector_hdmi_funcs, + test_edid_hdmi_4k_rgb_yuv420_dc_max_340mhz); + KUNIT_ASSERT_NOT_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + KUNIT_ASSERT_TRUE(test, priv->connector.ycbcr_420_allowed); + + info =3D &priv->connector.display_info; + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, info); + preferred =3D find_preferred_mode(&priv->connector); + KUNIT_ASSERT_TRUE(test, drm_mode_is_420(info, preferred)); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + + conn_state =3D drm_atomic_get_connector_state(state, &priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + conn_state->color_format =3D param->fmt; + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, preferred); + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_check_only(state); + KUNIT_EXPECT_EQ(test, ret, param->expected_ret); + KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, param->expected); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +static const struct color_format_test_param hdmi_color_format_params[] =3D= { + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_AUTO, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_RGB444, + .expected_ret =3D 0, + .desc =3D "AUTO -> RGB" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR422, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR422, + .expected_ret =3D 0, + .desc =3D "YCBCR422 -> YUV422" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR420, + .expected_ret =3D 0, + .desc =3D "YCBCR420 -> YUV420" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR444, + .expected_ret =3D 0, + .desc =3D "YCBCR444 -> YUV444" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_RGB444, + .expected_ret =3D 0, + .desc =3D "RGB -> RGB" + }, +}; + +KUNIT_ARRAY_PARAM_DESC(check_hdmi_color_format, hdmi_color_format_params, = desc); + +/* Test that if: + * - the HDMI connector supports RGB, YUV422, YUV420, and YUV444 + * - the display has a YUV420-only mode + * - the "color format" property is explicitly set (i.e. !AUTO) + * then: + * - color format DRM_CONNECTOR_COLOR_FORMAT_RGB444 will fail + * drm_atomic_check_only for the YUV420-only mode with -EINVAL + * - color format DRM_CONNECTOR_COLOR_FORMAT_YCBCR444 will fail + * drm_atomic_check_only for the YUV420-only mode with -EINVAL + * - color format DRM_CONNECTOR_COLOR_FORMAT_YCBCR422 will fail + * drm_atomic_check_only for the YUV420-only mode with -EINVAL + * - color format DRM_CONNECTOR_COLOR_FORMAT_YCBCR420 passes + * drm_atomic_check_only for the YUV420-only mode + */ +static void drm_test_check_hdmi_color_format_420_only(struct kunit *test) +{ + const struct color_format_test_param *param =3D test->param_value; + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *dank; + int ret; + + priv =3D drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, + BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444), + 12, + &dummy_connector_hdmi_funcs, + test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz); + KUNIT_ASSERT_NOT_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + dank =3D find_420_only_mode(&priv->connector); + KUNIT_ASSERT_NOT_NULL(test, dank); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + + conn_state =3D drm_atomic_get_connector_state(state, &priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + conn_state->color_format =3D param->fmt; + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, dank); + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_check_only(state); + KUNIT_EXPECT_EQ(test, ret, param->expected_ret); + if (!param->expected_ret) + KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, param->expected); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +}; + +static const struct color_format_test_param hdmi_color_format_420_only_par= ams[] =3D { + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_RGB444, + .expected_ret =3D -EINVAL, + .desc =3D "RGB should fail" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR444, + .expected_ret =3D -EINVAL, + .desc =3D "YUV444 should fail" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR422, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR422, + .expected_ret =3D -EINVAL, + .desc =3D "YUV422 should fail" + }, + { + .fmt =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR420, + .expected =3D DRM_OUTPUT_COLOR_FORMAT_YCBCR420, + .expected_ret =3D 0, + .desc =3D "YUV420 should work" + }, +}; + +KUNIT_ARRAY_PARAM_DESC(check_hdmi_color_format_420_only, + hdmi_color_format_420_only_params, desc); + static struct kunit_case drm_atomic_helper_connector_hdmi_check_tests[] = =3D { KUNIT_CASE(drm_test_check_broadcast_rgb_auto_cea_mode), KUNIT_CASE(drm_test_check_broadcast_rgb_auto_cea_mode_vic_1), @@ -2227,6 +2459,10 @@ static struct kunit_case drm_atomic_helper_connector= _hdmi_check_tests[] =3D { KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_8bpc), KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_10bpc), KUNIT_CASE(drm_test_check_tmds_char_rate_rgb_12bpc), + KUNIT_CASE_PARAM(drm_test_check_hdmi_color_format, + check_hdmi_color_format_gen_params), + KUNIT_CASE_PARAM(drm_test_check_hdmi_color_format_420_only, + check_hdmi_color_format_420_only_gen_params), /* * TODO: We should have tests to check that a change in the * format triggers a CRTC mode change just like we do for the --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 9DC6E43CEF3; Fri, 27 Feb 2026 19:23:26 +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=1772220208; cv=pass; b=W8MA4uVeAPrt/8Eg4uGx+CZBKqFFMYXlEnuFJjOZnfP3Y5s8o4kpQeTkhzDg6CyBaCzO2sV5kk/GQzDGuqoabnxO1P+oBB8/ckv0u8tx8+GBKIAebN8BMFJOcMSOREOUGKOHw7lO52whTAjhtK+3LaJtKRAOpur4rMT+QUpYApk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220208; c=relaxed/simple; bh=sFwn5ED1nGb2x7YyOKVbkg5A1ouxDS6JzDAW5s1Piyo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tp1aj1xSLUpKshvUQwxLN/eq5RAZ36G7GWUdOXQt2mSomsxdou/nhfz/+61ajouygeOlwyEJ6YdNm2sUJPxjKCJJweW03EH6rgSdyFpJ47QZT+BVzXKf4xweau6Ou6YgmUzzsmnD6vUMMs43KW8IGu8DovueTR+Bli+hzgfLKA0= 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=Bc0K/pB7; 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="Bc0K/pB7" ARC-Seal: i=1; a=rsa-sha256; t=1772220164; cv=none; d=zohomail.com; s=zohoarc; b=ZAZ5ubKdwplGcIs94bYa3iSIapjedzG4WRtisO9/HQTRuPJAoeulytlGGHHvZNawUIF0T0SGTv3cmGjUTAwEI9ktL2jkG7FdpdakwoN85Z+C1ULdD64qn3f41FaHJhjydxMPfxFocbbUIIletaTnyHf06GKh0V1DQGlkWHPwyjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220164; 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=Nt62OO2AP7f+cfOhlF2MV/RbDyVdkbuWQbRENaudCYk=; b=M6WzKACGBK+A+vavwnlHxjscuYrSCaY+BoX1nF9xrNHXxTvab//vxLvdSBWDAipjq1CETl49Pfq4trMcmmAtHcujSz29m6Rw77asG3RYwSKYqD9S7zcznEDAJJoTPeb2XL65GAm4YiZCHzQ2uS57SYQxwM82t8WTqc/506GOhyU= 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=1772220164; 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=Nt62OO2AP7f+cfOhlF2MV/RbDyVdkbuWQbRENaudCYk=; b=Bc0K/pB7A8rqX04gfbgPVpzjGw79lZ4Dl6IvqxPqQXgMOkHfVIChwAeuscyjtq8T apkRPel0iBroY/sNWDPzmqVFSUvrex0Z1wcE57PPSJeIepLa3voHH5UZ6yFqVeyb6Dv Q0PlGt/s3AWk+bip+VTgFf/gNwgpScNwfuM8hdK4= Received: by mx.zohomail.com with SMTPS id 1772220162744578.6872632752585; Fri, 27 Feb 2026 11:22:42 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:22 +0100 Subject: [PATCH v9 17/19] drm/tests: hdmi: Add tests for HDMI helper's mode_valid 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: <20260227-color-format-v9-17-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 Add some KUnit tests to verify that the HDMI state helper's mode_valid implementation does not improperly reject chroma subsampled modes on the basis of their clock rate not being satisfiable in RGB. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 109 +++++++++++++++++= ++++ 1 file changed, 109 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c b/drivers/g= pu/drm/tests/drm_hdmi_state_helper_test.c index 3444c93c615f..74c9933eabfc 100644 --- a/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c @@ -77,6 +77,23 @@ static struct drm_display_mode *find_420_only_mode(struc= t drm_connector *connect return NULL; } =20 +static struct drm_display_mode *find_420_also_mode(struct drm_connector *c= onnector) +{ + struct drm_device *drm =3D connector->dev; + struct drm_display_mode *mode; + + mutex_lock(&drm->mode_config.mutex); + list_for_each_entry(mode, &connector->modes, head) { + if (drm_mode_is_420_also(&connector->display_info, mode)) { + mutex_unlock(&drm->mode_config.mutex); + return mode; + } + } + mutex_unlock(&drm->mode_config.mutex); + + return NULL; +} + static int set_connector_edid(struct kunit *test, struct drm_connector *co= nnector, const void *edid, size_t edid_len) { @@ -2745,11 +2762,103 @@ static void drm_test_check_mode_valid_reject_max_c= lock(struct kunit *test) KUNIT_EXPECT_EQ(test, preferred->clock, 25200); } =20 +/* + * Test that drm_hdmi_connector_mode_valid() will accept modes that requir= e a + * 4:2:0 chroma subsampling, even if said mode would violate maximum clock + * constraints if it used RGB 4:4:4. + */ +static void drm_test_check_mode_valid_yuv420_only_max_clock(struct kunit *= test) +{ + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_display_mode *dank; + struct drm_connector *conn; + + priv =3D drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, + BIT(HDMI_COLORSPACE_RGB) | + BIT(HDMI_COLORSPACE_YUV420), + 8, + &dummy_connector_hdmi_funcs, + test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz); + KUNIT_ASSERT_NOT_NULL(test, priv); + + conn =3D &priv->connector; + KUNIT_ASSERT_EQ(test, conn->display_info.max_tmds_clock, 200 * 1000); + + dank =3D find_420_only_mode(conn); + KUNIT_ASSERT_NOT_NULL(test, dank); + KUNIT_EXPECT_EQ(test, dank->hdisplay, 3840); + KUNIT_EXPECT_EQ(test, dank->vdisplay, 2160); + + /* + * Note: The mode's "clock" here is not accurate to the actual TMDS + * clock that HDMI will use for a subsampled mode. Hence, why the mode's + * clock is above the .max_tmds_clock of 200MHz. + */ + KUNIT_EXPECT_EQ(test, dank->clock, 297000); +} + +/* + * Test that drm_hdmi_connector_mode_valid() will reject modes that require + * 4:2:0 chroma subsampling, if the connector does not support 4:2:0. + */ +static void +drm_test_check_mode_valid_reject_yuv420_only_connector(struct kunit *test) +{ + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_display_mode *dank; + struct drm_connector *conn; + + priv =3D drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, + BIT(HDMI_COLORSPACE_RGB), + 8, + &dummy_connector_hdmi_funcs, + test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz); + KUNIT_ASSERT_NOT_NULL(test, priv); + + conn =3D &priv->connector; + KUNIT_ASSERT_EQ(test, conn->display_info.max_tmds_clock, 200 * 1000); + + dank =3D find_420_only_mode(conn); + KUNIT_EXPECT_NULL(test, dank); +} + +/* + * Test that drm_hdmi_connector_mode_valid() will accept modes that allow = (among + * other color formats) 4:2:0 chroma subsampling, even if the connector do= es not + * support 4:2:0, but the mode's clock works for RGB 4:4:4. + */ +static void +drm_test_check_mode_valid_accept_yuv420_also_connector_rgb(struct kunit *t= est) +{ + struct drm_atomic_helper_connector_hdmi_priv *priv; + struct drm_display_mode *mode; + struct drm_connector *conn; + + priv =3D drm_kunit_helper_connector_hdmi_init_with_edid_funcs(test, + BIT(HDMI_COLORSPACE_RGB), + 8, + &dummy_connector_hdmi_funcs, + test_edid_hdmi_4k_rgb_yuv420_dc_max_340mhz); + KUNIT_ASSERT_NOT_NULL(test, priv); + + conn =3D &priv->connector; + KUNIT_ASSERT_EQ(test, conn->display_info.max_tmds_clock, 340 * 1000); + + mode =3D find_420_also_mode(conn); + KUNIT_ASSERT_NOT_NULL(test, mode); + KUNIT_EXPECT_EQ(test, mode->hdisplay, 3840); + KUNIT_EXPECT_EQ(test, mode->vdisplay, 2160); + KUNIT_EXPECT_EQ(test, mode->clock, 297000); +} + static struct kunit_case drm_atomic_helper_connector_hdmi_mode_valid_tests= [] =3D { KUNIT_CASE(drm_test_check_mode_valid), KUNIT_CASE(drm_test_check_mode_valid_reject), KUNIT_CASE(drm_test_check_mode_valid_reject_rate), KUNIT_CASE(drm_test_check_mode_valid_reject_max_clock), + KUNIT_CASE(drm_test_check_mode_valid_yuv420_only_max_clock), + KUNIT_CASE(drm_test_check_mode_valid_reject_yuv420_only_connector), + KUNIT_CASE(drm_test_check_mode_valid_accept_yuv420_also_connector_rgb), { } }; =20 --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 51BD3407579; Fri, 27 Feb 2026 19:23:41 +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=1772220223; cv=pass; b=BuzfETdD02ZBIFrQbOpBxwzR+avC9RnN2+ITFGzAV49mDcOPdEONPlMW1wQOCtrIopEmyWW3NrUeY/pN7fyz7gjOjs/l5zh0zjHW/qhfdIwgZVilmbCnojWqIrFVHVCTzGEoNni2+q46VYCq5OcPoDy3k6toBQIMiyIBSg1ICMw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220223; c=relaxed/simple; bh=gE3GP7pL5rLbMcZ0b/LhcM3dKn6E06rU4M/iE0WWFUE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=huYcCdZoiZ/dufHSpq0gPrxuGrMeIv2vlEFi+ArR3QypU7QTiyZUvrDpgHJbek6SEKK5++DYG+v+fR9S8cq3330F4mjIg6vfpVPTNtNPoVFhc2gaLVfsgtbvZxQ2KzDJJmaFlGLg412JQA8ZJ9qBQ0OfBQt/k/8aMiPRWBuTng0= 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=cm2umcSS; 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="cm2umcSS" ARC-Seal: i=1; a=rsa-sha256; t=1772220172; cv=none; d=zohomail.com; s=zohoarc; b=MAIlfC7ZqkqNrVnBT0P45cJFungCT3vqfYFVMNCgAvx2XjKF9bzEE7nMuRb+Tinta1XgOfCfHA6NKcivqprR6q/ogd18xWl3tIIuLS3mRITV5iL+0TZbt4DGzdHGj3kgOZHLifcgXaGXj3b4GPMUTj+Epyu0IaplR8QMqqoFdFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220172; 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=Q6LewHLgG66mB+cKlrE6Jmde9yR3/vCwSuAKYYuzjYw=; b=L7A7jORPFntLMyXivzluZJv/KUa++f0FMaAMSiUSizEt7q+g9r4nq0T7d0XNAyJuS+574RgxOD3t1D1BVpD1m/0Q8EsPzjaWIP5lu4qM/SW9O9ifgmOojbsSzmHVBCEk0ppHxMVS3KA9KmUUj2bG8cv/piuGDrW5fpQHF+TKgbg= 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=1772220171; 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=Q6LewHLgG66mB+cKlrE6Jmde9yR3/vCwSuAKYYuzjYw=; b=cm2umcSSbNgoXj9QzCrSg/AQl2lCOfghzJrH0XrJKY7nKwbfTx8woPUzyGBEiONP s04BY5GYpUaJVvd0c7akXbNGmWZpgnziuSRo/a1/ralMkvC2Avl2FTsgyLxYBp+aALq FnCh1Gl0k0abfjyUpTeXslVlXOjqpqQagPSkwCvU= Received: by mx.zohomail.com with SMTPS id 177222017032899.09227981845538; Fri, 27 Feb 2026 11:22:50 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:23 +0100 Subject: [PATCH v9 18/19] drm/tests: bridge: Add KUnit tests for bridge chain format selection 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: <20260227-color-format-v9-18-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 With the "color format" property, the bridge chain format selection has gained increased complexity. Instead of simply finding any sequence of bus formats that works, the bridge chain format selection needs to pick a sequence that results in the requested color format. Add KUnit tests for this new logic. These take the form of some pleasant preprocessor macros to make it less cumbersome to define test bridges with a set of possible input and output formats. The input and output formats are defined for bridges in the form of tuples, where the first member defines the input format, and the second member defines the output format that can be produced from this input format. This means the tests can construct scenarios in which not all inputs can be converted to all outputs. Some tests are added to test interesting scenarios to exercise the bus format selection in the presence of a specific color format request. Furthermore, tests are added to verify that bridge chains that end in an HDMI connector will always prefer RGB when the color format is DRM_CONNECTOR_COLOR_FORMAT_AUTO, as is the behaviour in the HDMI state helpers. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/tests/drm_bridge_test.c | 787 ++++++++++++++++++++++++++++= ++++ 1 file changed, 787 insertions(+) diff --git a/drivers/gpu/drm/tests/drm_bridge_test.c b/drivers/gpu/drm/test= s/drm_bridge_test.c index 887020141c7f..cb821c606070 100644 --- a/drivers/gpu/drm/tests/drm_bridge_test.c +++ b/drivers/gpu/drm/tests/drm_bridge_test.c @@ -2,15 +2,23 @@ /* * Kunit test for drm_bridge functions */ +#include +#include + #include +#include #include #include #include +#include #include +#include =20 #include #include =20 +#include "drm_kunit_edid.h" + /* * Mimick the typical "private" struct defined by a bridge driver, which * embeds a bridge plus other fields. @@ -37,6 +45,21 @@ struct drm_bridge_init_priv { bool destroyed; }; =20 +struct drm_bridge_chain_priv { + struct drm_device drm; + struct drm_encoder encoder; + struct drm_plane *plane; + struct drm_crtc *crtc; + struct drm_connector *connector; + unsigned int num_bridges; + + /** + * @test_bridges: array of pointers to &struct drm_bridge_priv entries + * of which the first @num_bridges entries are valid. + */ + struct drm_bridge_priv **test_bridges; +}; + static struct drm_bridge_priv *bridge_to_priv(struct drm_bridge *bridge) { return container_of(bridge, struct drm_bridge_priv, bridge); @@ -95,6 +118,229 @@ static const struct drm_bridge_funcs drm_test_bridge_a= tomic_funcs =3D { .atomic_reset =3D drm_atomic_helper_bridge_reset, }; =20 +/** + * struct fmt_tuple - a tuple of input/output MEDIA_BUS_FMT_* + */ +struct fmt_tuple { + u32 in_fmt; + u32 out_fmt; +}; + +/* + * Format mapping that only accepts RGB888, and outputs only RGB888 + */ +static const struct fmt_tuple rgb8_passthrough[] =3D { + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, +}; + +/* + * Format mapping that only accepts YUV444, and outputs only YUV444 + */ +static const struct fmt_tuple yuv8_passthrough[] =3D { + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, +}; + +/* + * Format mapping where 8bpc RGB -> 8bpc YUV444, or ID(RGB) or ID(YUV444) + */ +static const struct fmt_tuple rgb8_to_yuv8_or_id[] =3D { + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, +}; + +static const struct fmt_tuple rgb8_to_id_yuv8_or_yuv8_to_yuv422_yuv420[] = =3D { + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_UYVY8_1X16 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_UYYVYY8_0_5X24 }, +}; + +/* + * Format mapping where 8bpc YUV444 -> 8bpc RGB, or ID(YUV444) + */ +static const struct fmt_tuple yuv8_to_rgb8_or_id[] =3D { + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, +}; + +/* + * A format mapping that acts like a video processor that generates an RGB= signal + */ +static const struct fmt_tuple rgb_producer[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB101010_1X30 }, + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB121212_1X36 }, +}; + +/* + * A format mapping that acts like a video processor that generates an 8-b= it RGB, + * YUV444 or YUV420 signal + */ +static const struct fmt_tuple rgb_yuv444_yuv420_producer[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_UYYVYY8_0_5X24 }, +}; + +static const struct fmt_tuple rgb8_yuv444_yuv422_passthrough[] =3D { + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_UYVY8_1X16 }, +}; + +static const struct fmt_tuple yuv444_yuv422_rgb8_passthrough[] =3D { + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_UYVY8_1X16 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, +}; + +static bool fmt_in_list(const u32 fmt, const u32 *out_fmts, const size_t n= um_fmts) +{ + size_t i; + + for (i =3D 0; i < num_fmts; i++) + if (out_fmts[i] =3D=3D fmt) + return true; + + return false; +} + +/** + * get_tuples_out_fmts - Get unique output formats of a &struct fmt_tuple = list + * @fmt_tuples: array of &struct fmt_tuple + * @num_fmt_tuples: number of entries in @fmt_tuples + * @out_fmts: target array to store the unique output bus formats + * + * Returns the number of unique output formats, i.e. the number of entries= in + * @out_fmts that were populated with sensible values. + */ +static size_t get_tuples_out_fmts(const struct fmt_tuple *fmt_tuples, + const size_t num_fmt_tuples, u32 *out_fmts) +{ + size_t num_unique =3D 0; + size_t i; + + for (i =3D 0; i < num_fmt_tuples; i++) + if (!fmt_in_list(fmt_tuples[i].out_fmt, out_fmts, num_unique)) + out_fmts[num_unique++] =3D fmt_tuples[i].out_fmt; + + return num_unique; +} + +#define DEFINE_FMT_FUNCS_FROM_TUPLES(name) \ +static u32 *drm_test_bridge_ ## name ## _out_fmts(struct drm_bridge *bridg= e, \ + struct drm_bridge_state *bridge_state, \ + struct drm_crtc_state *crtc_state, \ + struct drm_connector_state *conn_state, \ + unsigned int *num_output_fmts) \ +{ \ + u32 *out_fmts =3D kcalloc(ARRAY_SIZE((name)), sizeof(u32), GFP_KERNEL); = \ + \ + if (out_fmts) \ + *num_output_fmts =3D get_tuples_out_fmts((name), ARRAY_SIZE((name)), out= _fmts); \ + else \ + *num_output_fmts =3D 0; \ + \ + return out_fmts; \ +} \ + \ +static u32 *drm_test_bridge_ ## name ## _in_fmts(struct drm_bridge *bridge= , \ + struct drm_bridge_state *bridge_state, \ + struct drm_crtc_state *crtc_state, \ + struct drm_connector_state *conn_state, \ + u32 output_fmt, \ + unsigned int *num_input_fmts) \ +{ \ + u32 *in_fmts =3D kcalloc(ARRAY_SIZE((name)), sizeof(u32), GFP_KERNEL); \ + unsigned int num_fmts =3D 0; \ + size_t i; \ + \ + if (!in_fmts) { \ + *num_input_fmts =3D 0; \ + return NULL; \ + } \ + \ + for (i =3D 0; i < ARRAY_SIZE((name)); i++) \ + if ((name)[i].out_fmt =3D=3D output_fmt) \ + in_fmts[num_fmts++] =3D (name)[i].in_fmt; \ + \ + *num_input_fmts =3D num_fmts; \ + \ + return in_fmts; \ +} + +#define DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_HDMI_FUNC(ident, input_fmts_func, o= utput_fmts_func, \ + hdmi_write_infoframe_func, \ + hdmi_clear_infoframe_func) \ +static const struct drm_bridge_funcs (ident) =3D { \ + .atomic_enable =3D drm_test_bridge_atomic_enable, \ + .atomic_disable =3D drm_test_bridge_atomic_disable, \ + .atomic_destroy_state =3D drm_atomic_helper_bridge_destroy_state, \ + .atomic_duplicate_state =3D drm_atomic_helper_bridge_duplicate_state, \ + .atomic_reset =3D drm_atomic_helper_bridge_reset, \ + .atomic_get_input_bus_fmts =3D (input_fmts_func), \ + .atomic_get_output_bus_fmts =3D (output_fmts_func), \ + .hdmi_write_avi_infoframe =3D (hdmi_write_infoframe_func), \ + .hdmi_clear_avi_infoframe =3D (hdmi_clear_infoframe_func), \ + .hdmi_write_hdmi_infoframe =3D (hdmi_write_infoframe_func), \ + .hdmi_clear_hdmi_infoframe =3D (hdmi_clear_infoframe_func), \ +} + +#define DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_FUNC(ident, input_fmts_func, output= _fmts_func) \ + DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_HDMI_FUNC(ident, input_fmts_func, output_f= mts_func, \ + NULL, NULL) + +#define DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(_name) \ + DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_FUNC(_name ## _funcs, \ + drm_test_bridge_ ## _name ## _in_fmts, \ + drm_test_bridge_ ## _name ## _out_fmts) + +static int drm_test_bridge_write_infoframe_stub(struct drm_bridge *bridge, + const u8 *buffer, size_t len) +{ + return 0; +} + +static int drm_test_bridge_clear_infoframe_stub(struct drm_bridge *bridge) +{ + return 0; +} + +#define DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_HDMI(_name) \ + DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_HDMI_FUNC(_name ## _hdmi ## _funcs, \ + drm_test_bridge_ ## _name ## _in_fmts, \ + drm_test_bridge_ ## _name ## _out_fmts, \ + drm_test_bridge_write_infoframe_stub, \ + drm_test_bridge_clear_infoframe_stub) +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb8_passthrough) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb8_passthrough); + +DEFINE_FMT_FUNCS_FROM_TUPLES(yuv8_passthrough) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(yuv8_passthrough); + +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb8_to_yuv8_or_id) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb8_to_yuv8_or_id); + +DEFINE_FMT_FUNCS_FROM_TUPLES(yuv8_to_rgb8_or_id) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(yuv8_to_rgb8_or_id); + +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb_producer) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb_producer); + +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb_yuv444_yuv420_producer) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb_yuv444_yuv420_producer); + +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb8_to_id_yuv8_or_yuv8_to_yuv422_yuv420) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb8_to_id_yuv8_or_yuv8_to_yuv422_yuv420); + +DEFINE_FMT_FUNCS_FROM_TUPLES(rgb8_yuv444_yuv422_passthrough) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(rgb8_yuv444_yuv422_passthrough); + +DEFINE_FMT_FUNCS_FROM_TUPLES(yuv444_yuv422_rgb8_passthrough) +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT(yuv444_yuv422_rgb8_passthrough); +DRM_BRIDGE_ATOMIC_WITH_BUS_FMT_HDMI(yuv444_yuv422_rgb8_passthrough); + KUNIT_DEFINE_ACTION_WRAPPER(drm_bridge_remove_wrapper, drm_bridge_remove, struct drm_bridge *); @@ -180,6 +426,119 @@ drm_test_bridge_init(struct kunit *test, const struct= drm_bridge_funcs *funcs) return priv; } =20 +static struct drm_bridge_chain_priv * +drm_test_bridge_chain_init(struct kunit *test, unsigned int num_bridges, + const struct drm_bridge_funcs **funcs) +{ + struct drm_bridge_chain_priv *priv; + const struct drm_edid *edid; + struct drm_bridge *prev; + struct drm_encoder *enc; + struct drm_bridge *bridge; + struct drm_device *drm; + bool has_hdmi =3D false; + struct device *dev; + unsigned int i; + int ret; + + dev =3D drm_kunit_helper_alloc_device(test); + if (IS_ERR(dev)) + return ERR_CAST(dev); + + priv =3D drm_kunit_helper_alloc_drm_device(test, dev, struct drm_bridge_c= hain_priv, + drm, DRIVER_MODESET | DRIVER_ATOMIC); + if (IS_ERR(priv)) + return ERR_CAST(priv); + + drm =3D &priv->drm; + + priv->test_bridges =3D drmm_kmalloc_array(drm, num_bridges, sizeof(*priv-= >test_bridges), + GFP_KERNEL); + if (!priv->test_bridges) + return ERR_PTR(-ENOMEM); + + priv->num_bridges =3D num_bridges; + + for (i =3D 0; i < num_bridges; i++) { + priv->test_bridges[i] =3D devm_drm_bridge_alloc(dev, struct drm_bridge_p= riv, + bridge, funcs[i]); + if (IS_ERR(priv->test_bridges[i])) + return ERR_CAST(priv->test_bridges[i]); + + priv->test_bridges[i]->data =3D priv; + } + + priv->plane =3D drm_kunit_helper_create_primary_plane(test, drm, NULL, NU= LL, + NULL, 0, NULL); + if (IS_ERR(priv->plane)) + return ERR_CAST(priv->plane); + + priv->crtc =3D drm_kunit_helper_create_crtc(test, drm, priv->plane, NULL, + NULL, NULL); + if (IS_ERR(priv->crtc)) + return ERR_CAST(priv->crtc); + + enc =3D &priv->encoder; + ret =3D drmm_encoder_init(drm, enc, NULL, DRM_MODE_ENCODER_TMDS, NULL); + if (ret) + return ERR_PTR(ret); + + enc->possible_crtcs =3D drm_crtc_mask(priv->crtc); + + prev =3D NULL; + for (i =3D 0; i < num_bridges; i++) { + bridge =3D &priv->test_bridges[i]->bridge; + bridge->type =3D DRM_MODE_CONNECTOR_VIRTUAL; + + if (bridge->funcs->hdmi_write_hdmi_infoframe) { + has_hdmi =3D true; + bridge->ops |=3D DRM_BRIDGE_OP_HDMI; + bridge->type =3D DRM_MODE_CONNECTOR_HDMIA; + bridge->vendor =3D "LNX"; + bridge->product =3D "KUnit"; + bridge->supported_formats =3D (BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR422) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420)); + } + + ret =3D drm_kunit_bridge_add(test, bridge); + if (ret) + return ERR_PTR(ret); + + ret =3D drm_bridge_attach(enc, bridge, prev, 0); + if (ret) + return ERR_PTR(ret); + + prev =3D bridge; + } + + priv->connector =3D drm_bridge_connector_init(drm, enc); + if (IS_ERR(priv->connector)) + return ERR_CAST(priv->connector); + + drm_connector_attach_encoder(priv->connector, enc); + + drm_mode_config_reset(drm); + + if (!has_hdmi) + return priv; + + scoped_guard(mutex, &drm->mode_config.mutex) { + edid =3D drm_edid_alloc(test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_20= 0mhz, + ARRAY_SIZE(test_edid_hdmi_1080p_rgb_yuv_4k_yuv420_dc_max_200mhz)); + if (!edid) + return ERR_PTR(-EINVAL); + + drm_edid_connector_update(priv->connector, edid); + KUNIT_ASSERT_GT(test, drm_edid_connector_add_modes(priv->connector), 0); + + ret =3D priv->connector->funcs->fill_modes(priv->connector, 4096, 4096); + } + + return priv; +} + /* * Test that drm_bridge_get_current_state() returns the last committed * state for an atomic bridge. @@ -508,14 +867,442 @@ static struct kunit_suite drm_bridge_alloc_test_suit= e =3D { .test_cases =3D drm_bridge_alloc_tests, }; =20 +/** + * drm_test_bridge_chain_verify_fmt - Verify bridge chain format selection + * @test: pointer to KUnit test object + * @priv: pointer to a &struct drm_bridge_chain_priv for this chain + * @expected: constant array of &struct fmt_tuple describing the expected + * input and output bus formats + * @num_expected: number of entries in @expected + * + * Runs the KUNIT_EXPECT clauses to verify the bridge chain format selecti= on + * resulted in the expected formats. If %0 is given as a format in a + * &struct fmt_tuple, then it is understood to mean "any". + * + * Must be called with the modeset lock held. + */ +static void drm_test_bridge_chain_verify_fmt(struct kunit *test, + struct drm_bridge_chain_priv *priv, + const struct fmt_tuple *const expected, + const unsigned int num_expected) +{ + struct drm_bridge_state *bstate; + unsigned int i =3D 0; + + drm_for_each_bridge_in_chain_scoped(&priv->encoder, bridge) { + KUNIT_ASSERT_LT(test, i, num_expected); + + bstate =3D drm_bridge_get_current_state(bridge); + if (expected[i].in_fmt) + KUNIT_EXPECT_EQ(test, bstate->input_bus_cfg.format, + expected[i].in_fmt); + if (expected[i].out_fmt) + KUNIT_EXPECT_EQ(test, bstate->output_bus_cfg.format, + expected[i].out_fmt); + + i++; + } + + KUNIT_ASSERT_EQ_MSG(test, i, num_expected, + "Fewer bridges (%u) than expected (%u)\n", i, num_expected); +} + +/* + * Test that constructs a bridge chain in which an RGB888 producer is chai= ned to + * two bridges that will convert from RGB to YUV and from YUV to RGB respe= ctively. + * + * The test requests an output color_format of RGB using the color_format = property, + * so to satisfy this request, the bridge chain must take a detour over YU= V. + */ +static void drm_test_bridge_rgb_yuv_rgb(struct kunit *test) +{ + static const struct drm_bridge_funcs *funcs[] =3D { + &rgb_producer_funcs, + &rgb8_to_yuv8_or_id_funcs, + &yuv8_to_rgb8_or_id_funcs, + }; + static const struct fmt_tuple expected[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + }; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_chain_priv *priv; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *mode; + int ret; + + priv =3D drm_test_bridge_chain_init(test, ARRAY_SIZE(funcs), funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + conn_state =3D drm_atomic_get_connector_state(state, priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + conn_state->color_format =3D DRM_CONNECTOR_COLOR_FORMAT_RGB444; + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_test_bridge_chain_verify_fmt(test, priv, expected, ARRAY_SIZE(expecte= d)); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test in which a bridge capable of producing RGB, YUV444 and YUV420 has = to + * produce RGB and convert with a downstream bridge in the chain to reach = the + * requested YUV444 color format, as no direct path exists between its YUV= 444 + * and the last bridge. + * + * The rationale behind this test is to devise a scenario in which naively + * assuming any format the video processor can output, and the connector + * requests, is the right format to pick, does not work. + */ +static void drm_test_bridge_must_convert_to_yuv444(struct kunit *test) +{ + static const struct drm_bridge_funcs *funcs[] =3D { + &rgb_yuv444_yuv420_producer_funcs, + &rgb8_passthrough_funcs, + &rgb8_to_id_yuv8_or_yuv8_to_yuv422_yuv420_funcs, + &rgb8_yuv444_yuv422_passthrough_funcs, + }; + static const struct fmt_tuple expected[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + }; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_chain_priv *priv; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *mode; + int ret; + + priv =3D drm_test_bridge_chain_init(test, ARRAY_SIZE(funcs), funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + conn_state =3D drm_atomic_get_connector_state(state, priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + conn_state->color_format =3D DRM_CONNECTOR_COLOR_FORMAT_YCBCR444; + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_test_bridge_chain_verify_fmt(test, priv, expected, ARRAY_SIZE(expecte= d)); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test which checks that no matter the order of bus formats returned by an + * HDMI bridge, RGB is preferred on DRM_CONNECTOR_COLOR_FORMAT_AUTO if it's + * available. + */ +static void drm_test_bridge_hdmi_auto_rgb(struct kunit *test) +{ + static const struct drm_bridge_funcs *funcs[] =3D { + &rgb_yuv444_yuv420_producer_funcs, + &yuv444_yuv422_rgb8_passthrough_hdmi_funcs, + }; + static const struct fmt_tuple expected[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_RGB888_1X24 }, + { MEDIA_BUS_FMT_RGB888_1X24, MEDIA_BUS_FMT_RGB888_1X24 }, + }; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_chain_priv *priv; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *mode; + int ret; + + priv =3D drm_test_bridge_chain_init(test, ARRAY_SIZE(funcs), funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + conn_state =3D drm_atomic_get_connector_state(state, priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + KUNIT_ASSERT_EQ(test, conn_state->color_format, DRM_CONNECTOR_COLOR_FORMA= T_AUTO); + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + KUNIT_EXPECT_EQ(test, conn_state->hdmi.output_format, DRM_OUTPUT_COLOR_FO= RMAT_RGB444); + + drm_test_bridge_chain_verify_fmt(test, priv, expected, ARRAY_SIZE(expecte= d)); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test which checks that DRM_CONNECTOR_COLOR_FORMAT_AUTO on non-HDMI conn= ectors + * will result in the first bus format on the output to be picked. + */ +static void drm_test_bridge_auto_first(struct kunit *test) +{ + static const struct drm_bridge_funcs *funcs[] =3D { + &rgb_yuv444_yuv420_producer_funcs, + &yuv444_yuv422_rgb8_passthrough_funcs, + }; + static const struct fmt_tuple expected[] =3D { + { MEDIA_BUS_FMT_FIXED, MEDIA_BUS_FMT_YUV8_1X24 }, + { MEDIA_BUS_FMT_YUV8_1X24, MEDIA_BUS_FMT_YUV8_1X24 }, + }; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_chain_priv *priv; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *mode; + int ret; + + priv =3D drm_test_bridge_chain_init(test, ARRAY_SIZE(funcs), funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + conn_state =3D drm_atomic_get_connector_state(state, priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + KUNIT_ASSERT_EQ(test, conn_state->color_format, DRM_CONNECTOR_COLOR_FORMA= T_AUTO); + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + drm_test_bridge_chain_verify_fmt(test, priv, expected, ARRAY_SIZE(expecte= d)); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +/* + * Test which checks that in a configuration of bridge chains where an RGB + * producer is hooked to a YUV444-only pass-through, the atomic commit fai= ls as + * the bridge format selection cannot find a valid sequence of bus formats. + */ +static void drm_test_bridge_rgb_yuv_no_path(struct kunit *test) +{ + static const struct drm_bridge_funcs *funcs[] =3D { + &rgb_producer_funcs, + &yuv8_passthrough_funcs, + &rgb8_yuv444_yuv422_passthrough_funcs, + }; + struct drm_connector_state *conn_state; + struct drm_modeset_acquire_ctx ctx; + struct drm_bridge_chain_priv *priv; + struct drm_crtc_state *crtc_state; + struct drm_atomic_state *state; + struct drm_display_mode *mode; + int ret; + + priv =3D drm_test_bridge_chain_init(test, ARRAY_SIZE(funcs), funcs); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv); + + drm_modeset_acquire_init(&ctx, 0); + + state =3D drm_kunit_helper_atomic_state_alloc(test, &priv->drm, &ctx); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); + +retry_commit: + conn_state =3D drm_atomic_get_connector_state(state, priv->connector); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + + mode =3D drm_kunit_display_mode_from_cea_vic(test, &priv->drm, 16); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, mode); + + ret =3D drm_atomic_set_crtc_for_connector(conn_state, priv->crtc); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state =3D drm_atomic_get_crtc_state(state, priv->crtc); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); + + ret =3D drm_atomic_set_mode_for_crtc(crtc_state, mode); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_ASSERT_EQ(test, ret, 0); + + crtc_state->enable =3D true; + crtc_state->active =3D true; + + ret =3D drm_atomic_commit(state); + if (ret =3D=3D -EDEADLK) { + drm_modeset_backoff(&ctx); + goto retry_commit; + } + KUNIT_EXPECT_EQ(test, ret, -ENOTSUPP); + + drm_modeset_drop_locks(&ctx); + drm_modeset_acquire_fini(&ctx); +} + +static struct kunit_case drm_bridge_bus_fmt_tests[] =3D { + KUNIT_CASE(drm_test_bridge_rgb_yuv_rgb), + KUNIT_CASE(drm_test_bridge_must_convert_to_yuv444), + KUNIT_CASE(drm_test_bridge_hdmi_auto_rgb), + KUNIT_CASE(drm_test_bridge_auto_first), + KUNIT_CASE(drm_test_bridge_rgb_yuv_no_path), + { } +}; + +static struct kunit_suite drm_bridge_bus_fmt_test_suite =3D { + .name =3D "drm_bridge_bus_fmt", + .test_cases =3D drm_bridge_bus_fmt_tests, +}; + kunit_test_suites( &drm_bridge_get_current_state_test_suite, &drm_bridge_helper_reset_crtc_test_suite, &drm_bridge_alloc_test_suite, + &drm_bridge_bus_fmt_test_suite, ); =20 MODULE_AUTHOR("Maxime Ripard "); MODULE_AUTHOR("Luca Ceresoli "); +MODULE_AUTHOR("Nicolas Frattaroli "); =20 MODULE_DESCRIPTION("Kunit test for drm_bridge functions"); MODULE_LICENSE("GPL"); --=20 2.53.0 From nobody Thu Apr 16 12:25:03 2026 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 32A2B41B34D; Fri, 27 Feb 2026 19:25:06 +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=1772220307; cv=pass; b=KY0LToHwAwOuPQGIIe7xbYt+wyoRr4z7JdvGFF6KiT16rvqWeky+d0thzGNFfsRVrOyOdUBPU/a+naYlI9Nhvs5e17FJQbJcSo6HBncblyt4QVJ4G7GfNH3+GTv9fmUNYuhO4CUVSOI6W/DyQ8bSDwOazne0L9yFaqFYw+8rg+0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772220307; c=relaxed/simple; bh=XAO+o9C6CXrNpJ8gSeMZuoNlLdd8/SKSzGTiMQSwQv8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DKPo1KdJ2SVqllj/NkVeI9oSHa9hF1fK7qoZKkWDp1YiS7FksuY/S6sH+ggEkOzyV9DdymhciMJWfS6fnFJZkAwkjEc6Q+nfiKEbU1Xa4yAjUdM8Ib90eeBmNImIeW9htIQAsL5TooqjNGN+mopr0PJvbAsFMB5w5dAQyqlJruI= 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=CH4N7j+X; 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="CH4N7j+X" ARC-Seal: i=1; a=rsa-sha256; t=1772220180; cv=none; d=zohomail.com; s=zohoarc; b=P2pzPoFvy0wU/x1Gyo/7UXFShSqFzHf1Ufiy/IiOeWMVi7abFUPvnPtM0iUX54ktqMVkuAPQadaBgoBPlj2GGJxdXdaZOijunRp9YwnRkQKd7oU1apCtIa2/NR1DG0CRKznvGXpFPsL0/ZoHMMqDUhcNcMJhL1RbfIJAwVlkD0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772220180; 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=2cUtFea6Xahy8xUmQNtz3A7vjD+5c56XmJo8KM/uRi4=; b=BXUOrITizjsYDzIshH/s7p8CFp+5WomRz8L6td11kdrpw4WX7gQrPafonGJ5tmEwh/oenDe/rOXzKj9/qq8MuB4rundIfgRlX8eaJojn9RqAH2yHzk/MFkgcECqHyr5Bgqv7ntC805HL52MHPlxHMFpKhI5vIAcjRU8+WX+z6Hg= 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=1772220180; 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=2cUtFea6Xahy8xUmQNtz3A7vjD+5c56XmJo8KM/uRi4=; b=CH4N7j+X6O/PSdWKZjDZoUc7rSQfogTTA1B0ModHEUrCekEKaDgfNt/Uk9jDWIuN 4YXwiHa1BC68w2/zeY7Prb2f2hw0YNVSpRv3Y4oxZ0ezVmgozZfTwdPFXkyzm7VfqFQ P9Ap1VdGLZajvX9DuwjQGo6Kaa2GexM73Th5E4i0= Received: by mx.zohomail.com with SMTPS id 1772220177756116.00125529261277; Fri, 27 Feb 2026 11:22:57 -0800 (PST) From: Nicolas Frattaroli Date: Fri, 27 Feb 2026 20:20:24 +0100 Subject: [PATCH v9 19/19] drm/bridge: Document bridge chain format selection 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: <20260227-color-format-v9-19-658c3b9db7ef@collabora.com> References: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> In-Reply-To: <20260227-color-format-v9-0-658c3b9db7ef@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.14.3 The bridge chain format selection behaviour was, until now, undocumented. With the addition of the "color format" DRM property, it's not sufficiently complex enough that documentation is warranted, especially for driver authors trying to do the right thing. Add a high-level overview of how the process is supposed to work, and mention what the display driver is supposed to do if it wants to make use of this functionality. Reviewed-by: Maxime Ripard Signed-off-by: Nicolas Frattaroli --- Documentation/gpu/drm-kms-helpers.rst | 6 ++++++ drivers/gpu/drm/drm_bridge.c | 40 +++++++++++++++++++++++++++++++= ++++ 2 files changed, 46 insertions(+) diff --git a/Documentation/gpu/drm-kms-helpers.rst b/Documentation/gpu/drm-= kms-helpers.rst index 781129f78b06..47c4f593cf9d 100644 --- a/Documentation/gpu/drm-kms-helpers.rst +++ b/Documentation/gpu/drm-kms-helpers.rst @@ -181,6 +181,12 @@ Bridge Operations .. kernel-doc:: drivers/gpu/drm/drm_bridge.c :doc: bridge operations =20 +Bridge Chain Format Selection +----------------------------- + +.. kernel-doc:: drivers/gpu/drm/drm_bridge.c + :doc: bridge chain format selection + Bridge Connector Helper ----------------------- =20 diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 5938fba0a983..74f9af3f301e 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -198,6 +198,46 @@ * driver. */ =20 +/** + * DOC: bridge chain format selection + * + * A bridge chain, from display output processor to connector, may contain + * bridges capable of converting between bus formats on their inputs, and + * output formats on their outputs. For example, a bridge may be able to c= onvert + * from RGB to YCbCr 4:4:4, and pass through YCbCr 4:2:0 as-is, but not co= nvert + * from RGB to YCbCr 4:2:0. This means not all input formats map to all ou= tput + * formats. + * + * Further adding to this, a desired output color format, as specified wit= h the + * "color format" DRM property, might not correspond 1:1 to what the displ= ay + * driver should set at its output. The bridge chain it feeds into may onl= y be + * able to reach the desired output format, if a conversion from a differe= nt + * starting format is performed. + * + * To deal with this complexity, the recursive bridge chain bus format sel= ection + * logic starts with the last bridge in the chain, usually the connector, = and + * then recursively walks the chain of bridges backwards to the first brid= ge, + * trying to find a path. + * + * For a display driver to work in such a scenario, it should read the fir= st + * bridge's bridge state to figure out which bus format the chain resolved= to. + * If the first bridge's input format resolved to %MEDIA_BUS_FMT_FIXED, th= en its + * output format should be used. + * + * Special handling is done for HDMI as it relates to format selection. In= stead + * of directly using the "color format" DRM property for bridge chains tha= t end + * in HDMI bridges, the bridge chain format selection logic will trust the= logic + * that set the HDMI output format. For the common HDMI state helper + * functionality, this means that %DRM_CONNECTOR_COLOR_FORMAT_AUTO will al= low + * fallbacks to YCBCr 4:2:0 if the bandwidth requirements would otherwise = be too + * high but the mode and connector allow it. + * + * For bridge chains that do not end in an HDMI bridge, + * %DRM_CONNECTOR_COLOR_FORMAT_AUTO will be satisfied with the first output + * format on the last bridge for which it can find a path back to the first + * bridge. + */ + /* Protect bridge_list and bridge_lingering_list */ static DEFINE_MUTEX(bridge_lock); static LIST_HEAD(bridge_list); --=20 2.53.0