Received: by 2002:ab2:710b:0:b0:1ef:a325:1205 with SMTP id z11csp463548lql; Mon, 11 Mar 2024 07:54:08 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUy34sRNEpzvSbguX57652OU2Olbpwud6tgFikh2te5B/YvRI+vahST/naB07FL9Pu46DwD7DemDO7qD60F34EA+IHpBLtWMKPZDg54Ig== X-Google-Smtp-Source: AGHT+IE2uC+9eOlBiXbxT6xXBB5LzflQ9AUDDpmTgpUmXBwXNaS7RneSfg9W4lUIanhiRBJ6Fnrc X-Received: by 2002:a05:6808:f8b:b0:3c2:5192:fb22 with SMTP id o11-20020a0568080f8b00b003c25192fb22mr1327699oiw.38.1710168848086; Mon, 11 Mar 2024 07:54:08 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710168848; cv=pass; d=google.com; s=arc-20160816; b=C7UycsJegqgqiClxhHmBOWZIyyYM+ywJuibV+OWoxUMeOKny2FWAEfDaV5JmPu60yW cK7tEKotQFGGvx/8yqZ1E/IFQiCRRy9lX+iOitvjMG9P6gmUD89hEUSXOC4ALqqn8nps fvkUWhCACBXg5V9m/uanPJVKcC6WnFOLDtZYjahsY5dbdDcTwocMDxbTwehfLpiC7HYG 7ACuXo/a+qlox7OGnREhJft6o1VCik3hS7uXQeYDO9UISZE9HsQH9///fy1cmWIOd1am GUlfYjsA452orIA/4BNLpFdjIVyFzRIPHyW189LmGtYOSNtTwKLYXGtlKhnMmCXd8JG7 14uQ== 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=UFgTcnb6vxrHKgxpE406wv+Mk3rTf9K/3zTsObdK1o4=; fh=8wcoxKk21hICD+6obVirG13fsSSMhKa/pufykSf87d0=; b=V/zEqwz9ctHDKaj7rtFtbByjvUUocU6098wEY9S33gk/s6toNQdJO3OmtzpfKZv/yo CFKhqyUUQURAQ2sZXe/lgG+8/NEbn58OEOzKGiC0T7SUK/RFr8pTHFgW8RrS6x9HUOg5 BltB2io+avC+4jqRbOSfQvoi0hWveNDHAUC/x4kPE/wvSRymStIYPtIOBO/jBSxPH9Q7 kUIgXzUcM5Yw8fifvUFStlu77PkXC+AdXhPBy6DhL5vNvNnGY87yZECQeuo8hU8lmLtJ 3QhRI2MsnTkvwJ/uxgplqBQgYP0ztBfhsi+kuJ0LvfJnNh2pyZdA/T02ukLnZWRz40bS n+Nw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qMqTI5m6; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99007-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99007-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id z3-20020a63e103000000b005cfbdff9195si5287863pgh.783.2024.03.11.07.54.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Mar 2024 07:54:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-99007-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qMqTI5m6; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-99007-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-99007-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id E4D942882B6 for ; Mon, 11 Mar 2024 14:53:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 868A342075; Mon, 11 Mar 2024 14:50:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qMqTI5m6" 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 732634F8B2; Mon, 11 Mar 2024 14:50:30 +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=1710168630; cv=none; b=G+lnQnoAI3UBXohppxgE/LKsdszTRw3LXa+mdlY8/Xo4yZBeOJRND0QyHpzn64LOFhHCbwJ+2oWuj6mTpMy40QjbVxmdecN+TETwWIGkMV5H1FlLmZEiBBkRipGMkMGr/zfMrCJuPNr7SDw7WpyFGVvCnOlIVpY0jSH6476s6CQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710168630; c=relaxed/simple; bh=m0lVuFZx7PIWgVWuOqTSo7KUYnJKghF2lT9iIlcwgRM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kcPfgXT59NHCxzUZa1NWhGY0MeDDnk3I5jy6ajY6BTJEYiCRviQ/IxQktFX4nF2ltWYyX6IY5KVhmPSuKOBJ8WRe79wOtscGQM8v+wQtEmDuqs0Gju14EqnlIM9qggCSpa1FPSosDdyGqgYJSuXZFtdXBXlS/83O0VZvyZkDp8o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qMqTI5m6; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B19F8C433C7; Mon, 11 Mar 2024 14:50:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710168630; bh=m0lVuFZx7PIWgVWuOqTSo7KUYnJKghF2lT9iIlcwgRM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=qMqTI5m6eXvGiRD1jQVtt8nRvoZk7PkDDXjZUG4X6gP7yOb3PKaLW9YbOdXVbjfSn VE4mjMCV1kvshaXljIllToNRmwvYPo+skIKMmtmYifTaBpmD/ykk3aUgjhIA0KYHaN 7LC9/TUgn728hX1/HQIsYqsyIhnF2x6cib0U1OdEjR6glqgvmHNGGKvoEIFnbB5Ezq sbzxHF2hR8ZgWHFbexdpl2cAMe3Oe0l65lroxqVTSLmOwaGSNAMEa0Y0027P5FuNzn SYAbJZWkiKTTw1TwOtbeZFqAny+ueAm2wqfmnV7t7danx3hX7EiGoxvCHJ1GEp5Sa5 v1g202yCHtpUg== From: Maxime Ripard Date: Mon, 11 Mar 2024 15:49:38 +0100 Subject: [PATCH v9 10/27] drm/connector: hdmi: Calculate TMDS character rate 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-10-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=5859; i=mripard@kernel.org; h=from:subject:message-id; bh=m0lVuFZx7PIWgVWuOqTSo7KUYnJKghF2lT9iIlcwgRM=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDKnvpbi+VZ/RNmeQEa3tKG0yTpx7ve2o1fdr+/Zte92Q4 i7wyGxeRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACZydBcjw0x2q81vYl7r/Ofy mrF39fLsxNWJs4OmZ0kuFTF3nLHsaSTDP8sbbm2K8ieniWrvLdqS39fx7aH6hetWd27HZEx9K1S 2nBkA X-Developer-Key: i=mripard@kernel.org; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Most HDMI drivers have some code to calculate the TMDS character rate, usually to adjust an internal clock to match what the mode requires. Since the TMDS character rates mostly depends on the resolution, whether we need to repeat pixels or not, the bpc count and the format, we can now derive it from the HDMI connector state that stores all those infos and remove the duplication from drivers. Reviewed-by: Dave Stevenson Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_atomic.c | 1 + drivers/gpu/drm/drm_atomic_state_helper.c | 66 ++++++++++++++++++++++ .../gpu/drm/tests/drm_atomic_state_helper_test.c | 3 + include/drm/drm_connector.h | 5 ++ 4 files changed, 75 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 8730137baa86..26f9e525c0a0 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -1146,10 +1146,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, "\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); } if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) if (state->writeback_job && state->writeback_job->fb) drm_printf(p, "\tfb=%d\n", state->writeback_job->fb->base.id); diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index ae99765c45de..63a96c691460 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -638,10 +638,67 @@ int drm_atomic_helper_connector_tv_check(struct drm_connector *connector, return 0; } EXPORT_SYMBOL(drm_atomic_helper_connector_tv_check); +static const struct drm_display_mode * +connector_state_get_mode(const struct drm_connector_state *conn_state) +{ + struct drm_atomic_state *state; + struct drm_crtc_state *crtc_state; + struct drm_crtc *crtc; + + state = conn_state->state; + if (!state) + return NULL; + + crtc = conn_state->crtc; + if (!crtc) + return NULL; + + crtc_state = drm_atomic_get_new_crtc_state(state, crtc); + if (!crtc_state) + return NULL; + + return &crtc_state->mode; +} + +static enum drm_mode_status +hdmi_clock_valid(const struct drm_connector *connector, + const struct drm_display_mode *mode, + unsigned long long clock) +{ + const struct drm_display_info *info = &connector->display_info; + + if (info->max_tmds_clock && clock > info->max_tmds_clock * 1000) + return MODE_CLOCK_HIGH; + + return MODE_OK; +} + +static int +hdmi_compute_clock(const struct drm_connector *connector, + struct drm_connector_state *state, + const struct drm_display_mode *mode, + unsigned int bpc, enum hdmi_colorspace fmt) +{ + enum drm_mode_status status; + unsigned long long clock; + + clock = drm_connector_hdmi_compute_mode_clock(mode, bpc, fmt); + if (!clock) + return -EINVAL; + + status = hdmi_clock_valid(connector, mode, clock); + if (status != MODE_OK) + return -EINVAL; + + state->hdmi.tmds_char_rate = clock; + + return 0; +} + /** * drm_atomic_helper_connector_hdmi_check() - Helper to check HDMI connector atomic state * @connector: DRM Connector * @state: the DRM State object * @@ -657,10 +714,19 @@ int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector, { struct drm_connector_state *old_state = drm_atomic_get_old_connector_state(state, connector); struct drm_connector_state *new_state = drm_atomic_get_new_connector_state(state, connector); + const struct drm_display_mode *mode = + connector_state_get_mode(new_state); + int ret; + + ret = hdmi_compute_clock(connector, new_state, mode, + new_state->hdmi.output_bpc, + new_state->hdmi.output_format); + if (ret) + return ret; if (old_state->hdmi.output_bpc != new_state->hdmi.output_bpc || old_state->hdmi.output_format != new_state->hdmi.output_format) { struct drm_crtc *crtc = new_state->crtc; struct drm_crtc_state *crtc_state; diff --git a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c index 1c3dd8a98fb0..f2acbd4c216c 100644 --- a/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c +++ b/drivers/gpu/drm/tests/drm_atomic_state_helper_test.c @@ -68,10 +68,13 @@ static int light_up_connector(struct kunit *test, KUNIT_ASSERT_NOT_ERR_OR_NULL(test, state); conn_state = drm_atomic_get_connector_state(state, connector); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, conn_state); + conn_state->hdmi.output_bpc = connector->max_bpc; + conn_state->hdmi.output_format = HDMI_COLORSPACE_RGB; + ret = drm_atomic_set_crtc_for_connector(conn_state, crtc); KUNIT_EXPECT_EQ(test, ret, 0); crtc_state = drm_atomic_get_crtc_state(state, crtc); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, crtc_state); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index a859ad7ee04b..e3917ea93986 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1048,10 +1048,15 @@ struct drm_connector_state { /** * @output_format: Pixel format to output in. */ enum hdmi_colorspace output_format; + + /** + * @tmds_char_rate: TMDS Character Rate, in Hz. + */ + unsigned long long tmds_char_rate; } hdmi; }; /** * struct drm_connector_funcs - control connectors on a given device -- 2.43.2