From patchwork Tue Nov 20 14:22:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shankar, Uma" X-Patchwork-Id: 10690425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0661014BD for ; Tue, 20 Nov 2018 14:01:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EAEAE2A919 for ; Tue, 20 Nov 2018 14:01:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE96A2A91D; Tue, 20 Nov 2018 14:01:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 71AEF2A919 for ; Tue, 20 Nov 2018 14:01:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 55B766E3C8; Tue, 20 Nov 2018 14:01:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5E1D06E3C6; Tue, 20 Nov 2018 14:01:17 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2018 06:01:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,257,1539673200"; d="scan'208";a="109676190" Received: from linuxpresi1-desktop.iind.intel.com ([10.223.25.28]) by fmsmga001.fm.intel.com with ESMTP; 20 Nov 2018 06:01:14 -0800 From: Uma Shankar To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [v3 2/3] drm: Add DP colorspace property Date: Tue, 20 Nov 2018 19:52:10 +0530 Message-Id: <1542723731-20075-3-git-send-email-uma.shankar@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1542723731-20075-1-git-send-email-uma.shankar@intel.com> References: <1542723731-20075-1-git-send-email-uma.shankar@intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ville.syrjala@intel.com, jonas@kwiboo.se, hansverk@cisco.com, Uma Shankar , maarten.lankhorst@intel.com MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a DP colorspace property, enabling userspace to switch to various supported colorspaces. This will help enable BT2020 along with other colorspaces. v2: Addressed Maarten and Ville's review comments. Enhanced the colorspace enum to incorporate both HDMI and DP supported colorspaces. Also, added a default option for colorspace. v3: Split the changes to have separate colorspace property for DP and HDMI. Signed-off-by: Uma Shankar --- drivers/gpu/drm/drm_atomic_uapi.c | 4 ++++ drivers/gpu/drm/drm_connector.c | 35 +++++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 7 +++++++ include/drm/drm_mode_config.h | 6 ++++++ include/uapi/drm/drm_mode.h | 19 +++++++++++++++++++ 5 files changed, 71 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_atomic_uapi.c index 4e09a38..37d51299b 100644 --- a/drivers/gpu/drm/drm_atomic_uapi.c +++ b/drivers/gpu/drm/drm_atomic_uapi.c @@ -723,6 +723,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, state->content_type = val; } else if (property == config->hdmi_colorspace_property) { state->hdmi_colorspace = val; + } else if (property == config->dp_colorspace_property) { + state->dp_colorspace = val; } else if (property == connector->scaling_mode_property) { state->scaling_mode = val; } else if (property == connector->content_protection_property) { @@ -801,6 +803,8 @@ static int drm_atomic_connector_set_property(struct drm_connector *connector, *val = state->content_type; } else if (property == config->hdmi_colorspace_property) { *val = state->hdmi_colorspace; + } else if (property == config->dp_colorspace_property) { + *val = state->dp_colorspace; } else if (property == connector->scaling_mode_property) { *val = state->scaling_mode; } else if (property == connector->content_protection_property) { diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 1906e4a..5bb9cb6 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -850,6 +850,29 @@ int drm_display_info_set_bus_formats(struct drm_display_info *info, { COLORIMETRY_DEFAULT, "Default" }, }; +static const struct drm_prop_enum_list dp_colorspace[] = { + /* Standard Definition Colorimetry based on CEA 861 */ + { DP_COLORIMETRY_ITU_601, "ITU_601" }, + { DP_COLORIMETRY_ITU_709, "ITU_709" }, + /* Standard Definition Colorimetry based on IEC 61966-2-4 */ + { DP_COLORIMETRY_XV_YCC_601, "XV_YCC_601" }, + /* High Definition Colorimetry based on IEC 61966-2-4 */ + { DP_COLORIMETRY_XV_YCC_709, "XV_YCC_709" }, + /* Colorimetry based on IEC 61966-2-5 */ + { DP_COLORIMETRY_OPRGB, "opRGB" }, + /* DP MSA Colorimetry */ + { DP_COLORIMETRY_Y_CBCR_ITU_601, "YCBCR_ITU_601" }, + { DP_COLORIMETRY_Y_CBCR_ITU_709, "YCBCR_ITU_709" }, + { DP_COLORIMETRY_SRGB, "sRGB" }, + { DP_COLORIMETRY_RGB_WIDE_GAMUT, "RGB Wide Gamut" }, + { DP_COLORIMETRY_SCRGB, "scRGB" }, + { DP_COLORIMETRY_DCI_P3, "DCI-P3" }, + { DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, "Custom Profile" }, + /* For Default case, driver will set the colorspace */ + { DP_COLORIMETRY_DEFAULT, "Default" }, +}; + + /** * DOC: standard connector properties * @@ -1457,6 +1480,18 @@ int drm_mode_create_colorspace_property(struct drm_connector *connector) return -ENOMEM; dev->mode_config.hdmi_colorspace_property = prop; + } else if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) { + if (dev->mode_config.dp_colorspace_property) + return 0; + + prop = drm_property_create_enum(dev, DRM_MODE_PROP_ENUM, + "DP_Colorspace", dp_colorspace, + ARRAY_SIZE(dp_colorspace)); + if (!prop) + return -ENOMEM; + + dev->mode_config.dp_colorspace_property = prop; } return 0; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 5fda56d..4596e24 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -504,6 +504,13 @@ struct drm_connector_state { enum hdmi_full_colorimetry hdmi_colorspace; /** + * @dp_colorspace: Connector property to request colorspace + * change on DP Sink. This is most commonly used to switch to + * wider color gamuts like BT2020. + */ + enum dp_full_colorimetry dp_colorspace; + + /** * @writeback_job: Writeback job for writeback connectors * * Holds the framebuffer and out-fence for a writeback connector. As diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h index ec7cab8..87b0698 100644 --- a/include/drm/drm_mode_config.h +++ b/include/drm/drm_mode_config.h @@ -875,6 +875,12 @@ struct drm_mode_config { struct drm_property *hdmi_colorspace_property; /** + * @dp_colorspace_property: Connector property to set the suitable + * colorspace supported by the DP sink. + */ + struct drm_property *dp_colorspace_property; + + /** * @suspend_state: * * Atomic state when suspended. diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index cc4df26..1cd7346 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -226,6 +226,25 @@ enum hdmi_full_colorimetry { COLORIMETRY_DEFAULT, }; +enum dp_full_colorimetry { + /* CEA 861 Normal Colorimetry options */ + DP_COLORIMETRY_ITU_601 = 0, + DP_COLORIMETRY_ITU_709, + /* CEA 861 Extended Colorimetry Options */ + DP_COLORIMETRY_XV_YCC_601, + DP_COLORIMETRY_XV_YCC_709, + DP_COLORIMETRY_OPRGB, + /* DP MSA Colorimetry Options */ + DP_COLORIMETRY_Y_CBCR_ITU_601, + DP_COLORIMETRY_Y_CBCR_ITU_709, + DP_COLORIMETRY_SRGB, + DP_COLORIMETRY_RGB_WIDE_GAMUT, + DP_COLORIMETRY_SCRGB, + DP_COLORIMETRY_DCI_P3, + DP_COLORIMETRY_CUSTOM_COLOR_PROFILE, + DP_COLORIMETRY_DEFAULT, +}; + struct drm_mode_modeinfo { __u32 clock; __u16 hdisplay;