Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1231864pxj; Fri, 18 Jun 2021 02:33:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyorG2H4Vxa36EEHByicszTF6KUKmGa6HnYumz0q1MRrSDsGkt5xJgaY8gbJ27/7riiSOYX X-Received: by 2002:a05:6402:40c3:: with SMTP id z3mr3663435edb.187.1624008781022; Fri, 18 Jun 2021 02:33:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624008781; cv=none; d=google.com; s=arc-20160816; b=rA7yNi5VbCoidNaXfcDQU1JMOHYNtjn0Axb3mZzpR2pDQ9LMPy53SrJNOSlkGNmgai ftOtl/lHe1nYhFbf+cVUqJKt+PlWxAeKU3aAs1pHYrE0ndQ0hBoufFdhe2TzD/yRKD05 1LG4jBCpgvWAdT1s5ft6ALC8ISqugXohgG+vVsJecxIGXXW7HBO58KqWnJzr+vGMbTZ9 oOq2oz33nTks/tZhIU7usyF6iQ7mDOgQiqxitiXvn+KvBh9+07C/Zj95MKT/aSz2U9nW CNYeO6EFeVgVxyHNbDeg6mp7/uymP6LDHr/fJAQCKvUtvsWeteSOpJP6HwxmMd7DpMHz 4vIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=WLUrkXM9CFpd17OP8injWcGATF1bz5pHZvnPFY0K/6k=; b=SBJS0sv8PfUZwcpnhA+8fHlZwjf3LpiBAvq1O5LwVIfPJrTHAkiB/lF3bnsdKDqGpU Ze233po6IXinfoKboidON97QtVqP1ZQtiqVUkStzoXhJ5F80wJt0lvRf+/VcCIv9hsrg DnbDC5PCM0luDBHKu9BmKsK2W0VFESbfIUsFiOsMcniaaQ3J3DaZuK1hkR/EMD4BVDmV IFICe/IXkiOzoM5kKP4z2aAAGsnIXxUrFSnEXRNUuyXzPFyWqhl7yAcRw3KWpHs1BZVQ pYKeOv89Pfgclcpdbvsuimn0owoBXnEBR3Jf+aPj5IqRMuapq1zZd39sUuW/KYIS6SX3 wElw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 30si2147827ejg.423.2021.06.18.02.32.38; Fri, 18 Jun 2021 02:33:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233984AbhFRJOH (ORCPT + 99 others); Fri, 18 Jun 2021 05:14:07 -0400 Received: from srv6.fidu.org ([159.69.62.71]:56634 "EHLO srv6.fidu.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233651AbhFRJNt (ORCPT ); Fri, 18 Jun 2021 05:13:49 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by srv6.fidu.org (Postfix) with ESMTP id C41DDC800B9; Fri, 18 Jun 2021 11:11:39 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at srv6.fidu.org Received: from srv6.fidu.org ([127.0.0.1]) by localhost (srv6.fidu.org [127.0.0.1]) (amavisd-new, port 10026) with LMTP id AkTUCx9Ep20a; Fri, 18 Jun 2021 11:11:39 +0200 (CEST) Received: from wsembach-tuxedo.fritz.box (p200300e37f3949001760E5710682cA7E.dip0.t-ipconnect.de [IPv6:2003:e3:7f39:4900:1760:e571:682:ca7e]) (Authenticated sender: wse@tuxedocomputers.com) by srv6.fidu.org (Postfix) with ESMTPA id 5A169C800B3; Fri, 18 Jun 2021 11:11:39 +0200 (CEST) From: Werner Sembach To: harry.wentland@amd.com, sunpeng.li@amd.com, alexander.deucher@amd.com, christian.koenig@amd.com, airlied@linux.ie, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org Cc: Werner Sembach Subject: [PATCH v4 09/17] drm/uAPI: Add "active color range" drm property as feedback for userspace Date: Fri, 18 Jun 2021 11:11:08 +0200 Message-Id: <20210618091116.14428-10-wse@tuxedocomputers.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210618091116.14428-1-wse@tuxedocomputers.com> References: <20210618091116.14428-1-wse@tuxedocomputers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a new general drm property "active color range" which can be used by graphic drivers to report the used color range back to userspace. There was no way to check which color range got actually used on a given monitor. To surely predict this, one must know the exact capabilities of the monitor and what the default behaviour of the used driver is. This property helps eliminating the guessing at this point. In the future, automatic color calibration for screens might also depend on this information being available. Signed-off-by: Werner Sembach --- drivers/gpu/drm/drm_connector.c | 59 +++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 27 +++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 684d7abdf0eb..818de58d972f 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -897,6 +897,12 @@ static const struct drm_prop_enum_list drm_active_color_format_enum_list[] = { { DRM_COLOR_FORMAT_YCRCB420, "ycbcr420" }, }; +static const struct drm_prop_enum_list drm_active_color_range_enum_list[] = { + { DRM_MODE_COLOR_RANGE_UNSET, "Unknown" }, + { DRM_MODE_COLOR_RANGE_FULL, "Full" }, + { DRM_MODE_COLOR_RANGE_LIMITED_16_235, "Limited 16:235" }, +}; + DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name, drm_dp_subconnector_enum_list) @@ -1221,6 +1227,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = { * drm_connector_attach_active_color_format_property() to install this * property. * + * active color range: + * This read-only property tells userspace the color range actually used by + * the hardware display engine on "the cable" on a connector. The chosen + * value depends on hardware capabilities of the monitor and the used color + * format. Drivers shall use + * drm_connector_attach_active_color_range_property() to install this + * property. + * * Connectors also have one standardized atomic property: * * CRTC_ID: @@ -2264,6 +2278,51 @@ void drm_connector_set_active_color_format_property(struct drm_connector *connec } EXPORT_SYMBOL(drm_connector_set_active_color_format_property); +/** + * drm_connector_attach_active_color_range_property - attach "active color range" property + * @connector: connector to attach active color range property on. + * + * This is used to check the applied color range on a connector. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_connector_attach_active_color_range_property(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (!connector->active_color_range_property) { + prop = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE, "active color range", + drm_active_color_range_enum_list, + ARRAY_SIZE(drm_active_color_range_enum_list)); + if (!prop) + return -ENOMEM; + + connector->active_color_range_property = prop; + drm_object_attach_property(&connector->base, prop, DRM_MODE_COLOR_RANGE_UNSET); + } + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_active_color_range_property); + +/** + * drm_connector_set_active_color_range_property - sets the active color range property for a + * connector + * @connector: drm connector + * @active_color_range: color range for the connector currently active on "the cable" + * + * Should be used by atomic drivers to update the active color range over a connector. + */ +void drm_connector_set_active_color_range_property(struct drm_connector *connector, + enum drm_mode_color_range active_color_range) +{ + drm_object_property_set_value(&connector->base, connector->active_color_range_property, + active_color_range); +} +EXPORT_SYMBOL(drm_connector_set_active_color_range_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 8a5197f14e87..9fb7119b7a02 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -648,6 +648,24 @@ struct drm_tv_connector_state { unsigned int hue; }; +/** + * enum drm_mode_color_range - color_range info for &drm_connector + * + * This enum is used to represent full or limited color range on the display + * connector signal. + * + * @DRM_MODE_COLOR_RANGE_UNSET: Color range is unspecified/default. + * @DRM_MODE_COLOR_RANGE_FULL: Color range is full range, 0-255 for + * 8-Bit color depth. + * DRM_MODE_COLOR_RANGE_LIMITED_16_235: Color range is limited range, 16-235 for + * 8-Bit color depth. + */ +enum drm_mode_color_range { + DRM_MODE_COLOR_RANGE_UNSET, + DRM_MODE_COLOR_RANGE_FULL, + DRM_MODE_COLOR_RANGE_LIMITED_16_235, +}; + /** * struct drm_connector_state - mutable connector state */ @@ -1392,6 +1410,12 @@ struct drm_connector { */ struct drm_property *active_color_format_property; + /** + * @active_color_range_property: Default connector property for the + * active color range to be driven out of the connector. + */ + struct drm_property *active_color_range_property; + #define DRM_CONNECTOR_POLL_HPD (1 << 0) #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) @@ -1719,6 +1743,9 @@ void drm_connector_set_active_bpc_property(struct drm_connector *connector, int int drm_connector_attach_active_color_format_property(struct drm_connector *connector); void drm_connector_set_active_color_format_property(struct drm_connector *connector, u32 active_color_format); +int drm_connector_attach_active_color_range_property(struct drm_connector *connector); +void drm_connector_set_active_color_range_property(struct drm_connector *connector, + enum drm_mode_color_range active_color_range); /** * struct drm_tile_group - Tile group metadata -- 2.25.1