Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Feedback-ID: i8771445c:Fastmail
From:   Maxime Ripard <maxime@cerno.tech>
To:     Maxime Ripard <mripard@kernel.org>,
        Ben Skeggs <bskeggs@redhat.com>,
        David Airlie <airlied@linux.ie>, Chen-Yu Tsai <wens@csie.org>,
        Thomas Zimmermann <tzimmermann@suse.de>,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Lyude Paul <lyude@redhat.com>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        Samuel Holland <samuel@sholland.org>,
        Karol Herbst <kherbst@redhat.com>,
        =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>,
        Emma Anholt <emma@anholt.net>, Daniel Vetter <daniel@ffwll.ch>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc:     Maxime Ripard <maxime@cerno.tech>,
        Hans de Goede <hdegoede@redhat.com>,
        linux-arm-kernel@lists.infradead.org,
        Phil Elwell <phil@raspberrypi.com>,
        intel-gfx@lists.freedesktop.org,
        Dave Stevenson <dave.stevenson@raspberrypi.com>,
        dri-devel@lists.freedesktop.org, Dom Cobley <dom@raspberrypi.com>,
        linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org,
        linux-sunxi@lists.linux.dev,
        Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH v2 27/41] drm/vc4: vec: Remove redundant atomic_mode_set
Date:   Mon, 29 Aug 2022 15:11:41 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-27-459522d653a7@cerno.tech>
In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

From: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>=0D
=0D
Let's remove the superfluous tv_mode field, which was redundant with the=0D
mode field in struct drm_tv_connector_state.=0D
=0D
Signed-off-by: Mateusz Kwiatkowski <kfyatek+publicgit@gmail.com>=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
=0D
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c=
=0D
index 9a37c3fcc295..4d7bc7c20704 100644=0D
--- a/drivers/gpu/drm/vc4/vc4_vec.c=0D
+++ b/drivers/gpu/drm/vc4/vc4_vec.c=0D
@@ -171,8 +171,6 @@ struct vc4_vec {=0D
 =0D
 	struct clk *clock;=0D
 =0D
-	const struct vc4_vec_tv_mode *tv_mode;=0D
-=0D
 	struct debugfs_regset32 regset;=0D
 };=0D
 =0D
@@ -316,7 +314,6 @@ static int vc4_vec_connector_init(struct drm_device *de=
v, struct vc4_vec *vec)=0D
 	drm_object_attach_property(&connector->base,=0D
 				   dev->mode_config.legacy_tv_mode_property,=0D
 				   VC4_VEC_TV_MODE_NTSC);=0D
-	vec->tv_mode =3D &vc4_vec_tv_modes[VC4_VEC_TV_MODE_NTSC];=0D
 =0D
 	drm_connector_attach_encoder(connector, &vec->encoder.base);=0D
 =0D
@@ -360,6 +357,11 @@ static void vc4_vec_encoder_enable(struct drm_encoder =
*encoder,=0D
 {=0D
 	struct drm_device *drm =3D encoder->dev;=0D
 	struct vc4_vec *vec =3D encoder_to_vc4_vec(encoder);=0D
+	struct drm_connector *connector =3D &vec->connector;=0D
+	struct drm_connector_state *conn_state =3D=0D
+		drm_atomic_get_new_connector_state(state, connector);=0D
+	const struct vc4_vec_tv_mode *tv_mode =3D=0D
+		&vc4_vec_tv_modes[conn_state->tv.mode];=0D
 	int idx, ret;=0D
 =0D
 	if (!drm_dev_enter(drm, &idx))=0D
@@ -418,15 +420,14 @@ static void vc4_vec_encoder_enable(struct drm_encoder=
 *encoder,=0D
 	/* Mask all interrupts. */=0D
 	VEC_WRITE(VEC_MASK0, 0);=0D
 =0D
-	VEC_WRITE(VEC_CONFIG0, vec->tv_mode->config0);=0D
-	VEC_WRITE(VEC_CONFIG1, vec->tv_mode->config1);=0D
+	VEC_WRITE(VEC_CONFIG0, tv_mode->config0);=0D
+	VEC_WRITE(VEC_CONFIG1, tv_mode->config1);=0D
 =0D
-	if (vec->tv_mode->custom_freq !=3D 0) {=0D
+	if (tv_mode->custom_freq !=3D 0) {=0D
 		VEC_WRITE(VEC_FREQ3_2,=0D
-			  (vec->tv_mode->custom_freq >> 16) &=0D
-			  0xffff);=0D
+			  (tv_mode->custom_freq >> 16) & 0xffff);=0D
 		VEC_WRITE(VEC_FREQ1_0,=0D
-			  vec->tv_mode->custom_freq & 0xffff);=0D
+			  tv_mode->custom_freq & 0xffff);=0D
 	}=0D
 =0D
 	VEC_WRITE(VEC_DAC_MISC,=0D
@@ -442,15 +443,6 @@ static void vc4_vec_encoder_enable(struct drm_encoder =
*encoder,=0D
 	drm_dev_exit(idx);=0D
 }=0D
 =0D
-static void vc4_vec_encoder_atomic_mode_set(struct drm_encoder *encoder,=0D
-					struct drm_crtc_state *crtc_state,=0D
-					struct drm_connector_state *conn_state)=0D
-{=0D
-	struct vc4_vec *vec =3D encoder_to_vc4_vec(encoder);=0D
-=0D
-	vec->tv_mode =3D &vc4_vec_tv_modes[conn_state->tv.mode];=0D
-}=0D
-=0D
 static int vc4_vec_encoder_atomic_check(struct drm_encoder *encoder,=0D
 					struct drm_crtc_state *crtc_state,=0D
 					struct drm_connector_state *conn_state)=0D
@@ -470,7 +462,6 @@ static const struct drm_encoder_helper_funcs vc4_vec_en=
coder_helper_funcs =3D {=0D
 	.atomic_check =3D vc4_vec_encoder_atomic_check,=0D
 	.atomic_disable =3D vc4_vec_encoder_disable,=0D
 	.atomic_enable =3D vc4_vec_encoder_enable,=0D
-	.atomic_mode_set =3D vc4_vec_encoder_atomic_mode_set,=0D
 };=0D
 =0D
 static int vc4_vec_late_register(struct drm_encoder *encoder)=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D