From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D7455301477 for ; Mon, 17 Nov 2025 19:13:31 +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=1763406813; cv=pass; b=FmiViafAXg7PyqMl68wGTyoWAhjzDMH3utSe9T7fEpfPPoHAMspfOu8cZnGoQjldeZsfG95t8IMVrLKUhTGYVl1OV31xdK8311O4ssVSgGAtog3THO4CNum9m518yH4Fm69QW/81opY+rVG722SaTSr93IfgEql2Fp+tVXNsYNg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406813; c=relaxed/simple; bh=+zN4hkJWW6CrspVGirxlJGODYZYp4ZI/7kOElwRiGrw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ZSPcE10gMPiEytsKjT/K0QBehm9t7NSyYK94dgB2sMpfj7Fe4GKOgYVyrk0cX1Sx+fI81s96917PXVL1o8W+UQ1c1qtupQuQ6+Mtflxyc6ug8K7oNQUoJMPDVyGQhTpyTJn1StC/UQ2nhRFpEqjKy6jLOt0AfEND01K5BSVnfh8= 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=g6yUbczF; 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="g6yUbczF" ARC-Seal: i=1; a=rsa-sha256; t=1763406748; cv=none; d=zohomail.com; s=zohoarc; b=X2RM4BdP9ipXAbgjVzZrq4mEodia6cTJsmPMrJVDBUtCM4k2ewzGMBuE/bp2HGQjhmmRv+o+hywZbvuHaeA5X/uLoD82w2aQq0A5PYuixbPeYkLkl06YBkpfWlAfZ1rKLLQQ6HNBHtVk0IWMU2MMp8fRQog0hcA8mv8w9NN+oJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406748; 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=IFqIzOro0d3lq4Vo75sb6L8BPjvhx6xu8i74ayza3nA=; b=jvx3cXzjMbOFC3z6qP1LCTEdSEEeXMuq+EHmMItjXrM2rq6CEVPm+4fAL8/7Q9x8WCZ5o3RGHRtW9r/rBtjypcswSSodxqPiUSbTpK6JaQCLCQEbiL1aVg+Tjlj11psk0nA1D7cU2DHcajwAO0k1dv2GjnW/F4agKFMtNu8L1A4= 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=1763406748; 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=IFqIzOro0d3lq4Vo75sb6L8BPjvhx6xu8i74ayza3nA=; b=g6yUbczFgqEaZmTLlxozYa7pRHWG0uL83fqFYNLJa2CJlE8e/CT8uWHGSAWGd1GA cmMjDmoWiBvl1ar8+wk51vENdQ8D9/DhWIdJRtcrZMp2Nzx2zG60et/34V8uSHH79by U1o75L7te4Xq6AzPXnetGsWpqqlpIUOJGLfjP2XY= Received: by mx.zohomail.com with SMTPS id 1763406746438363.0031747030447; Mon, 17 Nov 2025 11:12:26 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:45 +0100 Subject: [PATCH v4 01/10] 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: <20251117-color-format-v4-1-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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 --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++------ 1 file changed, 2 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 e6728fd12eeb..598dc3ce993c 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6522,12 +6522,8 @@ 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) || (drm_mode_is_420_also(info, mo= de_in) && + aconnector && aconnector->force_yuv420_output)) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR4= 22) && aconnector --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FEE3328617 for ; Mon, 17 Nov 2025 19:13: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=1763406828; cv=pass; b=J38Sy5+4BL5YDAfAHlXg6aQG2gXnO0weqq5ao81KvPQb9fZO1pkFYOlZ0QT4MmYstPoy1iFKwffQCAyjfbu3w+XZRGEEllOag8J6s2XrZUe5T/XOp7RCBoMbSiOb+q66rBOpgf7ONERfKTUsnDlpmvuMy0TrVKpsiP7OYRGyJXo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406828; c=relaxed/simple; bh=Gy0a/qZqYqAXlBKXlgZiDA5X49q3sp00MIccEBrd+iU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jEh1KWmsqbtSDjoI1Qj8aJxZGCAJzT10UottGBjW6sJJl0KQG6IObOqn3QaxzKp7COWADQDkBAHvpGvNHhnuEwH4/9ABYoC49NkdMwkur+E0OGW3fPy8AnaZ/cmiaKm/2oaOl8VXl0VBRXQWKFlZkL26FKeHAfUjDu++t9uCXH8= 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=R2GDDudM; 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="R2GDDudM" ARC-Seal: i=1; a=rsa-sha256; t=1763406754; cv=none; d=zohomail.com; s=zohoarc; b=POVvlxYD/kw5kirO806RSeq3/x6kPHQXUz+Q0iQsAAemEyMzbPKwKmTb+N8EpH3dWIT9t6FgveFlLqhpNya6THOYJy2wX74l+xHr1uDzonm5RVisjjeeCaX+H1OBXmQjlZJctQNHfhdgqmVFDjGGHDfVuKMky3kaOy32Y2O/vUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406754; 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=JDm4LO5yWJTcfID7mSjaqMJXnPJYGF2W6cLE9Z+G7NE=; b=Z9kvcT4CmOvpgYrXY/w/Okp4fjmC+IyT4d5t+MmtdrQ7Uf1YSRohLJjJh8EBran71OXdKbKk25FtokP8epT+fFuclLwTSZVO7u6EBt7M3dRnXESQyKgBC3/bTmJQvGR7Wz32Um2eypo4Prb2Z0pGtRhutph/gvJA4CQKg6/7JVo= 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=1763406754; 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=JDm4LO5yWJTcfID7mSjaqMJXnPJYGF2W6cLE9Z+G7NE=; b=R2GDDudM34+KOSu+DJhACiYrzHUj81vcYt/fPc2mVrVfzlbjJ49h9MvP6Kq3pSXM 7TMc1hDSTDRV3paZcuqGIvocC25jMIO0ahlRKvSdWq26J/opy/e78UqlsG4GAgZNIft EpqMgrmtgr4BaHdc0aeH3woQtCrEGv2LmUplQDIw= Received: by mx.zohomail.com with SMTPS id 1763406753246694.750073819096; Mon, 17 Nov 2025 11:12:33 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:46 +0100 Subject: [PATCH v4 02/10] 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: <20251117-color-format-v4-2-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, Nicolas Frattaroli , Andri Yngvason , Werner Sembach , Marius Vlad X-Mailer: b4 0.14.3 From: Andri Yngvason Adds a new general DRM property named "color format" which can be used by userspace to force the display driver 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 the formats which 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 --- drivers/gpu/drm/drm_atomic_helper.c | 5 + drivers/gpu/drm/drm_atomic_uapi.c | 4 + drivers/gpu/drm/drm_connector.c | 180 ++++++++++++++++++++++++++++++++= ++++ include/drm/drm_connector.h | 54 ++++++++++- 4 files changed, 238 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atom= ic_helper.c index e641fcf8c568..25f354b2cc0d 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -736,6 +736,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 b2cb5ae5a139..2f093b0d1628 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -784,6 +784,8 @@ static int drm_atomic_connector_set_property(struct drm= _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) { + state->color_format =3D drm_color_format_enum_to_color_format(val); } else if (connector->funcs->atomic_set_property) { return connector->funcs->atomic_set_property(connector, state, property, val); @@ -869,6 +871,8 @@ drm_atomic_connector_get_property(struct drm_connector = *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 drm_color_format_to_color_format_enum(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 272d6254ea47..0ad7be0a2d09 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1348,6 +1348,55 @@ static const char * const colorspace_names[] =3D { [DRM_MODE_COLORIMETRY_BT601_YCC] =3D "BT601_YCC", }; =20 +u32 +drm_color_format_to_color_format_enum(enum drm_color_format fmt) +{ + switch (fmt) { + default: + case DRM_COLOR_FORMAT_AUTO: + return DRM_MODE_COLOR_FORMAT_AUTO; + case DRM_COLOR_FORMAT_RGB444: + return DRM_MODE_COLOR_FORMAT_RGB444; + case DRM_COLOR_FORMAT_YCBCR444: + return DRM_MODE_COLOR_FORMAT_YCBCR444; + case DRM_COLOR_FORMAT_YCBCR422: + return DRM_MODE_COLOR_FORMAT_YCBCR422; + case DRM_COLOR_FORMAT_YCBCR420: + return DRM_MODE_COLOR_FORMAT_YCBCR420; + } +} + +u32 +drm_color_format_enum_to_color_format(enum drm_color_format_enum fmt_enum) +{ + switch (fmt_enum) { + default: + case DRM_MODE_COLOR_FORMAT_RGB444: + return DRM_COLOR_FORMAT_RGB444; + case DRM_MODE_COLOR_FORMAT_AUTO: + return DRM_COLOR_FORMAT_AUTO; + case DRM_MODE_COLOR_FORMAT_YCBCR444: + return DRM_COLOR_FORMAT_YCBCR444; + case DRM_MODE_COLOR_FORMAT_YCBCR422: + return DRM_COLOR_FORMAT_YCBCR422; + case DRM_MODE_COLOR_FORMAT_YCBCR420: + return DRM_COLOR_FORMAT_YCBCR420; + } +} + +/** + * drm_get_color_format_name - return a string for color format + * @colorspace: color format to compute name of + * + */ +const char *drm_get_color_format_name(enum drm_color_format color_fmt) +{ + u32 conv_color_fmt =3D drm_color_format_to_color_format_enum(color_fmt); + + return drm_hdmi_connector_get_output_format_name(conv_color_fmt); +} +EXPORT_SYMBOL(drm_get_color_format_name); + /** * drm_get_colorspace_name - return a string for color encoding * @colorspace: color space to compute name of @@ -1377,6 +1426,22 @@ static const u32 hdmi_colorspaces =3D BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_D65) | BIT(DRM_MODE_COLORIMETRY_DCI_P3_RGB_THEATER); =20 +/* already bit-shifted */ +static const u32 hdmi_colorformats =3D + DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444 | + DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420; + +/* already bit-shifted */ +static const u32 dp_colorformats =3D + DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444 | + DRM_COLOR_FORMAT_YCBCR422 | + DRM_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 @@ -2628,6 +2693,101 @@ int drm_mode_create_hdmi_colorspace_property(struct= drm_connector *connector, } EXPORT_SYMBOL(drm_mode_create_hdmi_colorspace_property); =20 +static int drm_mode_create_color_format_property(struct drm_connector *con= nector, + u32 supported_color_formats) +{ + struct drm_device *dev =3D connector->dev; + struct drm_prop_enum_list enum_list[DRM_MODE_COLOR_FORMAT_COUNT]; + int i, len; + + if (connector->color_format_property) + return 0; + + if (!supported_color_formats) { + drm_err(dev, "No supported color formats provded on [CONNECTOR:%d:%s]\n", + connector->base.id, connector->name); + return -EINVAL; + } + + if ((supported_color_formats & -BIT(DRM_MODE_COLOR_FORMAT_COUNT)) !=3D 0)= { + drm_err(dev, "Unknown colorspace provded on [CONNECTOR:%d:%s]\n", + connector->base.id, connector->name); + return -EINVAL; + } + + len =3D 0; + for (i =3D 0; i < DRM_MODE_COLOR_FORMAT_COUNT; i++) { + if (!(supported_color_formats & BIT(i))) + continue; + + enum_list[len].type =3D i; + if (i !=3D DRM_MODE_COLOR_FORMAT_AUTO) + enum_list[len].name =3D output_format_str[i]; + else + enum_list[len].name =3D "AUTO"; + len++; + } + + connector->color_format_property =3D + drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, "color format", + enum_list, len); + + if (!connector->color_format_property) + return -ENOMEM; + + return 0; +} + +/** + * drm_mode_create_hdmi_color_format_property - create hdmi color format p= roperty + * @connector: connector to create the color format property on. + * @supported_color_formats: bitmap of supported color formats + * + * Called by a driver the first time it's needed, must be attached to desi= red + * HDMI connectors. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_create_hdmi_color_format_property(struct drm_connector *conne= ctor, + u32 supported_color_formats) +{ + u32 color_formats; + + if (supported_color_formats) + color_formats =3D supported_color_formats & hdmi_colorformats; + else + color_formats =3D hdmi_colorformats; + + return drm_mode_create_color_format_property(connector, color_formats); +} +EXPORT_SYMBOL(drm_mode_create_hdmi_color_format_property); + +/** + * drm_mode_create_dp_color_format_property - create dp color format prope= rty + * @connector: connector to create the Colorspace property on. + * @supported_color_formats: bitmap of supported color formats + * + * Called by a driver the first time it's needed, must be attached to desi= red + * DP connectors. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_mode_create_dp_color_format_property(struct drm_connector *connect= or, + u32 supported_color_formats) +{ + u32 color_formats; + + if (supported_color_formats) + color_formats =3D supported_color_formats & dp_colorformats; + else + color_formats =3D dp_colorformats; + + return drm_mode_create_color_format_property(connector, color_formats); +} +EXPORT_SYMBOL(drm_mode_create_dp_color_format_property); + /** * drm_mode_create_dp_colorspace_property - create dp colorspace property * @connector: connector to create the Colorspace property on. @@ -2845,6 +3005,26 @@ 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 "force color format= " property + * @connector: connector to attach force color format property on. + * + * This is used to add support for selecting a color format on a connector. + * + * 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_COLOR_FORMAT_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 8f34f4b8183d..a071079fd3ad 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -556,6 +556,26 @@ enum drm_colorspace { DRM_MODE_COLORIMETRY_COUNT }; =20 +enum drm_color_format_enum { + DRM_MODE_COLOR_FORMAT_RGB444 =3D HDMI_COLORSPACE_RGB, + DRM_MODE_COLOR_FORMAT_YCBCR422 =3D HDMI_COLORSPACE_YUV422, + DRM_MODE_COLOR_FORMAT_YCBCR444 =3D HDMI_COLORSPACE_YUV444, + DRM_MODE_COLOR_FORMAT_YCBCR420 =3D HDMI_COLORSPACE_YUV420, + /* auto case, driver will set the color_format */ + DRM_MODE_COLOR_FORMAT_AUTO, + DRM_MODE_COLOR_FORMAT_COUNT +}; + +enum drm_color_format { + DRM_COLOR_FORMAT_NONE =3D 0, + DRM_COLOR_FORMAT_RGB444 =3D (1 << 0), + DRM_COLOR_FORMAT_YCBCR422 =3D (1 << 1), + DRM_COLOR_FORMAT_YCBCR444 =3D (1 << 2), + DRM_COLOR_FORMAT_YCBCR420 =3D (1 << 3), + /* auto case, driver will set the color_format */ + DRM_COLOR_FORMAT_AUTO =3D (1 << 4), +}; + /** * enum drm_bus_flags - bus_flags info for &drm_display_info * @@ -699,11 +719,6 @@ struct drm_display_info { */ enum subpixel_order subpixel_order; =20 -#define DRM_COLOR_FORMAT_RGB444 (1<<0) -#define DRM_COLOR_FORMAT_YCBCR444 (1<<1) -#define DRM_COLOR_FORMAT_YCBCR422 (1<<2) -#define DRM_COLOR_FORMAT_YCBCR420 (1<<3) - /** * @panel_orientation: Read only connector property for built-in panels, * indicating the orientation of the panel vs the device's casing. @@ -1107,6 +1122,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_color_format color_format; + /** * @writeback_job: Writeback job for writeback connectors * @@ -2060,6 +2082,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: * @@ -2461,6 +2489,12 @@ int drm_mode_create_dp_colorspace_property(struct dr= m_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_hdmi_color_format_property(struct drm_connector *conne= ctor, + u32 supported_color_formats); + +int drm_mode_create_dp_color_format_property(struct drm_connector *connect= or, + u32 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); @@ -2542,6 +2576,16 @@ bool drm_connector_has_possible_encoder(struct drm_c= onnector *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); + +const char *drm_get_color_format_name(enum drm_color_format color_fmt); + +u32 +drm_color_format_to_color_format_enum(enum drm_color_format fmt); + +u32 +drm_color_format_enum_to_color_format(enum drm_color_format_enum fmt_enum); + /** * drm_for_each_connector_iter - connector_list iterator macro * @connector: &struct drm_connector pointer used as cursor --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender3-pp-f112.zoho.com (sender3-pp-f112.zoho.com [136.143.184.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 34431301483 for ; Mon, 17 Nov 2025 19:13:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.184.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406814; cv=pass; b=KaUp/0UfrsHnxH2PzaxkX5v9PteUc65gBSipM2lbmqB7/QG9G8AsPMBq5DqP6mb68Y2Hy6b5+4jxG8vNBqeg7DwQT9YcNlPKqUXY6DqSgRm282J0QpDA1iuPrG/1XwHMJE1IHTI3TwTYyV3E19Rk306e7HkqLrCUPtyz2jT7ifI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406814; c=relaxed/simple; bh=6UOBzQQ1EV6ibhSyXa2lOKdP/UKwxqDU3dpBVxy2RoI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VHzvIRv70hbK2jc1z9CfZzhh2wYp1nZgHH6p8RBHQsGMjSKLc8c1CP+ZRJwxFLRRoVFfLPJv1P2xFLFepcGKAAcMUgxxi8LvKwvad6A/048yHqKG7w+3/9PPDS/3K+BU94dPaOlhZ3LzNKNBePV0dRXbyEDn2342+18T33wGiRU= 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=J7bMahNJ; arc=pass smtp.client-ip=136.143.184.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="J7bMahNJ" ARC-Seal: i=1; a=rsa-sha256; t=1763406762; cv=none; d=zohomail.com; s=zohoarc; b=hrm+qKgW/rySYKUswoBT/MbdkDO6GqmBUPMxXuPc4hiuAzKiKmQbzkZvPLN3d/o5mHPGZHyMWx7uFdr8CMRYp3Umha7Bt4btZM18IQpTpGCfXVO1xMD2C9pCJWLcselh40lw/n3tjDwA2wTbvMIksSTdqzRpwJ5yxeGIl8KD28w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406762; 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=Wl+Rgi87r48WhXQHR78kVLoSBu5iwS2wv+pKzPrF8ig=; b=F8dcbuaN3E6mgwEs42uhNTVYhp+Em/q41SIAemz7vPn0dn39KT4+AmzlfyeU5SNyYR+/APcvDdI35Mx19+SUTY3bUKKG5nyBEA08laItInIqOmDTR6jQdFOZMhIQjNHQsI0kdZk9/ktMFmHMjWOnXj5Ql3yzGsWrYqVTzs3w7z8= 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=1763406762; 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=Wl+Rgi87r48WhXQHR78kVLoSBu5iwS2wv+pKzPrF8ig=; b=J7bMahNJZxwspv9ecDqh3gRSiMywGJUNMFlvEbFO6EWe0xu+m7PAIEd7b5gB+KJL cxRrCU72paetabfqXpFuKi4QjSWmkSS7fX2h6NeM84Ywfdk0tewhsdVa3LPbs9VTM3n HP3kq3F6rVEgvq7abK2Pc7v+Vk+Ys8tRTfy/KTmg= Received: by mx.zohomail.com with SMTPS id 1763406759575712.9921053494943; Mon, 17 Nov 2025 11:12:39 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:47 +0100 Subject: [PATCH v4 03/10] drm: Add enum conversion from/to HDMI_COLORSPACE to DRM_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: <20251117-color-format-v4-3-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, Nicolas Frattaroli , Marius Vlad X-Mailer: b4 0.14.3 From: Marius Vlad This would please the compiler to have a enum transformation from one to another even though the values are the same. It should also make things obvious that we use different enums. Signed-off-by: Marius Vlad --- drivers/gpu/drm/drm_connector.c | 18 ++++++++++++++++++ include/drm/drm_connector.h | 3 +++ 2 files changed, 21 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index 0ad7be0a2d09..61c077b67ac3 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1384,6 +1384,24 @@ drm_color_format_enum_to_color_format(enum drm_color= _format_enum fmt_enum) } } =20 +enum hdmi_colorspace +color_format_to_hdmi_colorspace(enum drm_color_format fmt) +{ + switch (fmt) { + default: + case DRM_COLOR_FORMAT_AUTO: + case DRM_COLOR_FORMAT_RGB444: + return HDMI_COLORSPACE_RGB; + case DRM_COLOR_FORMAT_YCBCR444: + return HDMI_COLORSPACE_YUV444; + case DRM_COLOR_FORMAT_YCBCR422: + return HDMI_COLORSPACE_YUV422; + case DRM_COLOR_FORMAT_YCBCR420: + return HDMI_COLORSPACE_YUV420; + } +} +EXPORT_SYMBOL(color_format_to_hdmi_colorspace); + /** * drm_get_color_format_name - return a string for color format * @colorspace: color format to compute name of diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index a071079fd3ad..e044976c8d76 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -2586,6 +2586,9 @@ drm_color_format_to_color_format_enum(enum drm_color_= format fmt); u32 drm_color_format_enum_to_color_format(enum drm_color_format_enum fmt_enum); =20 +enum hdmi_colorspace +color_format_to_hdmi_colorspace(enum drm_color_format fmt); + /** * drm_for_each_connector_iter - connector_list iterator macro * @connector: &struct drm_connector pointer used as cursor --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender3-pp-f112.zoho.com (sender3-pp-f112.zoho.com [136.143.184.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 D5C2632AAC3 for ; Mon, 17 Nov 2025 19:13:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.184.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406829; cv=pass; b=B5u3TeUo8Zezsoy+JlXKpiLGRNJPwgFHx1an1Bjk+POf3A3Pa5CFumQ+MfHz84JzNHaAyayGgpBdhdb1yQo5DX5ETiBAYfIpGcZziwg8QHLOiRcZvk3X4UKstq11CCv/fttp6BaoV9hvBRYCEWcuF1aH53IoWvawzpSPX9avmC0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406829; c=relaxed/simple; bh=+vA6ev3wztMdwZka+e8WWnUdEL5OV/tAXOZeMQc5hyI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=icRQq3/ZSo7XmOcO8w1ImmEEntOeCtO4o4b7HCixwFJ5tHdys5tQTGynFLgLCO4BYIpJ9RP8gaQbubW1B4Q9UsxVoOGr4ywRuosFkoUNe2cig5Dm537fB/ZRC14MSf0uDdi0v57To6IxFgFG8OHZboRuGyEL/HwALgE6xxzDHhQ= 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=h5mnxMVb; arc=pass smtp.client-ip=136.143.184.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="h5mnxMVb" ARC-Seal: i=1; a=rsa-sha256; t=1763406768; cv=none; d=zohomail.com; s=zohoarc; b=cVM9978GDavgE50qYqu/y/GBTUKtg3eiRR5t6sf9f64Rf50DbbU3nqSJEAxVskfXsGARweifmsqym/Cfe4W74z0kcs97SVo4iKhD53tw7jAJSwUD2pdw0JkcMV81Jk5jIP6Nl3FBlgCevS9w1B4Qfbb7a19mSJT+t5EQR788cYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406768; 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=S6LcICyBa/1soH/3gHBQS+INlICwkZAcXtWkwxSMBkQ=; b=MktG0vxhPEiJmpcbNWUw3bfyL3uMsrZbWiJwUUuYwQmsqZQEEWUek66E0nQ3Ini0sAYP2xXJ1Ox+qtSgyDmx/UnyOFUj8p07EOdAPbAq0VyvrmpFn9Fjupee44ZpRPdfDrwXh8OYp7HuLSijyCpGCzG2UvNFcFmlXtIHbfkz7jc= 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=1763406768; 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=S6LcICyBa/1soH/3gHBQS+INlICwkZAcXtWkwxSMBkQ=; b=h5mnxMVbJ75hfO3GUG5awBD3Be9327Rs80GR6qflKO84rDj1lwNlCXDaTAZ4ONob VW0NPofk659ym0BLJYpwmT8KgvT0AW4LVhJ0reojxBXIMAMQgXPF6E563Z5QKU2rI7a bQNdXDAKNtDYqCUbpOtjZwgOrrD801Qvu/8ztvQg= Received: by mx.zohomail.com with SMTPS id 1763406765821183.3489410114414; Mon, 17 Nov 2025 11:12:45 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:48 +0100 Subject: [PATCH v4 04/10] 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: <20251117-color-format-v4-4-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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. Specifically, reject any output bus formats that do not correspond to the requested color format. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/drm_bridge.c | 57 ++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 57 insertions(+) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index 8f355df883d8..b7df5cbad832 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -1052,6 +1052,59 @@ 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_color_for= mat fmt) +{ + if (bus_fmt =3D=3D MEDIA_BUS_FMT_FIXED) + return true; + + switch (fmt) { + case DRM_COLOR_FORMAT_NONE: + case DRM_COLOR_FORMAT_AUTO: + return true; + case DRM_COLOR_FORMAT_RGB444: + switch (bus_fmt) { + 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 true; + default: + return false; + } + case DRM_COLOR_FORMAT_YCBCR444: + switch (bus_fmt) { + 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 true; + default: + return false; + } + case DRM_COLOR_FORMAT_YCBCR422: + switch (bus_fmt) { + case MEDIA_BUS_FMT_UYVY8_1X16: + case MEDIA_BUS_FMT_UYVY10_1X20: + case MEDIA_BUS_FMT_UYVY12_1X24: + return true; + default: + return false; + } + case DRM_COLOR_FORMAT_YCBCR420: + switch (bus_fmt) { + 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 true; + default: + return false; + } + } + + 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. @@ -1137,6 +1190,10 @@ drm_atomic_bridge_chain_select_bus_fmts(struct drm_b= ridge *bridge, } =20 for (i =3D 0; i < num_out_bus_fmts; i++) { + if (!bus_format_is_color_fmt(out_bus_fmts[i], conn_state->color_format))= { + 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) --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1FAC32F759 for ; Mon, 17 Nov 2025 19:13: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=1763406831; cv=pass; b=rKeTUvDo/jBSWU/YlXWEOOL0V+dQAvzmcI9alI+j2XxSvlP6Vb18/xZHQZJwpjwlqDrLEdNBV5tN0l7TYr541nAPhRkdz64XTUZiMDWwa4CCMGSmHjxcT4TjiNuFvM+myflAKiexEs3W0rWgtOPdMnHrWsgwE7FCJSDqvcudsTU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406831; c=relaxed/simple; bh=07NWWSV7l32bygMdoii4T0Gdli6GYnfcseXl5K2e524=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eKVnky2LOe+xkP8FNoO4CYeB9GYF4QDCPdS2ySlocMW3iNLCeTTZT5IhKrpmPNzlirHvJw8pYvkItgJjygOsNQ2L5OUYtSFIvzG0W8fLvQvUZviJZj2K+IJwH3GyPo66yGvLsEmYaBIMbDz56b8bKQA5X60nAcnRtkYb1SuW93U= 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=aFQazYmh; 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="aFQazYmh" ARC-Seal: i=1; a=rsa-sha256; t=1763406774; cv=none; d=zohomail.com; s=zohoarc; b=U8xLtUf1JkSU4irWo5t9v+N5tbr8fuIwF3WsKDv2i73F1hxoSomrPwkyikcTea/ZRjhe7IDHvX3+rJ2jPlaKfrSJViVdYUca23DPhrANSFgESmKa1Bmur6ukOxDDxxhdc62jdC9hA1ofKbxbfFK+Kgy5jtMDmfJFIbLSWKr1E1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406774; 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=fW8y+pDMl5hGQ9sPnlF2Lcw6l0B/Y7yloEZ/f+aofb8=; b=atimN2P3ElBUe2s9aDBAXsRYsfOWUFN037Epk+vi9rRmns8KeqR2Moxbik+S3rYRpzVJd0dbrkxGidR5fEfw31UZfwfSgQCPPvz0s1Pnf/rW2GKdpPsM5/c67cuXr6CBOQW83/rYUP/oafn7idxXZR3L2cv0sg3Ue5KaJNgKgcw= 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=1763406774; 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=fW8y+pDMl5hGQ9sPnlF2Lcw6l0B/Y7yloEZ/f+aofb8=; b=aFQazYmh1rjqCYqQKNQDGpp/GUX9ytk87Lg+5AUI9ZCFWg3tGwVR8lXHvSAW1gOj mvPUzY+2qaGIkoy1MStW14joH1ys/4w6mHRNUip+lfAcuJ+k8OVIAbnZcSmwIm9NHYf fueQjxe83tbqRUaUrVJixNJy4hv0lJS8nS6lnZ4A= Received: by mx.zohomail.com with SMTPS id 1763406772083636.4830146566981; Mon, 17 Nov 2025 11:12:52 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:49 +0100 Subject: [PATCH v4 05/10] drm/bridge: dw-hdmi-qp: Set bridge supported_formats 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: <20251117-color-format-v4-5-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, Nicolas Frattaroli X-Mailer: b4 0.14.3 The drm_bridge "supported_formats" member stores a bitmask of supported HDMI output formats if the bridge is in fact an HDMI bridge. However, until now, the synopsys dw-hdmi-qp driver did not set this member in the bridge it creates. Set it based on the platform data's supported_formats member, and default to BIT(HDMI_COLORSPACE_RGB) if it's absent, which preserves the previous behaviour. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c b/drivers/gpu/drm= /bridge/synopsys/dw-hdmi-qp.c index fe4c026280f0..cf888236bd65 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c @@ -1269,6 +1269,11 @@ struct dw_hdmi_qp *dw_hdmi_qp_bind(struct platform_d= evice *pdev, dev_warn(dev, "Set ref_clk_rate to vendor default\n"); } =20 + if (plat_data->supported_formats) + hdmi->bridge.supported_formats =3D plat_data->supported_formats; + else + hdmi->bridge.supported_formats =3D BIT(HDMI_COLORSPACE_RGB); + dw_hdmi_qp_init_hw(hdmi); =20 ret =3D devm_request_threaded_irq(dev, plat_data->main_irq, --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender3-pp-f112.zoho.com (sender3-pp-f112.zoho.com [136.143.184.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 2E10630DD0E for ; Mon, 17 Nov 2025 19:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.184.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406841; cv=pass; b=UudlMbI0W3V1E+rpdhPx2+8JaXkZuCj4XbIeFnWkkv2zHXQnUK1nAjbn/aZj+NAiu0CxBsz9qv0nzr+vYpUublMpAwS5Nd/HKcE6tq0iTUf4RUWvcHkLiTfuyRXEknPYrIiT5Uxz5ziLfV5jZnnk0bA2PoXRtT8gaQRwXS5Q5i8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406841; c=relaxed/simple; bh=lJCH2EESHXFnFYzxAH4hfd7r1oNllulpDU58MvQdktE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CQ7hgiyM9mkiZU94ikjEE4PX3LvLLuktRqgqu6NJh7gfq6rmRNmRUzVjVS81Mc9Ka5q0upTO5PJWYtTXBIW6xTIsX+S9sA1SZ/YKoA535uFHx7CA0jqgCaLvGoy82rlq7IOo2AMotT1OT5k93rhRGzEafrBtz987qr+G2cZi6ug= 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=MdKRq+YO; arc=pass smtp.client-ip=136.143.184.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="MdKRq+YO" ARC-Seal: i=1; a=rsa-sha256; t=1763406780; cv=none; d=zohomail.com; s=zohoarc; b=bKhjf1LPoDUsYRI/XVlndhGzahdCB7LFWKu+VFWUoE+saIvCo3tE2jWWmjQ6ZuFZFSz1Lfv4Icl+RdRkMw+MS/ib3EWDS/ol246AiPcdDtLJbrCqcnOI8la8nsQ/MC9q5L07RBsB1hsyIzjJEGFg0wRVTrx8NgP/1SdWrBs50FU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406780; 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=6vst0GacCoZY4XRI9Hn+td4UBzH0QM1v36mSY8yM3so=; b=QUYN0P90ZnLmVWs+Rxc5AWsPSBTO5UEucQaWSeWuS6jKJGQ2OhCjygvb73ArbLCvoFGjk8cB1PRaETC1N2cmg3KYOiHXwAoIXB/hH/PBW3BZSvYvKozG6R4Ha7s2mcGLupAb7oM7+uFQkHUMkEdca2Xm2hpawLyDLUNzfG28POU= 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=1763406780; 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=6vst0GacCoZY4XRI9Hn+td4UBzH0QM1v36mSY8yM3so=; b=MdKRq+YOFGv6KUnGYMs0HcVtN7dHgwnm1U8CpFYF0Aa3SirZKSbgGQXvLO+ZdiA4 kGV9fzcTfPeBSsCcmMrCeXPYmHLPLDeCCc1ZUDua7TXTII+FUzz7EaqIV5rtRDs0MYi nO3hBVagxYt1oOo1+z8ouk1cZ7Zf3aJAQrDEAGeE= Received: by mx.zohomail.com with SMTPS id 1763406778281162.77930182909824; Mon, 17 Nov 2025 11:12:58 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:50 +0100 Subject: [PATCH v4 06/10] 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: <20251117-color-format-v4-6-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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, where such a bitmask of supported color formats already exists. It just needs to be converted to the appropriate HDMI_COLORSPACE_ mask. 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 | 24 ++++++++++++++++++++++= ++ 1 file changed, 24 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 c9fe6aa3e3e3..7c294751de19 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -468,6 +468,28 @@ static const struct of_device_id dw_hdmi_qp_rockchip_d= t_ids[] =3D { }; MODULE_DEVICE_TABLE(of, dw_hdmi_qp_rockchip_dt_ids); =20 +static const u32 supported_colorformats =3D DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444; + +static unsigned int __pure drm_to_hdmi_fmts(const u32 fmt) +{ + unsigned int res =3D 0; + + if (fmt & DRM_COLOR_FORMAT_AUTO) + res |=3D BIT(HDMI_COLORSPACE_RGB); + if (fmt & DRM_COLOR_FORMAT_RGB444) + res |=3D BIT(HDMI_COLORSPACE_RGB); + if (fmt & DRM_COLOR_FORMAT_YCBCR444) + res |=3D BIT(HDMI_COLORSPACE_YUV444); + if (fmt & DRM_COLOR_FORMAT_YCBCR422) + res |=3D BIT(HDMI_COLORSPACE_YUV422); + if (fmt & DRM_COLOR_FORMAT_YCBCR420) + res |=3D BIT(HDMI_COLORSPACE_YUV420); + + return res; +} + static int dw_hdmi_qp_rockchip_bind(struct device *dev, struct device *mas= ter, void *data) { @@ -521,6 +543,8 @@ 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 drm_to_hdmi_fmts(supported_colorformats); + encoder =3D &hdmi->encoder.encoder; encoder->possible_crtcs =3D drm_of_find_possible_crtcs(drm, dev->of_node); =20 --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1B13630DD0E for ; Mon, 17 Nov 2025 19:14:07 +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=1763406849; cv=pass; b=MauMF9MLoZb2CXCsOIiZ0n9JNAYfNHAh853EHySK1gXvfa/EKoEyUt6ruwPP5hjS65VpWEQH52iDXmz2xdLh9r+Y3eJ3H7LYya8EEg5YAD1/FRRafwW//9nCBBvqELKvBl+tGsceczDO20SEKLyBWWWY4fsOQ+cVgAe/bh7AKBI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406849; c=relaxed/simple; bh=B28/UYoNG0aXOIwlX/0CTAk+AqMCyM4snhUaQ2zJG1Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UDOXWDgz6yeuE2BZyzKDzcts6kOuCRMldVBlv1EypAhfkECtPbcrZ7S/8dotciMeaUiO4YVfqWH1hBKkfrhzMODruWd2MXJ+0ewPG4G8EaUOCv46RKmdkAUyw9mO170kc/S8RS8BvlvbzYbtwJ2/5vS7ZPbv/aPOdkif1d/W1G4= 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=Z5Y4toe4; 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="Z5Y4toe4" ARC-Seal: i=1; a=rsa-sha256; t=1763406786; cv=none; d=zohomail.com; s=zohoarc; b=S4S4oot7NqAPseBWv4WoV/K5QiqXh+jRX8TXcWeIhlAMrth6kW3bk4loT6h6Q1Xt1VxMu+DkhvhJO4r8wcP11y014oztNkCIdgeGw6bedHyNSiDJpTLl6aNuazVaJyEMBYsP/YtyAONSBL1TPRehilAlnvzoFREIjWX8QGyehMA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406786; 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=2d0k/LuL/udDSP5MXsPj+vrCjkqFJCvyb8zuefLEfUs=; b=Gyg8YOwSeedwYsb7XmKV6ZYD4uxUuj/MR+l0KFGlD/XXBesT6B4jlyJ1p9A//wau7tt2rXGG5fSHeKqtIUgGTkkM5ji/NLoOU/QHI2O7DaUVXmtglBxNYrgiZkFCzTOy0srTX01a/BLiZjdW/j9OytYPg8f8fUpeLNkTMSt/Jgs= 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=1763406786; 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=2d0k/LuL/udDSP5MXsPj+vrCjkqFJCvyb8zuefLEfUs=; b=Z5Y4toe4Tj8bWAkFBjnelsdI9Le4bXBiFc57eIPMBcaGAeErDWwdjg1N1YwrGLFQ aAAdIMgs/zrgiKq+6i4Ehm5J67lMAG1ChgyStNdj/sNRfPfXGkP2LFbMO5OGuNyw6w3 5Y4c7X4qx3J+tlCWfv05EkV1zs8I+WQtuQ/J6rwA= Received: by mx.zohomail.com with SMTPS id 1763406784495196.5777941542043; Mon, 17 Nov 2025 11:13:04 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:51 +0100 Subject: [PATCH v4 07/10] 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: <20251117-color-format-v4-7-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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 checking whether the property is set and set to something other than auto. If so, pass the requested color format, and otherwise set RGB. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/display/drm_hdmi_state_helper.c | 8 +++++++- 1 file changed, 7 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 a561f124be99..add0d51fce33 100644 --- a/drivers/gpu/drm/display/drm_hdmi_state_helper.c +++ b/drivers/gpu/drm/display/drm_hdmi_state_helper.c @@ -650,9 +650,15 @@ hdmi_compute_config(const struct drm_connector *connec= tor, conn_state->max_bpc, 8, connector->max_bpc); int ret; + enum hdmi_colorspace hdmi_colorspace; + + if (conn_state->color_format && conn_state->color_format !=3D DRM_COLOR_F= ORMAT_AUTO) + hdmi_colorspace =3D color_format_to_hdmi_colorspace(conn_state->color_fo= rmat); + else + hdmi_colorspace =3D HDMI_COLORSPACE_RGB; =20 ret =3D hdmi_compute_format_bpc(connector, conn_state, mode, max_bpc, - HDMI_COLORSPACE_RGB); + hdmi_colorspace); if (ret) { if (connector->ycbcr_420_allowed) { ret =3D hdmi_compute_format_bpc(connector, conn_state, --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DD432C21DC for ; Mon, 17 Nov 2025 19:14:34 +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=1763406877; cv=pass; b=j/h24Z6Y5P9hDIEFfxytVoNUCPVnVxZcrugI1C0l6S8ga1EbJk6E0n2T12jiKxIRMenJYDi8ZFhfvWpwU1wMVlPsrohuBeaNrvbxELGAaxO3goRA2ItVXYn07UINz+A+n8Mj+rfTYbz+naGxslAwnV+zcqsarsMCy7sEJms/9j8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406877; c=relaxed/simple; bh=JNw7Yxnug3gZjrcnucrUNDlqlikRaaSI02aCEv0bu0k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uZEvXWwhoZtTLFzuMDhYFEEdnV4ibHntKzAYI46woYrdKXOT8dGsdTCN2qTgpv7IRx5pyIsYPOfD7Gho9iV5kKfhWJWotHZrN6ma1qALbogR7dPKY3OYcsxZ7lr7zftJgwql5ar0O4jdnue4xulZNoPDd8K8A99SFuaCOmjmTTU= 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=ioq3WPZ3; 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="ioq3WPZ3" ARC-Seal: i=1; a=rsa-sha256; t=1763406792; cv=none; d=zohomail.com; s=zohoarc; b=l2Z9YU2Qx4LXBcqmfXAXidYR8D8Ehz9qJ5XAC9ZtGmFYqPMOrHlb20HyLM8gJjrbjKfxILty15G+a+cd3nSUfnoprbY2T+DFfLNEj8B9B1ws1my7TT4jSLBvPx0hvRO8wcvg14eu14sEe+t+iRKSkj7gih2mLvs18pD/gKYz3ds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406792; 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=+iE/ManLhmGTSkH12I8CLxBzRA3bTFGdYv4A4ZOK+f4=; b=BShcmcWFKxABlIXW9nRviIb/jl5OjITVLb1SL8tPJ7LZIgnM3czddUa+Dyx8Pr/FJix+ijnNEFSduA1zSMAcGSdzD1fviKtPrgvWUsnLlt8TqR9A820+ncO29BDcnW1HrdI6b653yoooedyx7I8CQNVdZEZx3pQXWf5xZv/GbxE= 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=1763406792; 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=+iE/ManLhmGTSkH12I8CLxBzRA3bTFGdYv4A4ZOK+f4=; b=ioq3WPZ3sVaRZmrxYHIBNI+KxYSbmqGopIbhkBIXK6cNeO6hziw5OQd8UDA/nVl+ bD3wkf3reuIa6udiZGDGPetKMfssQeaZf5cUmbh8rxrJgTHNAYd6zcd3uPabnGTXNkp jmsBZAn/5/GvMll+bGWJzLICondLEAmxNbKViTn4= Received: by mx.zohomail.com with SMTPS id 176340679132120.01663921488671; Mon, 17 Nov 2025 11:13:11 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:52 +0100 Subject: [PATCH v4 08/10] 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: <20251117-color-format-v4-8-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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, with a fallback for RGB in place just as a last-ditch attempt. 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 | 19 ++++++++++ drivers/gpu/drm/i915/display/intel_connector.h | 2 ++ drivers/gpu/drm/i915/display/intel_display_types.h | 15 ++++++++ drivers/gpu/drm/i915/display/intel_dp.c | 42 +++++++++++++++++-= ---- drivers/gpu/drm/i915/display/intel_dp.h | 4 +++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 37 +++++++++++++++++-- drivers/gpu/drm/i915/display/intel_hdmi.c | 40 ++++++++++++++++--= --- 7 files changed, 140 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/d= rm/i915/display/intel_connector.c index 913d90a7a508..3d563e12d3aa 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -40,6 +40,11 @@ #include "intel_hdcp.h" #include "intel_panel.h" =20 +static const u32 supported_colorformats =3D DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444 | + DRM_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), @@ -326,6 +331,13 @@ intel_attach_hdmi_colorspace_property(struct drm_conne= ctor *connector) drm_connector_attach_colorspace_property(connector); } =20 +void +intel_attach_hdmi_colorformat_property(struct drm_connector *connector) +{ + if (!drm_mode_create_hdmi_color_format_property(connector, supported_colo= rformats)) + drm_connector_attach_color_format_property(connector); +} + void intel_attach_dp_colorspace_property(struct drm_connector *connector) { @@ -333,6 +345,13 @@ intel_attach_dp_colorspace_property(struct drm_connect= or *connector) drm_connector_attach_colorspace_property(connector); } =20 +void +intel_attach_dp_colorformat_property(struct drm_connector *connector) +{ + if (!drm_mode_create_dp_color_format_property(connector, supported_colorf= ormats)) + 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..38401bc705e3 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.h +++ b/drivers/gpu/drm/i915/display/intel_connector.h @@ -30,7 +30,9 @@ void intel_attach_force_audio_property(struct drm_connect= or *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); void intel_attach_aspect_ratio_property(struct drm_connector *connector); void intel_attach_hdmi_colorspace_property(struct drm_connector *connector= ); +void intel_attach_hdmi_colorformat_property(struct drm_connector *connecto= r); void intel_attach_dp_colorspace_property(struct drm_connector *connector); +void intel_attach_dp_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_display_types.h b/drivers/g= pu/drm/i915/display/intel_display_types.h index 38702a9e0f50..b06fbe56cbbe 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -2206,6 +2206,21 @@ to_intel_frontbuffer(struct drm_framebuffer *fb) return fb ? to_intel_framebuffer(fb)->frontbuffer : NULL; } =20 +static inline __pure u32 +intel_output_format_to_drm_color_format(enum intel_output_format input) +{ + switch (input) { + case INTEL_OUTPUT_FORMAT_RGB: + return DRM_COLOR_FORMAT_RGB444; + case INTEL_OUTPUT_FORMAT_YCBCR444: + return DRM_COLOR_FORMAT_YCBCR444; + case INTEL_OUTPUT_FORMAT_YCBCR420: + return DRM_COLOR_FORMAT_YCBCR420; + } + + return DRM_COLOR_FORMAT_NONE; +} + /* * Conversion functions/macros from various pointer types to struct * intel_display pointer. diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915= /display/intel_dp.c index 0ec82fcbcf48..6fcd1f2dbefd 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1183,7 +1183,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) { @@ -3141,17 +3141,23 @@ 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; + u32 sink_format_drm; int ret; =20 - ycbcr_420_only =3D drm_mode_is_420_only(info, adjusted_mode); + if ((conn_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420 && + drm_mode_is_420_also(info, adjusted_mode)) || + 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_COLOR_FORMAT_YCBCR444) + 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"); + "YCbCr 4:2:0 mode requested but unsupported by connector. Trying 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); } =20 crtc_state->output_format =3D intel_dp_output_format(connector, crtc_stat= e->sink_format); @@ -3159,6 +3165,11 @@ 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 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 (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 || !connector->base.ycbcr_420_allowed || !drm_mode_is_420_also(info, adjusted_mode)) @@ -3169,9 +3180,22 @@ 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; + sink_format_drm =3D intel_output_format_to_drm_color_format(crtc_state->s= ink_format); + if (conn_state->color_format && + conn_state->color_format !=3D sink_format_drm && + conn_state->color_format !=3D DRM_COLOR_FORMAT_AUTO) { + drm_dbg_kms(display->drm, + "Unsupported color format %s (0x%x), sink has 0x%x\n", + drm_get_color_format_name(conn_state->color_format), + conn_state->color_format, sink_format_drm); + return -EINVAL; + } + + return 0; } =20 void @@ -6626,8 +6650,10 @@ intel_dp_add_properties(struct intel_dp *intel_dp, s= truct drm_connector *_connec if (intel_bios_encoder_is_lspcon(dp_to_dig_port(intel_dp)->base.devdata))= { drm_connector_attach_content_type_property(&connector->base); intel_attach_hdmi_colorspace_property(&connector->base); + intel_attach_hdmi_colorformat_property(&connector->base); } else { intel_attach_dp_colorspace_property(&connector->base); + intel_attach_dp_colorformat_property(&connector->base); } =20 if (intel_dp_has_gamut_metadata_dip(&dp_to_dig_port(intel_dp)->base)) diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915= /display/intel_dp.h index 200a8b267f64..a7492c97ac97 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -205,6 +205,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 4c0b943fe86f..35f8db595e22 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -653,9 +653,11 @@ static int mst_stream_compute_config(struct intel_enco= der *encoder, 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; struct link_config_limits limits; bool dsc_needed, joiner_needs_dsc; int num_joined_pipes; + u32 sink_format_drm; int ret =3D 0; =20 if (pipe_config->fec_enable && @@ -671,10 +673,36 @@ static int mst_stream_compute_config(struct intel_enc= oder *encoder, if (num_joined_pipes > 1) pipe_config->joiner_pipes =3D GENMASK(crtc->pipe + num_joined_pipes - 1,= crtc->pipe); =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_COLOR_FORMAT_YCBCR420 && + drm_mode_is_420_also(info, adjusted_mode)) || + 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_COLOR_FORMAT_YCBCR444) + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR444; + else + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; + + 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 it's unsupported by connector. Trying R= GB.\n"); + pipe_config->sink_format =3D INTEL_OUTPUT_FORMAT_RGB; + } + + pipe_config->output_format =3D intel_dp_output_format(connector, pipe_con= fig->sink_format); pipe_config->has_pch_encoder =3D false; =20 + sink_format_drm =3D intel_output_format_to_drm_color_format(pipe_config->= sink_format); + if (conn_state->color_format && + conn_state->color_format !=3D sink_format_drm && + conn_state->color_format !=3D DRM_COLOR_FORMAT_AUTO) { + drm_dbg_kms(display->drm, + "Unsupported color format %s (0x%x), sink has 0x%x\n", + drm_get_color_format_name(conn_state->color_format), + conn_state->color_format, sink_format_drm); + return -EINVAL; + } + joiner_needs_dsc =3D intel_dp_joiner_needs_dsc(display, num_joined_pipes); =20 dsc_needed =3D joiner_needs_dsc || intel_dp->force_dsc_en || @@ -1660,6 +1688,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_dp_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 908faf17f93d..adecee10cb4c 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2271,21 +2271,28 @@ 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); + u32 sink_format_drm; + bool want_420; 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 (conn_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR444) + crtc_state->sink_format =3D INTEL_OUTPUT_FORMAT_YCBCR444; + else { + want_420 =3D ((conn_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420= && + drm_mode_is_420(info, adjusted_mode)) || + drm_mode_is_420_only(info, adjusted_mode)); + crtc_state->sink_format =3D intel_hdmi_sink_format(crtc_state, connector, + want_420); } =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 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 (crtc_state->sink_format =3D=3D INTEL_OUTPUT_FORMAT_YCBCR420 || !crtc_state->has_hdmi_sink || !connector->base.ycbcr_420_allowed || @@ -2295,6 +2302,19 @@ static int intel_hdmi_compute_output_format(struct i= ntel_encoder *encoder, 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; + } + + sink_format_drm =3D intel_output_format_to_drm_color_format(crtc_state->s= ink_format); + if (conn_state->color_format && + conn_state->color_format !=3D sink_format_drm && + conn_state->color_format !=3D DRM_COLOR_FORMAT_AUTO) { + drm_dbg_kms(display->drm, + "Unsupported color format %s (0x%x), current sink color format 0x%x= \n", + drm_get_color_format_name(conn_state->color_format), + conn_state->color_format, sink_format_drm); + ret =3D -EINVAL; } =20 return ret; @@ -2690,8 +2710,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_hdmi_colorformat_property(&connector->base); + } } =20 /* --=20 2.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41A79333723 for ; Mon, 17 Nov 2025 19:14:34 +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=1763406876; cv=pass; b=MEsonUhE0UOk3Wn6wfwqQp3ZQq53Jy3zoIXOuXKB9YszFUgMvdcFQ3dqw3DwzSiaZI0NFOd2DtWXSTVpKKy168bhqxz6zTs5PQeYvGH18SMlisD5bjMpTJvAXW1MTm9zrBmbVpqjb2uM4MITIrU5kHumjjYseVD8KfgwKMbrXpg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406876; c=relaxed/simple; bh=/YaO6J6gbbmYyCRMCqr9EeAjutcHKewD8xdNsfte+wg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E0JsNqpIVfrVXCVrKOKlIh2Am+Y5AM+OZhA4FjLr12hDQM6JhOcY+A0I4p4uMI2tzXX5Ag0L+vMyEFJxEyRoURDkNMqkXQaNWQ6s7xfK9GaiOy8MqSh3RYB2sg7vpJ+Yb0Pi/e56AR7b10TkI8OTCGTPAhB8e5gQp3wB/BCoLvE= 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=N/RlWvB1; 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="N/RlWvB1" ARC-Seal: i=1; a=rsa-sha256; t=1763406800; cv=none; d=zohomail.com; s=zohoarc; b=KR284cWgBwlx9crp66vzSYKtbdRLEYxBrx7RsR7idU8dh4nFIW3m+/iKcYW6Bi0rVJdvAX7DrgF23FKEx4OmzzKj/Y9uUs3i1gFxYWl7xw7NFfgsIBuyAWPLWshB0PCAVH4XME1oWiLGVODB9X5UsEM30wmkXYK2Z9suKkJVGp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406800; 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=9wJsCR2ipwj4SdN3PquYtD5oBgGnl3rQPgWEO5hwFf8=; b=n7vCkuuo7QgSNGz6vHke4UqZFYDSS5uDXiEqJQnalSSvTyTQUpykE8z0MzmIJZ0OGAw89bV27hfv9qZ4otlY/4vojSer5f2nUprRuDDSjm+WhOhSSpzfvg/Z4xryW1PQgeY2V8GweBArjzUJTWz8ui08luINcY+xAKMJcXln5zQ= 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=1763406800; 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=9wJsCR2ipwj4SdN3PquYtD5oBgGnl3rQPgWEO5hwFf8=; b=N/RlWvB1PM55IA5o6QW8xn6S10sf90cDpub8h2xEJH7tfZCXzJ26Njf+2LgKeeCl d85HFXHqHWEHlkA0KCiM+/sFgaVYZ6qE0IhEOASQrEQG8iJXh6KgZTTmsLlhvHPrD0P nUVJNYFSavf5r4075UlSSFn9VO5QUFvGy9Sp9viI= Received: by mx.zohomail.com with SMTPS id 1763406797923241.23014681054838; Mon, 17 Nov 2025 11:13:17 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:53 +0100 Subject: [PATCH v4 09/10] 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: <20251117-color-format-v4-9-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, 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, in which the property is either unset or set to 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 | 14 ++++ 2 files changed, 94 insertions(+), 9 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 598dc3ce993c..956dd4934fa6 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -6504,11 +6504,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) @@ -6521,19 +6524,38 @@ 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) || (drm_mode_is_420_also(info, mo= de_in) && - aconnector && aconnector->force_yuv420_output)) + + want_420 =3D (aconnector && aconnector->force_yuv420_output) || + (connector_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR420); + want_422 =3D (aconnector && aconnector->force_yuv422_output) || + (connector_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR422); + + if (drm_mode_is_420(info, mode_in) && want_420) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR420; - else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR4= 22) - && aconnector - && aconnector->force_yuv422_output) + else if ((info->color_formats & DRM_COLOR_FORMAT_YCBCR422) && want_422 &&= is_dp_or_hdmi) timing_out->pixel_encoding =3D PIXEL_ENCODING_YCBCR422; - else if ((connector->display_info.color_formats & DRM_COLOR_FORMAT_YCBCR4= 44) - && stream->signal =3D=3D SIGNAL_TYPE_HDMI_TYPE_A) + else if (connector_state->color_format =3D=3D DRM_COLOR_FORMAT_YCBCR444 && + (info->color_formats & DRM_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_COLOR_FORMAT_RGB444 || + connector_state->color_format =3D=3D DRM_COLOR_FORMAT_AUTO) && + !drm_mode_is_420_only(info, mode_in)) 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 && + connector_state->color_format !=3D DRM_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( @@ -7874,6 +7896,39 @@ 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 || + drm_state->color_format =3D=3D DRM_COLOR_FORMAT_NONE) + return DC_OK; + + switch (drm_state->color_format) { + case DRM_COLOR_FORMAT_AUTO: + case DRM_COLOR_FORMAT_RGB444: + encoding =3D PIXEL_ENCODING_RGB; + break; + case DRM_COLOR_FORMAT_YCBCR444: + encoding =3D PIXEL_ENCODING_YCBCR444; + break; + case DRM_COLOR_FORMAT_YCBCR422: + encoding =3D PIXEL_ENCODING_YCBCR422; + break; + case DRM_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, @@ -7920,6 +7975,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_DEBUG_KMS("Pruned mode %d x %d (clk %d) %s %s -- %s\n", drm_mode->hdisplay, @@ -8735,6 +8793,13 @@ 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 + DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444 | + DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420; + void amdgpu_dm_connector_init_helper(struct amdgpu_display_manager *dm, struct amdgpu_dm_connector *aconnector, int connector_type, @@ -8827,10 +8892,16 @@ void amdgpu_dm_connector_init_helper(struct amdgpu_= display_manager *dm, if (connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIA) { if (!drm_mode_create_hdmi_colorspace_property(&aconnector->base, support= ed_colorspaces)) drm_connector_attach_colorspace_property(&aconnector->base); + if (!drm_mode_create_hdmi_color_format_property(&aconnector->base, + supported_colorformats)) + drm_connector_attach_color_format_property(&aconnector->base); } else if ((connector_type =3D=3D DRM_MODE_CONNECTOR_DisplayPort && !acon= nector->mst_root) || connector_type =3D=3D DRM_MODE_CONNECTOR_eDP) { if (!drm_mode_create_dp_colorspace_property(&aconnector->base, supported= _colorspaces)) drm_connector_attach_colorspace_property(&aconnector->base); + if (!drm_mode_create_dp_color_format_property(&aconnector->base, + supported_colorformats)) + drm_connector_attach_color_format_property(&aconnector->base); } =20 if (connector_type =3D=3D DRM_MODE_CONNECTOR_HDMIA || 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 5e92eaa67aa3..7d35779c99d5 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,13 @@ =20 #define PEAK_FACTOR_X1000 1006 =20 +static const u32 supported_colorformats =3D + DRM_COLOR_FORMAT_AUTO | + DRM_COLOR_FORMAT_RGB444 | + DRM_COLOR_FORMAT_YCBCR444 | + DRM_COLOR_FORMAT_YCBCR422 | + DRM_COLOR_FORMAT_YCBCR420; + /* * This function handles both native AUX and I2C-Over-AUX transactions. */ @@ -679,6 +686,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_dp_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.51.2 From nobody Tue Dec 2 02:52:26 2025 Received: from sender3-pp-f112.zoho.com (sender3-pp-f112.zoho.com [136.143.184.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 DCDC633DEEB for ; Mon, 17 Nov 2025 19:14:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.184.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406879; cv=pass; b=iF+MvOdceoyOII7zstrAyDWQ00G3viOVcJPgtFiXA2BV0WoXADGOjSToc6e6Rv+IqVnya6WGHcw++hRE5lf5Sq3JKUlIpKnudqUlJ4aV/XnZVwyVWCaL1xPIdmkgh4f1hnpFpjP+sWXx+GC1HifjpRk2p3dBa4fo6LqR3QC/DzE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763406879; c=relaxed/simple; bh=6bsXIXrdhaod5q/3ZPBknhwB3QRB5DIOSAeStEhTpqc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ovFPLRA1F64agvTTsE17XSnmQiyDZfZvdXxHJXZ/mVcXE6/R283vquFC9luls++4owUUUwrFJ85cEP1D+VuANSscE51eqjlNkvoMaRu8q8/5HZGLm2Nf4Yu8ytzADghM/97YfGtvcpDUw2w+FQBSOGNvOc1Nxmv4VyVPrDNWyJA= 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=EZq9WaAC; arc=pass smtp.client-ip=136.143.184.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="EZq9WaAC" ARC-Seal: i=1; a=rsa-sha256; t=1763406806; cv=none; d=zohomail.com; s=zohoarc; b=Z21pBSIEKUkTOJiB5hdGRgDrSUkip71Dp0v3zMyBa/QIV91Bd45ohaf2V25lHpjAFmJHncl76IBuNmkhzZGhIySDuo8NpWckdf43wSSTDwYbxBpobQrQ0eCc70k6STIuxKvZmsIe13NUrOIiOKK3rMgiGUwB8x+yVlIWzWlkhXk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763406806; 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=Gs1lZySDkGpqwXxYZoOAuegaRpnGsTAvT6lpT/qhmRM=; b=cpYIuOBubqMBGCEVmD8BaEQzteCMEQ0+il35O/s8LJ5DUQNuwg8JeEkpfT5tICHbVUDfAHiX7vcmZqAkPhV+8tJJzLz8FqHpSFmstFY1oLNde4Vwq+tVCI3vJo+b4/m5fhQSmrSJOEOvXOEUKrDBCRpYhliRzW7xHwgcIZ8/APk= 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=1763406806; 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=Gs1lZySDkGpqwXxYZoOAuegaRpnGsTAvT6lpT/qhmRM=; b=EZq9WaACwM6nu+4207zjZ7BFLwIjrwdMyzWM0XlkTylKaYIqvf2uzfCzyI6nDfne iyyXiO/WxV665oIWV+zsMZ4XXeYKTTO9yDhTPabVp4RTUEqBuBhlj5W5u6y4ODqPWAT bAV3r+G3+tEMNB8rcuRWOCVuH2ry8WOtrCKrBhKg= Received: by mx.zohomail.com with SMTPS id 1763406804770398.6739711663877; Mon, 17 Nov 2025 11:13:24 -0800 (PST) From: Nicolas Frattaroli Date: Mon, 17 Nov 2025 20:11:54 +0100 Subject: [PATCH v4 10/10] drm/rockchip: 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: <20251117-color-format-v4-10-0ded72bd1b00@collabora.com> References: <20251117-color-format-v4-0-0ded72bd1b00@collabora.com> In-Reply-To: <20251117-color-format-v4-0-0ded72bd1b00@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 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, Nicolas Frattaroli , Derek Foreman , Marius Vlad X-Mailer: b4 0.14.3 From: Derek Foreman Register the color format property in the dw_hdmi_qp-rockchip driver, and act on requested format changes as part of the connector state in the vop2 video output driver. Signed-off-by: Derek Foreman Signed-off-by: Marius Vlad Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 3 ++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 46 ++++++++++++++++++++++= ++++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 2 ++ 3 files changed, 51 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 7c294751de19..7028166fdace 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c @@ -635,6 +635,9 @@ static int dw_hdmi_qp_rockchip_bind(struct device *dev,= struct device *master, return dev_err_probe(hdmi->dev, PTR_ERR(connector), "Failed to init bridge connector\n"); =20 + if (!drm_mode_create_hdmi_color_format_property(connector, supported_colo= rformats)) + drm_connector_attach_color_format_property(connector); + return drm_connector_attach_encoder(connector, encoder); } =20 diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.c index 498df0ce4680..2fc9b21c5522 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -1549,6 +1549,50 @@ static void vop2_dither_setup(struct drm_crtc *crtc,= u32 *dsp_ctrl) DITHER_DOWN_ALLEGRO); } =20 +static void vop2_bcsh_config(struct drm_crtc *crtc, struct vop2_video_port= *vp) +{ + struct drm_connector_list_iter conn_iter; + struct drm_connector *connector; + u32 format =3D 0; + enum drm_colorspace colorspace =3D 0; + u32 val =3D 0; + + drm_connector_list_iter_begin(crtc->dev, &conn_iter); + drm_for_each_connector_iter(connector, &conn_iter) { + if (!(crtc->state->connector_mask & drm_connector_mask(connector))) + continue; + + format =3D connector->state->color_format; + colorspace =3D connector->state->colorspace; + break; + } + drm_connector_list_iter_end(&conn_iter); + + if (format =3D=3D DRM_COLOR_FORMAT_YCBCR420 || + format =3D=3D DRM_COLOR_FORMAT_YCBCR444 || + format =3D=3D DRM_COLOR_FORMAT_YCBCR422) { + val =3D RK3568_VP_BCSH_CTRL__BCSH_R2Y_EN | BIT(7); + + switch (colorspace) { + case DRM_MODE_COLORIMETRY_BT2020_RGB: + case DRM_MODE_COLORIMETRY_BT2020_YCC: + val |=3D BIT(7) | BIT(6); + break; + case DRM_MODE_COLORIMETRY_BT709_YCC: + val |=3D BIT(6); + break; + default: + break; + } + if (colorspace =3D=3D DRM_MODE_COLORIMETRY_BT2020_RGB || + colorspace =3D=3D DRM_MODE_COLORIMETRY_BT2020_YCC) + val |=3D BIT(6); + } + + vop2_vp_write(vp, RK3568_VP_BCSH_CTRL, val); + vop2_vp_write(vp, RK3568_VP_BCSH_COLOR_BAR, 0); +} + static void vop2_post_config(struct drm_crtc *crtc) { struct vop2_video_port *vp =3D to_vop2_video_port(crtc); @@ -1600,6 +1644,8 @@ static void vop2_post_config(struct drm_crtc *crtc) } =20 vop2_vp_write(vp, RK3568_VP_DSP_BG, 0); + + vop2_bcsh_config(crtc, vp); } =20 static int us_to_vertical_line(struct drm_display_mode *mode, int us) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm= /rockchip/rockchip_drm_vop2.h index 9124191899ba..33fdc9d8d819 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -637,6 +637,8 @@ enum dst_factor_mode { =20 #define RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN BIT(15) =20 +#define RK3568_VP_BCSH_CTRL__BCSH_R2Y_EN BIT(4) + #define RK3568_VP_DSP_CTRL__STANDBY BIT(31) #define RK3568_VP_DSP_CTRL__DSP_LUT_EN BIT(28) #define RK3568_VP_DSP_CTRL__DITHER_DOWN_MODE BIT(20) --=20 2.51.2