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 22/41] drm/atomic-helper: Add a TV properties reset helper
Date:   Mon, 29 Aug 2022 15:11:36 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-22-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

The drm_tv_create_properties() function will create a bunch of properties,=
=0D
but it's up to each and every driver using that function to properly reset=
=0D
the state of these properties leading to inconsistent behaviours.=0D
=0D
Let's create a helper that will take care of it.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
=0D
diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/dr=
m_atomic_state_helper.c=0D
index dfb57217253b..0373c3dc824b 100644=0D
--- a/drivers/gpu/drm/drm_atomic_state_helper.c=0D
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c=0D
@@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(stru=
ct drm_connector *connecto=0D
 }=0D
 EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset);=0D
 =0D
+/**=0D
+ * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector prope=
rties=0D
+ * @connector: DRM connector=0D
+ *=0D
+ * Resets the analog TV properties attached to a connector=0D
+ */=0D
+void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)=
=0D
+{=0D
+	struct drm_device *dev =3D connector->dev;=0D
+	struct drm_cmdline_mode *cmdline =3D &connector->cmdline_mode;=0D
+	struct drm_connector_state *state =3D connector->state;=0D
+	struct drm_property *prop;=0D
+	uint64_t val;=0D
+=0D
+	prop =3D dev->mode_config.tv_mode_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.mode =3D val;=0D
+=0D
+	if (cmdline->tv_mode)=0D
+		state->tv.mode =3D cmdline->tv_mode;=0D
+=0D
+	prop =3D dev->mode_config.tv_select_subconnector_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.select_subconnector =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_subconnector_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.subconnector =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_brightness_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.brightness =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_contrast_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.contrast =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_flicker_reduction_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.flicker_reduction =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_overscan_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.overscan =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_saturation_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.saturation =3D val;=0D
+=0D
+	prop =3D dev->mode_config.tv_hue_property;=0D
+	if (prop)=0D
+		if (!drm_object_property_get_default_value(&connector->base,=0D
+							   prop, &val))=0D
+			state->tv.hue =3D val;=0D
+=0D
+	drm_atomic_helper_connector_tv_margins_reset(connector);=0D
+}=0D
+EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);=0D
+=0D
 /**=0D
  * __drm_atomic_helper_connector_duplicate_state - copy atomic connector s=
tate=0D
  * @connector: connector object=0D
diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic=
_state_helper.h=0D
index 192766656b88..c8fbce795ee7 100644=0D
--- a/include/drm/drm_atomic_state_helper.h=0D
+++ b/include/drm/drm_atomic_state_helper.h=0D
@@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm=
_connector_state *conn_=0D
 void __drm_atomic_helper_connector_reset(struct drm_connector *connector,=
=0D
 					 struct drm_connector_state *conn_state);=0D
 void drm_atomic_helper_connector_reset(struct drm_connector *connector);=0D
+void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)=
;=0D
 void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *co=
nnector);=0D
 void=0D
 __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connec=
tor,=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D