Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp3724414pxj; Tue, 15 Jun 2021 07:21:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwF2DMDLODMgHn7GyoxxNIZUwM4BrVsPl1oMZXztcFaP5XzHdfbdGPcVGX93DCMRLHon2b/ X-Received: by 2002:a6b:c985:: with SMTP id z127mr367549iof.33.1623766905646; Tue, 15 Jun 2021 07:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623766905; cv=none; d=google.com; s=arc-20160816; b=cCVxrmV3/QmYjpxzoG1kGs5UTowgMm60aODZyQYvuvqPLqpnnQe4eCb/sF5rH7+/Id LesIuvtJdU/KUdyX/lUc7NGn6DFS9mzeNfXHu+lzXFudM2VmmV3v8rKaOXacn7TZZ1VK nS5Oa65HQjFvvkw7dV3k7NCV/kIxw56iGDFka6iCG/zboiTVSLGTajREcY5QTrGh+SXm UYdleS8RzMiZ4RrChWDfuRF9e6pUqCBF2ss4IIycD15lSY9z+BtyC60xvcNW9QJ30+2E 0h3riUdQ+uiueMHaaBKYZCW7ckhpX7avokgsECCrnNcftxtiPwsN7HXocwCoxHm5fuVL 0WyQ== 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=veb2CXxkdwWg0w8sSA980Oqs8Iudp4lPHz9gyCWypBs=; b=fMc7qcJBlenMusSTuhN8wvtXS51wJXfvP5ay7OrSuagnLUAkgOn+3IxLp6VNY45bNY O9/O5Sx1TJj4r13ycr2rmOHiygUigdOeq19DtePXAuJNMw/nMAEMLKzdy73pO41oGCOz 2IpxkXnwmBLGrO19pS1rxOA0bk/jRR6DtOA7kwNa7a7R28zJwKjEe2X2B0NC1zJEHdaP +FQOhd4BagfExuw/QRN2mtJzLSelY7VAifdJrARv06hVu8Wf9FguIZtHcGEIAyZ3jdgN Jfe/Nh1lPEH0ib1DcmECShXwdk7HPSCsMa6ARV/JppK7vwCjOHdRzj20csU0QcAKbNjb diVw== 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 x15si19045158ilu.105.2021.06.15.07.21.32; Tue, 15 Jun 2021 07:21:45 -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 S231363AbhFOOWy (ORCPT + 99 others); Tue, 15 Jun 2021 10:22:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231716AbhFOOUu (ORCPT ); Tue, 15 Jun 2021 10:20:50 -0400 Received: from srv6.fidu.org (srv6.fidu.org [IPv6:2a01:4f8:231:de0::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C104CC0611C0 for ; Tue, 15 Jun 2021 07:14:46 -0700 (PDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by srv6.fidu.org (Postfix) with ESMTP id 719ACC800B2; Tue, 15 Jun 2021 16:14:37 +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 a2AqiG0pZna1; Tue, 15 Jun 2021 16:14:37 +0200 (CEST) Received: from wsembach-tuxedo.fritz.box (p200300e37F3949009F7CF2Abd5Da2787.dip0.t-ipconnect.de [IPv6:2003:e3:7f39:4900:9f7c:f2ab:d5da:2787]) (Authenticated sender: wse@tuxedocomputers.com) by srv6.fidu.org (Postfix) with ESMTPA id 07F97C80095; Tue, 15 Jun 2021 16:14:37 +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 v3 06/14] drm/uAPI: Add "active color format" drm property as feedback for userspace Date: Tue, 15 Jun 2021 16:14:17 +0200 Message-Id: <20210615141426.6001-7-wse@tuxedocomputers.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615141426.6001-1-wse@tuxedocomputers.com> References: <20210615141426.6001-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 format" which can be used by graphic drivers to report the used color format back to userspace. There was no way to check which color format got actually used on a given monitor. To surely predict this, one must know the exact capabilities of the monitor, the GPU, and the connection used and what the default behaviour of the used driver is (e.g. amdgpu prefers YCbCr 4:4:4 while i915 prefers RGB). This property helps eliminating the guessing on 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 | 56 +++++++++++++++++++++++++++++++++ include/drm/drm_connector.h | 8 +++++ 2 files changed, 64 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 02c310c1ac2d..2411b964c342 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -889,6 +889,14 @@ static const struct drm_prop_enum_list drm_dp_subconnector_enum_list[] = { { DRM_MODE_SUBCONNECTOR_Native, "Native" }, /* DP */ }; +static const struct drm_prop_enum_list drm_active_color_format_enum_list[] = { + { 0, "unknown" }, + { DRM_COLOR_FORMAT_RGB444, "rgb" }, + { DRM_COLOR_FORMAT_YCRCB444, "ycbcr444" }, + { DRM_COLOR_FORMAT_YCRCB422, "ycbcr422" }, + { DRM_COLOR_FORMAT_YCRCB420, "ycbcr420" }, +}; + DRM_ENUM_NAME_FN(drm_get_dp_subconnector_name, drm_dp_subconnector_enum_list) @@ -1205,6 +1213,14 @@ static const struct drm_prop_enum_list dp_colorspaces[] = { * Drivers shall use drm_connector_attach_active_bpc_property() to install * this property. * + * active color format: + * This read-only property tells userspace the color format actually used + * by the hardware display engine on "the cable" on a connector. The chosen + * value depends on hardware capabilities, both display engine and + * connected monitor. Drivers shall use + * drm_connector_attach_active_color_format_property() to install this + * property. + * * Connectors also have one standardized atomic property: * * CRTC_ID: @@ -2202,6 +2218,46 @@ void drm_connector_set_active_bpc_property(struct drm_connector *connector, int } EXPORT_SYMBOL(drm_connector_set_active_bpc_property); +/** + * drm_connector_attach_active_color_format_property - attach "active color format" property + * @connector: connector to attach active color format property on. + * + * This is used to check the applied color format on a connector. + * + * Returns: + * Zero on success, negative errno on failure. + */ +int drm_connector_attach_active_color_format_property(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_property *prop; + + if (!connector->active_color_format_property) { + prop = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE, "active color format", drm_active_color_format_enum_list, ARRAY_SIZE(drm_active_color_format_enum_list)); + if (!prop) + return -ENOMEM; + + connector->active_color_format_property = prop; + drm_object_attach_property(&connector->base, prop, 0); + } + + return 0; +} +EXPORT_SYMBOL(drm_connector_attach_active_color_format_property); + +/** + * drm_connector_set_active_color_format_property - sets the active color format property for a connector + * @connector: drm connector + * @active_color_format: color format for the connector currently active on "the cable" + * + * Should be used by atomic drivers to update the active color format over a connector. + */ +void drm_connector_set_active_color_format_property(struct drm_connector *connector, u32 active_color_format) +{ + drm_object_property_set_value(&connector->base, connector->active_color_format_property, active_color_format); +} +EXPORT_SYMBOL(drm_connector_set_active_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 eee86de62a5f..99e4989dd6b3 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1386,6 +1386,12 @@ struct drm_connector { */ struct drm_property *active_bpc_property; + /** + * @active_color_format_property: Default connector property for the + * active color format to be driven out of the connector. + */ + struct drm_property *active_color_format_property; + #define DRM_CONNECTOR_POLL_HPD (1 << 0) #define DRM_CONNECTOR_POLL_CONNECT (1 << 1) #define DRM_CONNECTOR_POLL_DISCONNECT (1 << 2) @@ -1710,6 +1716,8 @@ int drm_connector_attach_max_bpc_property(struct drm_connector *connector, int min, int max); int drm_connector_attach_active_bpc_property(struct drm_connector *connector, int min, int max); void drm_connector_set_active_bpc_property(struct drm_connector *connector, int active_bpc); +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); /** * struct drm_tile_group - Tile group metadata -- 2.25.1