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 36/41] drm/sun4i: tv: Merge mode_set into atomic_enable
Date:   Mon, 29 Aug 2022 15:11:50 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-36-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

Our mode_set implementation can be merged into our atomic_enable=0D
implementation to simplify things, so let's do this.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
=0D
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i=
_tv.c=0D
index f7aad995ab5b..3944da9a3c34 100644=0D
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c=0D
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c=0D
@@ -359,23 +359,13 @@ static void sun4i_tv_enable(struct drm_encoder *encod=
er,=0D
 {=0D
 	struct sun4i_tv *tv =3D drm_encoder_to_sun4i_tv(encoder);=0D
 	struct sun4i_crtc *crtc =3D drm_crtc_to_sun4i_crtc(encoder->crtc);=0D
-=0D
-	DRM_DEBUG_DRIVER("Enabling the TV Output\n");=0D
-=0D
-	sunxi_engine_apply_color_correction(crtc->engine);=0D
-=0D
-	regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,=0D
-			   SUN4I_TVE_EN_ENABLE,=0D
-			   SUN4I_TVE_EN_ENABLE);=0D
-}=0D
-=0D
-static void sun4i_tv_mode_set(struct drm_encoder *encoder,=0D
-			      struct drm_display_mode *mode,=0D
-			      struct drm_display_mode *adjusted_mode)=0D
-{=0D
-	struct sun4i_tv *tv =3D drm_encoder_to_sun4i_tv(encoder);=0D
+	struct drm_crtc_state *crtc_state =3D=0D
+		drm_atomic_get_new_crtc_state(state, encoder->crtc);=0D
+	struct drm_display_mode *mode =3D &crtc_state->mode;=0D
 	const struct tv_mode *tv_mode =3D sun4i_tv_find_tv_by_mode(mode);=0D
 =0D
+	DRM_DEBUG_DRIVER("Enabling the TV Output\n");=0D
+=0D
 	/* Enable and map the DAC to the output */=0D
 	regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,=0D
 			   SUN4I_TVE_EN_DAC_MAP_MASK,=0D
@@ -468,12 +458,17 @@ static void sun4i_tv_mode_set(struct drm_encoder *enc=
oder,=0D
 		      SUN4I_TVE_RESYNC_FIELD : 0));=0D
 =0D
 	regmap_write(tv->regs, SUN4I_TVE_SLAVE_REG, 0);=0D
+=0D
+	sunxi_engine_apply_color_correction(crtc->engine);=0D
+=0D
+	regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,=0D
+			   SUN4I_TVE_EN_ENABLE,=0D
+			   SUN4I_TVE_EN_ENABLE);=0D
 }=0D
 =0D
 static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs =3D {=0D
 	.atomic_disable	=3D sun4i_tv_disable,=0D
 	.atomic_enable	=3D sun4i_tv_enable,=0D
-	.mode_set	=3D sun4i_tv_mode_set,=0D
 };=0D
 =0D
 static int sun4i_tv_comp_get_modes(struct drm_connector *connector)=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D