From: Maxime Ripard <mripard@kernel.org>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Emma Anholt" <emma@anholt.net>,
"Jonathan Corbet" <corbet@lwn.net>,
"Sandy Huang" <hjc@rock-chips.com>,
"Heiko Stübner" <heiko@sntech.de>, "Chen-Yu Tsai" <wens@csie.org>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"Samuel Holland" <samuel@sholland.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>,
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 <mripard@kernel.org>
Subject: [PATCH v5 07/44] drm/connector: hdmi: Create an HDMI sub-state
Date: Thu, 07 Dec 2023 16:49:30 +0100 [thread overview]
Message-ID: <20231207-kms-hdmi-connector-state-v5-7-6538e19d634d@kernel.org> (raw)
In-Reply-To: <20231207-kms-hdmi-connector-state-v5-0-6538e19d634d@kernel.org>
The next features we will need to share across drivers will need to
store some parameters for drivers to use, such as the selected output
format.
Let's create a new connector sub-state dedicated to HDMI controllers,
that will eventually store everything we need.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/drm_atomic_state_helper.c | 35 +++++++++++++++++++++++++++++++
include/drm/drm_atomic_state_helper.h | 4 ++++
include/drm/drm_connector.h | 7 +++++++
3 files changed, 46 insertions(+)
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c
index 54975de44a0e..e69c0cc1c6da 100644
--- a/drivers/gpu/drm/drm_atomic_state_helper.c
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c
@@ -570,6 +570,22 @@ void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)
}
EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);
+/**
+ * __drm_atomic_helper_connector_hdmi_reset() - Initializes all HDMI @drm_connector_state resources
+ * @connector: DRM connector
+ * @new_state: connector state to reset
+ *
+ * Initializes all HDMI resources from a @drm_connector_state without
+ * actually allocating it. This is useful for HDMI drivers, in
+ * combination with __drm_atomic_helper_connector_reset() or
+ * drm_atomic_helper_connector_reset().
+ */
+void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector,
+ struct drm_connector_state *new_state)
+{
+}
+EXPORT_SYMBOL(__drm_atomic_helper_connector_hdmi_reset);
+
/**
* drm_atomic_helper_connector_tv_check - Validate an analog TV connector state
* @connector: DRM Connector
@@ -619,6 +635,25 @@ int drm_atomic_helper_connector_tv_check(struct drm_connector *connector,
}
EXPORT_SYMBOL(drm_atomic_helper_connector_tv_check);
+/**
+ * drm_atomic_helper_connector_hdmi_check() - Helper to check HDMI connector atomic state
+ * @connector: DRM Connector
+ * @state: the DRM State object
+ *
+ * Provides a default connector state check handler for HDMI connectors.
+ * Checks that a desired connector update is valid, and updates various
+ * fields of derived state.
+ *
+ * RETURNS:
+ * Zero on success, or an errno code otherwise.
+ */
+int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector,
+ struct drm_atomic_state *state)
+{
+ return 0;
+}
+EXPORT_SYMBOL(drm_atomic_helper_connector_hdmi_check);
+
/**
* __drm_atomic_helper_connector_duplicate_state - copy atomic connector state
* @connector: connector object
diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h
index b9740edb2658..d59d2b3aef9a 100644
--- a/include/drm/drm_atomic_state_helper.h
+++ b/include/drm/drm_atomic_state_helper.h
@@ -71,7 +71,11 @@ void __drm_atomic_helper_connector_state_reset(struct drm_connector_state *conn_
void __drm_atomic_helper_connector_reset(struct drm_connector *connector,
struct drm_connector_state *conn_state);
void drm_atomic_helper_connector_reset(struct drm_connector *connector);
+void __drm_atomic_helper_connector_hdmi_reset(struct drm_connector *connector,
+ struct drm_connector_state *new_state);
void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector);
+int drm_atomic_helper_connector_hdmi_check(struct drm_connector *connector,
+ struct drm_atomic_state *state);
int drm_atomic_helper_connector_tv_check(struct drm_connector *connector,
struct drm_atomic_state *state);
void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connector);
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
index 4491c4c2fb6e..000a2a156619 100644
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
@@ -1031,6 +1031,13 @@ struct drm_connector_state {
* DRM blob property for HDR output metadata
*/
struct drm_property_blob *hdr_output_metadata;
+
+ /**
+ * @hdmi: HDMI-related variable and properties. Filled by
+ * @drm_atomic_helper_connector_hdmi_check().
+ */
+ struct {
+ } hdmi;
};
/**
--
2.43.0
next prev parent reply other threads:[~2023-12-07 15:49 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-07 15:49 [PATCH v5 00/44] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 01/44] drm/tests: helpers: Include missing drm_drv header Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 02/44] drm/tests: helpers: Add atomic helpers Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 03/44] drm/tests: Add helper to create mock plane Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 04/44] drm/tests: Add helper to create mock crtc Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 05/44] drm/tests: connector: Add tests for drmm_connector_init Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 06/44] drm/connector: Introduce an HDMI connector initialization function Maxime Ripard
2023-12-14 14:39 ` Dave Stevenson
2023-12-07 15:49 ` Maxime Ripard [this message]
2023-12-14 14:40 ` [PATCH v5 07/44] drm/connector: hdmi: Create an HDMI sub-state Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 08/44] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2023-12-14 14:43 ` Dave Stevenson
2024-01-12 13:59 ` Maxime Ripard
2024-01-12 15:59 ` Dave Stevenson
2024-01-15 14:33 ` Sebastian Wick
2024-01-15 14:37 ` Sebastian Wick
2024-01-15 15:30 ` Maxime Ripard
2024-02-02 13:01 ` Maxime Ripard
2024-02-02 15:40 ` Ville Syrjälä
2024-02-02 15:59 ` Maxime Ripard
2024-02-02 16:37 ` Ville Syrjälä
2024-02-05 9:39 ` Maxime Ripard
2024-02-09 20:34 ` Sebastian Wick
2024-02-12 10:01 ` Maxime Ripard
2024-02-12 15:49 ` Ville Syrjälä
2024-02-12 16:39 ` Hans Verkuil
2024-02-12 17:00 ` Maxime Ripard
2024-02-12 16:53 ` Re: Re: Re: " Maxime Ripard
2024-02-12 17:06 ` Sebastian Wick
2024-02-15 11:00 ` Maxime Ripard
2024-02-19 14:01 ` Sebastian Wick
2024-02-22 10:54 ` Maxime Ripard
2024-02-22 12:58 ` Ville Syrjälä
2024-02-22 13:12 ` Sebastian Wick
2024-02-22 13:20 ` Maxime Ripard
2024-02-13 8:38 ` Re: Re: Re: Re: " Ville Syrjälä
2024-02-15 10:53 ` Maxime Ripard
2024-02-15 15:09 ` Ville Syrjälä
2024-01-15 15:25 ` Maxime Ripard
2024-01-18 21:21 ` Sebastian Wick
2024-02-02 11:04 ` Jani Nikula
2024-02-02 11:20 ` Hans Verkuil
2024-02-02 16:35 ` Ville Syrjälä
2024-02-02 15:49 ` Maxime Ripard
2024-02-09 20:30 ` Sebastian Wick
2024-02-12 9:55 ` Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 09/44] drm/connector: hdmi: Add RGB Quantization Range to the connector state Maxime Ripard
2023-12-14 14:46 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 10/44] drm/connector: hdmi: Add output BPC " Maxime Ripard
2023-12-14 14:48 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 11/44] drm/connector: hdmi: Add support for output format Maxime Ripard
2023-12-14 14:52 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 12/44] drm/connector: hdmi: Add HDMI compute clock helper Maxime Ripard
2023-12-14 15:02 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 13/44] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2023-12-14 15:04 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 14/44] drm/connector: hdmi: Add custom hook to filter " Maxime Ripard
2023-12-14 15:06 ` Dave Stevenson
2023-12-07 15:49 ` [PATCH v5 15/44] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2023-12-14 15:10 ` Dave Stevenson
2024-02-01 12:51 ` Maxime Ripard
2024-02-01 15:33 ` Dave Stevenson
2024-02-01 16:50 ` Maxime Ripard
2024-02-02 13:58 ` Jani Nikula
2023-12-07 15:49 ` [PATCH v5 16/44] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 17/44] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 18/44] drm/vc4: hdmi: Create destroy state implementation Maxime Ripard
2023-12-12 11:40 ` Dave Stevenson
2023-12-14 8:48 ` Maxime Ripard
2023-12-13 15:22 ` (subset) " Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 19/44] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 20/44] drm/vc4: tests: Remove vc4_dummy_plane structure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 21/44] drm/vc4: tests: Convert to plane creation helper Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 22/44] drm/rockchip: inno_hdmi: Remove useless mode_fixup Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 23/44] drm/rockchip: inno_hdmi: Remove useless copy of drm_display_mode Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 24/44] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 25/44] drm/rockchip: inno_hdmi: Get rid of mode_set Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 26/44] drm/rockchip: inno_hdmi: no need to store vic Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 27/44] drm/rockchip: inno_hdmi: Remove unneeded has audio flag Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 28/44] drm/rockchip: inno_hdmi: Remove useless input format Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 29/44] drm/rockchip: inno_hdmi: Remove useless output format Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 30/44] drm/rockchip: inno_hdmi: Remove useless colorimetry Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 31/44] drm/rockchip: inno_hdmi: Remove useless enum Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 32/44] drm/rockchip: inno_hdmi: Remove tmds rate from structure Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 33/44] drm/rockchip: inno_hdmi: Remove useless coeff_csc matrix Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 34/44] drm/rockchip: inno_hdmi: Remove useless mode_valid Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 35/44] drm/rockchip: inno_hdmi: Drop HDMI Vendor Infoframe support Maxime Ripard
2023-12-07 15:49 ` [PATCH v5 36/44] drm/rockchip: inno_hdmi: Move infoframe disable to separate function Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 37/44] drm/rockchip: inno_hdmi: Switch to infoframe type Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 38/44] drm/rockchip: inno_hdmi: Remove unused drm device pointer Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 39/44] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 40/44] drm/sun4i: hdmi: Convert encoder to atomic Maxime Ripard
2023-12-21 14:33 ` [v5,40/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 41/44] drm/sun4i: hdmi: Move mode_set into enable Maxime Ripard
2023-12-21 14:43 ` [v5,41/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 42/44] drm/sun4i: hdmi: Switch to container_of_const Maxime Ripard
2023-12-07 15:50 ` [PATCH v5 43/44] drm/sun4i: hdmi: Consolidate atomic_check and mode_valid Maxime Ripard
2023-12-21 14:53 ` [v5,43/44] " Sui Jingfeng
2023-12-07 15:50 ` [PATCH v5 44/44] drm/sun4i: hdmi: Switch to HDMI connector Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231207-kms-hdmi-connector-state-v5-7-6538e19d634d@kernel.org \
--to=mripard@kernel.org \
--cc=airlied@gmail.com \
--cc=corbet@lwn.net \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=hverkuil@xs4all.nl \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=maarten.lankhorst@linux.intel.com \
--cc=samuel@sholland.org \
--cc=tzimmermann@suse.de \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).