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 03/41] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity
Date:   Mon, 29 Aug 2022 15:11:17 +0200
Message-Id: <20220728-rpi-analog-tv-properties-v2-3-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

We currently have two sets of TV properties.=0D
=0D
The first one is there to deal with analog TV properties, creating=0D
properties such as the TV mode, subconnectors, saturation, hue and so on.=0D
It's created by calling the drm_mode_create_tv_properties() function.=0D
=0D
The second one is there to deal with properties that might be useful on a=0D
TV, creating the overscan margins for example. It's created by calling the=
=0D
drm_mode_create_tv_margin_properties().=0D
=0D
However, we also have a drm_atomic_helper_connector_tv_reset() function=0D
that will reset the TV margin properties to their default values, and thus=
=0D
is supposed to be called for the latter set. This creates an ambiguity due=
=0D
to the inconsistent naming.=0D
=0D
We can thus rename the drm_atomic_helper_connector_tv_reset() function to=0D
drm_atomic_helper_connector_tv_margins_reset() to remove that ambiguity=0D
and hopefully make it more obvious.=0D
=0D
Signed-off-by: Maxime Ripard <maxime@cerno.tech>=0D
Reviewed-by: Noralf Tr=C3=B8nnes <noralf@tronnes.org>=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 bf31b9d92094..dfb57217253b 100644=0D
--- a/drivers/gpu/drm/drm_atomic_state_helper.c=0D
+++ b/drivers/gpu/drm/drm_atomic_state_helper.c=0D
@@ -464,12 +464,12 @@ void drm_atomic_helper_connector_reset(struct drm_con=
nector *connector)=0D
 EXPORT_SYMBOL(drm_atomic_helper_connector_reset);=0D
 =0D
 /**=0D
- * drm_atomic_helper_connector_tv_reset - Resets TV connector properties=0D
+ * drm_atomic_helper_connector_tv_margins_reset - Resets TV connector prop=
erties=0D
  * @connector: DRM connector=0D
  *=0D
  * Resets the TV-related properties attached to a connector.=0D
  */=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
 {=0D
 	struct drm_cmdline_mode *cmdline =3D &connector->cmdline_mode;=0D
 	struct drm_connector_state *state =3D connector->state;=0D
@@ -479,7 +479,7 @@ void drm_atomic_helper_connector_tv_reset(struct drm_co=
nnector *connector)=0D
 	state->tv.margins.top =3D cmdline->tv_margins.top;=0D
 	state->tv.margins.bottom =3D cmdline->tv_margins.bottom;=0D
 }=0D
-EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);=0D
+EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset);=0D
 =0D
 /**=0D
  * __drm_atomic_helper_connector_duplicate_state - copy atomic connector s=
tate=0D
diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_=
connector.c=0D
index d0addd478815..fa636206f232 100644=0D
--- a/drivers/gpu/drm/gud/gud_connector.c=0D
+++ b/drivers/gpu/drm/gud/gud_connector.c=0D
@@ -355,7 +355,7 @@ static void gud_connector_reset(struct drm_connector *c=
onnector)=0D
 	drm_atomic_helper_connector_reset(connector);=0D
 	connector->state->tv =3D gconn->initial_tv_state;=0D
 	/* Set margins from command line */=0D
-	drm_atomic_helper_connector_tv_reset(connector);=0D
+	drm_atomic_helper_connector_tv_margins_reset(connector);=0D
 	if (gconn->initial_brightness >=3D 0)=0D
 		connector->state->tv.brightness =3D gconn->initial_brightness;=0D
 }=0D
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.=
c=0D
index 84e5a91c2ea7..6877add8e1fa 100644=0D
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c=0D
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c=0D
@@ -396,7 +396,7 @@ static void vc4_hdmi_connector_reset(struct drm_connect=
or *connector)=0D
 	new_state->base.max_bpc =3D 8;=0D
 	new_state->base.max_requested_bpc =3D 8;=0D
 	new_state->output_format =3D VC4_HDMI_OUTPUT_RGB;=0D
-	drm_atomic_helper_connector_tv_reset(connector);=0D
+	drm_atomic_helper_connector_tv_margins_reset(connector);=0D
 }=0D
 =0D
 static struct drm_connector_state *=0D
diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic=
_state_helper.h=0D
index 3f8f1d627f7c..192766656b88 100644=0D
--- a/include/drm/drm_atomic_state_helper.h=0D
+++ b/include/drm/drm_atomic_state_helper.h=0D
@@ -70,7 +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
 					   struct drm_connector_state *state);=0D
diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h=0D
index 248206bbd975..23112f0c11cf 100644=0D
--- a/include/drm/drm_connector.h=0D
+++ b/include/drm/drm_connector.h=0D
@@ -692,7 +692,7 @@ struct drm_connector_tv_margins {=0D
 =0D
 /**=0D
  * struct drm_tv_connector_state - TV connector related states=0D
- * @subconnector: selected subconnector=0D
+ * @select_subconnector: selected subconnector=0D
  * @margins: TV margins=0D
  * @mode: TV mode=0D
  * @brightness: brightness in percent=0D
=0D
-- =0D
b4 0.10.0-dev-65ba7=0D