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 RFC v2 18/37] drm/rockchip: inno_hdmi: Get rid of mode_set
Date: Wed, 20 Sep 2023 16:35:33 +0200 [thread overview]
Message-ID: <20230920-kms-hdmi-connector-state-v2-18-17932daddd7d@kernel.org> (raw)
In-Reply-To: <20230920-kms-hdmi-connector-state-v2-0-17932daddd7d@kernel.org>
We're not doing anything special in atomic_mode_set so we can simply
merge it into atomic_enable.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
---
drivers/gpu/drm/rockchip/inno_hdmi.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c
index cc86d273ca4a..4db18195246e 100644
--- a/drivers/gpu/drm/rockchip/inno_hdmi.c
+++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -490,21 +490,22 @@ static int inno_hdmi_setup(struct inno_hdmi *hdmi,
return 0;
}
-static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder,
- struct drm_crtc_state *crtc_state,
- struct drm_connector_state *conn_state)
-{
- struct drm_display_mode *adj_mode = &crtc_state->adjusted_mode;
- struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
-
- inno_hdmi_setup(hdmi, adj_mode);
-}
-
static void inno_hdmi_encoder_enable(struct drm_encoder *encoder,
struct drm_atomic_state *state)
{
struct inno_hdmi *hdmi = encoder_to_inno_hdmi(encoder);
+ struct drm_connector_state *conn_state;
+ struct drm_crtc_state *crtc_state;
+ conn_state = drm_atomic_get_new_connector_state(state, &hdmi->connector);
+ if (WARN_ON(!conn_state))
+ return;
+
+ crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
+ if (WARN_ON(!crtc_state))
+ return;
+
+ inno_hdmi_setup(hdmi, &crtc_state->adjusted_mode);
inno_hdmi_set_pwr_mode(hdmi, NORMAL);
}
@@ -533,7 +534,6 @@ static struct drm_encoder_helper_funcs inno_hdmi_encoder_helper_funcs = {
.atomic_check = inno_hdmi_encoder_atomic_check,
.atomic_enable = inno_hdmi_encoder_enable,
.atomic_disable = inno_hdmi_encoder_disable,
- .atomic_mode_set = inno_hdmi_encoder_mode_set,
};
static enum drm_connector_status
--
2.41.0
next prev parent reply other threads:[~2023-09-20 14:37 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 14:35 [PATCH RFC v2 00/37] drm/connector: Create HDMI Connector infrastructure Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 01/37] drm/connector: Introduce an HDMI connector Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 02/37] drm/connector: hdmi: Create a custom state Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 03/37] drm/connector: hdmi: Add Broadcast RGB property Maxime Ripard
2023-09-21 8:39 ` Pekka Paalanen
2023-09-20 14:35 ` [PATCH RFC v2 04/37] drm/connector: hdmi: Add helper to get the RGB range Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 05/37] drm/connector: hdmi: Add output BPC to the connector state Maxime Ripard
2023-09-21 8:48 ` Pekka Paalanen
2023-09-21 8:56 ` Jani Nikula
2023-09-20 14:35 ` [PATCH RFC v2 06/37] drm/connector: hdmi: Add support for output format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 07/37] drm/connector: hdmi: Add HDMI compute clock helper Maxime Ripard
2023-09-20 17:15 ` Jernej Škrabec
2023-09-20 14:35 ` [PATCH RFC v2 08/37] drm/connector: hdmi: Calculate TMDS character rate Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 09/37] drm/connector: hdmi: Add custom hook to filter " Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 10/37] drm/connector: hdmi: Compute bpc and format automatically Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 11/37] drm/connector: hdmi: Add Infoframes generation Maxime Ripard
2023-09-20 17:11 ` Jernej Škrabec
2023-09-20 14:35 ` [PATCH RFC v2 12/37] drm/connector: hdmi: Create Infoframe DebugFS entries Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 13/37] drm/vc4: hdmi: Create destroy state implementation Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 14/37] drm/vc4: hdmi: Switch to HDMI connector Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 15/37] drm/rockchip: inno_hdmi: Remove useless mode_fixup Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 16/37] drm/rockchip: inno_hdmi: Remove useless copy of drm_display_mode Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 17/37] drm/rockchip: inno_hdmi: Switch encoder hooks to atomic Maxime Ripard
2023-09-20 14:35 ` Maxime Ripard [this message]
2023-09-20 14:35 ` [PATCH RFC v2 19/37] drm/rockchip: inno_hdmi: no need to store vic Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 20/37] drm/rockchip: inno_hdmi: Remove unneeded has audio flag Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 21/37] drm/rockchip: inno_hdmi: Remove useless input format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 22/37] drm/rockchip: inno_hdmi: Remove useless output format Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 23/37] drm/rockchip: inno_hdmi: Remove useless colorimetry Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 24/37] drm/rockchip: inno_hdmi: Remove useless enum Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 25/37] drm/rockchip: inno_hdmi: Remove tmds rate from structure Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 26/37] drm/rockchip: inno_hdmi: Remove useless coeff_csc matrix Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 27/37] drm/rockchip: inno_hdmi: Remove useless mode_valid Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 28/37] drm/rockchip: inno_hdmi: Move infoframe disable to separate function Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 29/37] drm/rockchip: inno_hdmi: Create mask retrieval functions Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 30/37] drm/rockchip: inno_hdmi: Switch to infoframe type Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 31/37] drm/rockchip: inno_hdmi: Remove unused drm device pointer Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 32/37] drm/rockchip: inno_hdmi: Switch to HDMI connector Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 33/37] drm/sun4i: hdmi: Convert encoder to atomic Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 34/37] drm/sun4i: hdmi: Move mode_set into enable Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 35/37] drm/sun4i: hdmi: Switch to container_of_const Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 36/37] drm/sun4i: hdmi: Consolidate atomic_check and mode_valid Maxime Ripard
2023-09-20 14:35 ` [PATCH RFC v2 37/37] drm/sun4i: hdmi: Switch to HDMI connector Maxime Ripard
2023-09-21 16:29 ` [PATCH RFC v2 00/37] drm/connector: Create HDMI Connector infrastructure Hans Verkuil
2023-09-21 16:48 ` 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=20230920-kms-hdmi-connector-state-v2-18-17932daddd7d@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
all inboxes | Powered by JetHome®