Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp464337lql; Mon, 11 Mar 2024 07:55:34 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWsZYUwpeJUGGif1GT3H2h4b+sv39iZtuLYudCv1/j5sUxhKiWcKWU/yWyvU5/R8Z2uuDJJkaE3ECKHV88pjxozBYqLcKmQ4oRJ8m4iFQ== X-Google-Smtp-Source: AGHT+IHPLxYKMi+x0JsaWRHWZAsp0ZueH901vkC5KonH2o46CGkKrVXahdHeEufUlapeFLZn0UuZ X-Received: by 2002:a17:906:6893:b0:a46:29b7:3f5e with SMTP id n19-20020a170906689300b00a4629b73f5emr1629865ejr.31.1710168933973; Mon, 11 Mar 2024 07:55:33 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710168933; cv=pass; d=google.com; s=arc-20160816; b=iPTl9iV2MVuTv6fBonjGtSdyf9uSbOEx5Vumnwn1AQel1D3o5Yb4LtTLzBrOL2cbLR JhyIOn67xn302gwHMnsVmwLtkdUiYoZLwbKE/IZHxFTgd3kIv94mGIMw/r8kjlFvzRVj kTF1e+64yliExPCBiyBmGhZ5B8VD29LQt42VFyv88B+o3STolWSKo6BjmAbCDDXjuAko dGoVXjJaYS/JH5KZtdmRltf6BFfrW3ipKj3+1hdXeQYbJ5Y6YyqhcQtE0V1OIia0v2gT yyBGZMXB4B4HkaeC84jGKqoVFfXiG9qvOWIABlGmOvvCFA9Q3WmYCSirqfgYvHlkiMc9 3L/w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=1RCeqPmiSaOELScLvBqWKEphRrfWsvKYmNLhVrQm8hI=; fh=8wcoxKk21hICD+6obVirG13fsSSMhKa/pufykSf87d0=; b=rK7F2rX1LU2idZohQAT74prJK7kz+PdkKBJdPfQksFawaKc/UplOSFlwLKKh7bp3Be CsBUcl2eCDGYkbT6Ssg2+HhFy/J/6H+erQjPw7zWXcZQlgRBllfoNg2SY799qhgosFxH eLf2RQ4XIH438NPLApbNxNWvGSgt7LxXVOsGqdYWUfxFv0QiqKLtPVLfuBkmAbq2n25l 6CQQsjv1iXNxEL9qTVlecK2mPrvndfyNw9oCSXEX8/nrg21DuswzXXNMiL6+lIQjOnhS u3nW0WaiZKUB8lorbh8pxlxOv42rP3mdYJgAR04JsHw2d0hzhF8tkgQZDt4a+kUVxe8j xaUQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HHLhhgL0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99016-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99016-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id j9-20020a170906830900b00a463a726c5bsi25332ejx.658.2024.03.11.07.55.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 07:55:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-99016-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HHLhhgL0; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99016-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99016-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8642C1F28406 for ; Mon, 11 Mar 2024 14:55:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9627656B86; Mon, 11 Mar 2024 14:50:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HHLhhgL0" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9900F56B66; Mon, 11 Mar 2024 14:50:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710168652; cv=none; b=dVSEtfii5KZzsF88i5utnHfuJ85twhNy7TZqKlPP3+EWXua4X4oCoEq0T4j3hlz38qvSZlGXP/iFtn9CYVsB/gpGnAKD+AMl3fFMyvLoqaPUDPlKKD0h6zQvrrqq+EuoLi1lVH4U5K8+yLpwho+Apn3KJLI754RBROV+d3K6MCQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710168652; c=relaxed/simple; bh=PB5uZMP81Svihtcjmn3oN1XmVQnFwiL8nPkDTykrcLI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qqgrG0GgWrwSCGZs+Yws+jutKwOe1OvyGhLMI3aLuex2MCQai3/mzthEsEaSqvZKoVE3xZLmvOM3ZEStGGI5tM+dIUmukvmBKT/lPsMcIu7lvhYUS+cVbebPUxd4e+M11pmWO/Su9yFW+pu6RH0zjTMyqC/XzvkHDuv3N8HKiSY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HHLhhgL0; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27697C43390; Mon, 11 Mar 2024 14:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710168652; bh=PB5uZMP81Svihtcjmn3oN1XmVQnFwiL8nPkDTykrcLI=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=HHLhhgL0z6zZ58+62ouYTmjVoG++B2jJO91V/QTUckdDVZKE2TTJOI0ix5eU+IcMy WlO5iQDfKEzjPrLxjzCirmoPJvpZyNZLQOgevwX1jY3xQT6NsIJaKB+rh3M9/BqNTi 2YaAN9jJI2yDBaLFM9DrTkBYLdAQjyzp7PJFov/rv0Q8gH2xxKVUBsenFWOifXYo/3 Dn1X/SgElh3m1AiZ1s+ux0+Pn5Jc07Bv0OoU1ZqzKv/1CPFVF43acATdA+tgdbVy8i bx4dhP9B0ZwtEJTGZFTql9b35XontsPz/WV9CPbpI9Ds5og5FRHLP8R78PitMKQtu3 Dox4sli7kYk8Q== From: Maxime Ripard Date: Mon, 11 Mar 2024 15:49:46 +0100 Subject: [PATCH v9 18/27] drm/connector: hdmi: Add RGB Quantization Range to the connector state 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: 7bit Message-Id: <20240311-kms-hdmi-connector-state-v9-18-d45890323344@kernel.org> References: <20240311-kms-hdmi-connector-state-v9-0-d45890323344@kernel.org> In-Reply-To: <20240311-kms-hdmi-connector-state-v9-0-d45890323344@kernel.org> To: Maarten Lankhorst , Thomas Zimmermann , David Airlie , Daniel Vetter , Jonathan Corbet , Sandy Huang , =?utf-8?q?Heiko_St=C3=BCbner?= , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: Hans Verkuil , Sebastian Wick , =?utf-8?q?Ville_Syrj=C3=A4l=C3=A4?= , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-sunxi@lists.linux.dev, Maxime Ripard , Dave Stevenson X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4014; i=mripard@kernel.org; h=from:subject:message-id; bh=PB5uZMP81Svihtcjmn3oN1XmVQnFwiL8nPkDTykrcLI=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDKnvpQSOr9k4Kyap8/PUucy/P5et4puWyvJxd6dl7xOt/ 4LpwqnhHaUsDGJcDLJiiiwxwuZL4k7Net3JxjcPZg4rE8gQBi5OAZiIWxIjQ4dIyLcV6u7sm8L4 Yj00TqhKteitDzAV/3o5qvLjhg+8QQz/nbjDdhUvVlT7xuHcvlZd+ObjDVa8Bx/PM9+/4PyV/Mp CTgA= X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D HDMI controller drivers will need to figure out the RGB range they need to configure based on a mode and property values. Let's expose that in the HDMI connector state so drivers can just use that value. Reviewed-by: Dave Stevenson Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 1 + drivers/gpu/drm/drm_atomic_state_helper.c | 29 +++++++++++++++++++++++++++++ include/drm/drm_connector.h | 6 ++++++ 3 files changed, 36 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 3e57d98d8418..ec6c6beda5c9 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1145,10 +1145,11 @@ static void drm_atomic_connector_print_state(struct drm_printer *p, if (connector->connector_type == DRM_MODE_CONNECTOR_HDMIA || connector->connector_type == DRM_MODE_CONNECTOR_HDMIB) { drm_printf(p, "\tbroadcast_rgb=%s\n", drm_hdmi_connector_get_broadcast_rgb_name(state->hdmi.broadcast_rgb)); + drm_printf(p, "\tis_full_range=%c\n", state->hdmi.is_full_range ? 'y' : 'n'); drm_printf(p, "\toutput_bpc=%u\n", state->hdmi.output_bpc); drm_printf(p, "\toutput_format=%s\n", drm_hdmi_connector_get_output_format_name(state->hdmi.output_format)); drm_printf(p, "\ttmds_char_rate=%llu\n", state->hdmi.tmds_char_rate); } diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index 0e8fb653965a..e66272c0d006 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -662,10 +662,37 @@ connector_state_get_mode(const struct drm_connector_state *conn_state) return NULL; return &crtc_state->mode; } +static bool hdmi_is_full_range(const struct drm_connector *connector, + const struct drm_connector_state *state) +{ + const struct drm_display_info *display = &connector->display_info; + const struct drm_display_mode *mode = + connector_state_get_mode(state); + + /* + * The Broadcast RGB property only applies to RGB format, and + * i915 just assumes limited range for YCbCr output, so let's + * just do the same. + */ + if (state->hdmi.output_format != HDMI_COLORSPACE_RGB) + return false; + + if (state->hdmi.broadcast_rgb == DRM_HDMI_BROADCAST_RGB_FULL) + return true; + + if (state->hdmi.broadcast_rgb == DRM_HDMI_BROADCAST_RGB_LIMITED) + return false; + + if (!display->is_hdmi) + return true; + + return drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_FULL ? true : false; +} + static bool sink_supports_format_bpc(const struct drm_connector *connector, const struct drm_display_info *info, const struct drm_display_mode *mode, unsigned int format, unsigned int bpc) @@ -908,10 +935,12 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, drm_atomic_get_new_connector_state(state, connector); const struct drm_display_mode *mode = connector_state_get_mode(new_state); int ret; + new_state->hdmi.is_full_range = hdmi_is_full_range(connector, new_state); + ret = hdmi_compute_config(connector, new_state, mode); if (ret) return ret; if (old_state->hdmi.broadcast_rgb != new_state->hdmi.broadcast_rgb || diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index bb6b6a36ade3..3eaf4d54364d 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1068,10 +1068,16 @@ struct drm_connector_state { * @broadcast_rgb: Connector property to pass the * Broadcast RGB selection value. */ enum drm_hdmi_broadcast_rgb broadcast_rgb; + /** + * @is_full_range: Is the output supposed to use a full + * RGB Quantization Range or not? + */ + bool is_full_range; + /** * @output_bpc: Bits per color channel to output. */ unsigned int output_bpc; -- 2.43.2