From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 689C7EBFD34 for ; Mon, 13 Apr 2026 10:10:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pfuJgNlLA/GmqV8a4mWT/AFOH7DIYdQGAVlfIcknDY4=; b=BO4ADCDfkgg1W465xjCq1yL0cV fnfZHkK/Xs2KMPiYIkWUWBKGNNYGIAISjoqZVjew3rOGjqzftELLNWQhTKWPhg5V0kWMAFN/h/FdS ck8aLFzOSFvtgJ6fsekQAIlpu/7BImhPfBLDDMIELuqMo2NEzYl3R62p9GeYFPI1/0m0fIn2Wb3w1 YAMnjD5GsVsCBMlMwjoaFXhu6iuGm9Sx3RzuPPW2zJcz89NEtvQOGO85Z/2XNPomJBNdj97GMboCO gHrFtPH0VAxR+ax0lW4fW1cXtYZT4sofgxunlf73T3LzYlBUJHs2d0vqvwy0jduGGZS8SPSQWq7o9 2QgIzzCg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCEFB-0000000FR8t-18jk; Mon, 13 Apr 2026 10:10:13 +0000 Received: from sender4-pp-f112.zoho.com ([136.143.188.112]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wCEF7-0000000FR4k-0hf0; Mon, 13 Apr 2026 10:10:10 +0000 ARC-Seal: i=1; a=rsa-sha256; t=1776074977; cv=none; d=zohomail.com; s=zohoarc; b=IpYYRCqk8tavoGvhSbVCVZTy/Zp/Vz3RX2uc/19ZmPcYEILKWGe+rdahSZOB/qTrf1F7aerpMkFDXY58jylBg3e9bYr/u8M6Oih6kmTGloqMQzYxYzISDfk16I+HfexcBbzjJ3fnpj0I8a4Z4rgOsZ4DBjTuXYD3jsqi8X4kbLU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1776074977; 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=pfuJgNlLA/GmqV8a4mWT/AFOH7DIYdQGAVlfIcknDY4=; b=QJngyNuJty26H+EkH9NujQusfNE23MNs/ZOHTSw6B8ivAub78LVljZapaAUhEwtYRxjW3CpMGkLmYZUsPDJw0FOgKkD3SEbzSO9M2lI7wZxNz0gbmKk2gO+18vvp3nzCYxYgNPWq9sCSL8Ndfjb2858LJV4uXX3FPd20SReAR5Y= 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=1776074977; 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=pfuJgNlLA/GmqV8a4mWT/AFOH7DIYdQGAVlfIcknDY4=; b=g4PHIP/EPkNVd3lJDrByBv5nWwJsdR7qGWTxixt9xABUDKKmUgTASWQYfiMsSiDy RkHfTGyXUhNNNgWpzuX+NQdDvBJNqKl4fDeA8PWIzjEc4aVVe+xHf+IxyVaZeNe97rI ZgX/uWOK8RrxuMjXwrbbxpfzMCTXBXqW6QPv3fjk= Received: by mx.zohomail.com with SMTPS id 1776074976647230.75652894518373; Mon, 13 Apr 2026 03:09:36 -0700 (PDT) From: Nicolas Frattaroli Date: Mon, 13 Apr 2026 12:07:27 +0200 Subject: [PATCH v13 13/27] drm/i915: Implement the "color format" DRM property MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260413-color-format-v13-13-ab37d4dfba48@collabora.com> References: <20260413-color-format-v13-0-ab37d4dfba48@collabora.com> In-Reply-To: <20260413-color-format-v13-0-ab37d4dfba48@collabora.com> To: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Andy Yan , Jani Nikula , Rodrigo Vivi , Joonas Lahtinen , Tvrtko Ursulin , Dmitry Baryshkov , Sascha Hauer , Rob Herring , Jonathan Corbet , Shuah Khan Cc: kernel@collabora.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-doc@vger.kernel.org, Nicolas Frattaroli X-Mailer: b4 0.15.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260413_031009_263517_847D675B X-CRM114-Status: GOOD ( 15.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Implement the "color format" DRM property for both DP and HDMI. The values of the property include RGB, YCbCr420, YCbCr444 and Auto. Auto will pick RGB, with a fallback to YCbCr420. The mask of supported formats by the source exposed by the property is an optimistic scenario, as specific DFP-related caveats can't be established before an EDID is present. Should the explicitly requested color format not be supported by the sink (or by the source in combination with the sink), then an error is returned to userspace, so that it can make a better choice. Signed-off-by: Nicolas Frattaroli --- drivers/gpu/drm/i915/display/intel_connector.c | 10 +++++++ drivers/gpu/drm/i915/display/intel_connector.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 38 +++++++++++++++++++++++--- drivers/gpu/drm/i915/display/intel_hdmi.c | 38 +++++++++++++++++++++++--- 4 files changed, 79 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c index 7ef9338d67ab..b1a21dd77af6 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -338,3 +338,13 @@ intel_attach_scaling_mode_property(struct drm_connector *connector) connector->state->scaling_mode = DRM_MODE_SCALE_ASPECT; } + +void +intel_attach_color_format_property(struct drm_connector *connector) +{ + const unsigned long fmts = BIT(DRM_OUTPUT_COLOR_FORMAT_RGB444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR444) | + BIT(DRM_OUTPUT_COLOR_FORMAT_YCBCR420); + + drm_connector_attach_color_format_property(connector, fmts); +} diff --git a/drivers/gpu/drm/i915/display/intel_connector.h b/drivers/gpu/drm/i915/display/intel_connector.h index 0aa86626e646..c77b7aac02cb 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.h +++ b/drivers/gpu/drm/i915/display/intel_connector.h @@ -34,5 +34,6 @@ void intel_attach_dp_colorspace_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 *connector); void intel_connector_cancel_modeset_retry_work(struct intel_connector *connector); +void intel_attach_color_format_property(struct drm_connector *connector); #endif /* __INTEL_CONNECTOR_H__ */ diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 47bd3d59ea93..3b2293415b55 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -3398,10 +3398,10 @@ intel_dp_compute_output_format(struct intel_encoder *encoder, } static int -intel_dp_compute_formats(struct intel_encoder *encoder, - struct intel_crtc_state *crtc_state, - struct drm_connector_state *conn_state, - bool respect_downstream_limits) +intel_dp_compute_formats_auto(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + bool respect_downstream_limits) { struct intel_display *display = to_intel_display(encoder); struct intel_dp *intel_dp = enc_to_intel_dp(encoder); @@ -3437,6 +3437,34 @@ intel_dp_compute_formats(struct intel_encoder *encoder, return ret; } +static int +intel_dp_compute_formats(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + struct drm_connector_state *conn_state, + bool respect_downstream_limits) +{ + switch (conn_state->color_format) { + case DRM_CONNECTOR_COLOR_FORMAT_RGB444: + return intel_dp_compute_output_format(encoder, crtc_state, conn_state, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_RGB); + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: + return intel_dp_compute_output_format(encoder, crtc_state, conn_state, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_YCBCR444); + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: + return intel_dp_compute_output_format(encoder, crtc_state, conn_state, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_YCBCR420); + case DRM_CONNECTOR_COLOR_FORMAT_AUTO: + return intel_dp_compute_formats_auto(encoder, crtc_state, conn_state, + respect_downstream_limits); + default: + MISSING_CASE(conn_state->color_format); + return -EINVAL; + } +} + void intel_dp_audio_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, @@ -7025,6 +7053,8 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *_connec if (HAS_VRR(display)) drm_connector_attach_vrr_capable_property(&connector->base); + + intel_attach_color_format_property(&connector->base); } static void diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c index 5ab5b5f85cde..632498e3702b 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2307,10 +2307,10 @@ static int intel_hdmi_compute_output_format(struct intel_encoder *encoder, return intel_hdmi_compute_clock(encoder, crtc_state, respect_downstream_limits); } -static int intel_hdmi_compute_formats(struct intel_encoder *encoder, - struct intel_crtc_state *crtc_state, - const struct drm_connector_state *conn_state, - bool respect_downstream_limits) +static int intel_hdmi_compute_formats_auto(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + const struct drm_connector_state *conn_state, + bool respect_downstream_limits) { struct intel_display *display = to_intel_display(encoder); struct intel_connector *connector = to_intel_connector(conn_state->connector); @@ -2345,6 +2345,35 @@ static int intel_hdmi_compute_formats(struct intel_encoder *encoder, return ret; } +static int intel_hdmi_compute_formats(struct intel_encoder *encoder, + struct intel_crtc_state *crtc_state, + const struct drm_connector_state *conn_state, + bool respect_downstream_limits) +{ + struct intel_connector *connector = to_intel_connector(conn_state->connector); + + switch (conn_state->color_format) { + case DRM_CONNECTOR_COLOR_FORMAT_RGB444: + return intel_hdmi_compute_output_format(encoder, crtc_state, connector, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_RGB); + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR444: + return intel_hdmi_compute_output_format(encoder, crtc_state, connector, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_YCBCR444); + case DRM_CONNECTOR_COLOR_FORMAT_YCBCR420: + return intel_hdmi_compute_output_format(encoder, crtc_state, connector, + respect_downstream_limits, + INTEL_OUTPUT_FORMAT_YCBCR420); + case DRM_CONNECTOR_COLOR_FORMAT_AUTO: + return intel_hdmi_compute_formats_auto(encoder, crtc_state, conn_state, + respect_downstream_limits); + default: + MISSING_CASE(conn_state->color_format); + return -EINVAL; + } +} + static bool intel_hdmi_is_cloned(const struct intel_crtc_state *crtc_state) { return crtc_state->uapi.encoder_mask && @@ -2729,6 +2758,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *_ intel_attach_hdmi_colorspace_property(&connector->base); drm_connector_attach_content_type_property(&connector->base); + intel_attach_color_format_property(&connector->base); if (DISPLAY_VER(display) >= 10) drm_connector_attach_hdr_output_metadata_property(&connector->base); -- 2.53.0