From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6666F3D65 for ; Mon, 29 Aug 2022 13:12:25 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1B2BE2B05FBA; Mon, 29 Aug 2022 09:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=g /ygx+NnVHUz6W/ywvCNFn+xh02OQ9tp8JwGbVFSgUpKdqiZgP+rMKsG+ccUmaZFD NfIVtp8ks3/1noWIAhRcteJNxYvp80NwrR7+7FnNrbC2NAn2DTzzgklKp6pm3O9U fOIJh7z1FGq2+Y/Nsij9cm2CXFHOpdbk9Ul+KRCdB7yc5iDVSOrrgh2Cdbs9K6A8 oX8Sk8Ubakai78jUa+snPaON4nMyYT3ljuenOGVTucwlcRCgN1nzeS8GYEODKkAE KrRRF46Se+tr81L1RcBSh3Qv3wAhbiARzvuZPgcc8tLNR17ZsLFKBPtEfC4rlPRE RHKQRigOW75k4r1FaureQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=A TT3OGdl6RU9/Rm4elzm4Exq3UNekOVV2wqAtiTRgHBHxqEhxsvcJHGo1A2QcB+FM z9P1+/jteDn4vEXuQtKj9MHCbXjwyUIPZ6UMtjouSPE/v5pP2mf5p+kNrdvn2k4W seNi4/81QXJJ7f0llZVKhMijHBc56e4CQ5YAqH3MsvaqVWg3yBG7PKvuRj5pGXZ3 NqiUC7FGHjiFmwzhrVFU5JqBBzpYziDgO5xxzl9L0HxUqil1gh/aSdr8/ZwDkPBQ /zNw2skRv4k+x61ovk5t3DyzFEgzbHogPhlEILFDa+XIK6l/ypl0h3d1ZjuAVwH9 2NIXJAvKzNmK/GfMx1WyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpedvueehkefhhefghedugefhieevhfdvudegleeuteetlefgudevgfet kedtlefhtdenucffohhmrghinhepmhgrrhhgihhnshdrthhophenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdr thgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:12:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven 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> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4933; i=maxime@cerno.tech; h=from:subject:message-id; bh=tneD6WL3cA9YngB/zjXILq0672FR3xbphbAAyAQ5g1M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+QbFvh8k7rUZPI7asqriudtjVVuN1hUenat00m/7DPl pOSyjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzEcwMjw5PSFv3OILffXmnnXGx5WO UO8j7eWrcwzU+1QSj45dfVsxgZWq8prj2292TmtwfhVY/0ixsCfq7S5b4jtTKHq5NrikAxEwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable 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 =0D Reviewed-by: Noralf Tr=C3=B8nnes =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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 097CBECAAD2 for ; Mon, 29 Aug 2022 13:12:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6F93E10F200; Mon, 29 Aug 2022 13:12:48 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4421110F1E6 for ; Mon, 29 Aug 2022 13:12:25 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1B2BE2B05FBA; Mon, 29 Aug 2022 09:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=g /ygx+NnVHUz6W/ywvCNFn+xh02OQ9tp8JwGbVFSgUpKdqiZgP+rMKsG+ccUmaZFD NfIVtp8ks3/1noWIAhRcteJNxYvp80NwrR7+7FnNrbC2NAn2DTzzgklKp6pm3O9U fOIJh7z1FGq2+Y/Nsij9cm2CXFHOpdbk9Ul+KRCdB7yc5iDVSOrrgh2Cdbs9K6A8 oX8Sk8Ubakai78jUa+snPaON4nMyYT3ljuenOGVTucwlcRCgN1nzeS8GYEODKkAE KrRRF46Se+tr81L1RcBSh3Qv3wAhbiARzvuZPgcc8tLNR17ZsLFKBPtEfC4rlPRE RHKQRigOW75k4r1FaureQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=A TT3OGdl6RU9/Rm4elzm4Exq3UNekOVV2wqAtiTRgHBHxqEhxsvcJHGo1A2QcB+FM z9P1+/jteDn4vEXuQtKj9MHCbXjwyUIPZ6UMtjouSPE/v5pP2mf5p+kNrdvn2k4W seNi4/81QXJJ7f0llZVKhMijHBc56e4CQ5YAqH3MsvaqVWg3yBG7PKvuRj5pGXZ3 NqiUC7FGHjiFmwzhrVFU5JqBBzpYziDgO5xxzl9L0HxUqil1gh/aSdr8/ZwDkPBQ /zNw2skRv4k+x61ovk5t3DyzFEgzbHogPhlEILFDa+XIK6l/ypl0h3d1ZjuAVwH9 2NIXJAvKzNmK/GfMx1WyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpedvueehkefhhefghedugefhieevhfdvudegleeuteetlefgudevgfet kedtlefhtdenucffohhmrghinhepmhgrrhhgihhnshdrthhophenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdr thgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:12:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen 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> X-Mailer: git-send-email 2.37.1 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" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4933; i=maxime@cerno.tech; h=from:subject:message-id; bh=tneD6WL3cA9YngB/zjXILq0672FR3xbphbAAyAQ5g1M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+QbFvh8k7rUZPI7asqriudtjVVuN1hUenat00m/7DPl pOSyjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzEcwMjw5PSFv3OILffXmnnXGx5WO UO8j7eWrcwzU+1QSj45dfVsxgZWq8prj2292TmtwfhVY/0ixsCfq7S5b4jtTKHq5NrikAxEwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 =0D Reviewed-by: Noralf Tr=C3=B8nnes =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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C4FB2ECAAD2 for ; Mon, 29 Aug 2022 13:14:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vGMVi31isN/jd11yfwJER6aVWtADdg9KJEl5yE2ppCY=; b=TlpOo/GsAbuVoC 7fQv6WuHkDfUCEhW4zR9uD7gUG1401raUH5nz4Kr29Dj7bGWLlHG7eWNnxo5rncALoyyr9jUsXSA8 QhkMrt2zXaphTuXHeyCJIshgQ1bDPcH3NfvOzLuOPxspzSLJo+2aMshgR5Qb5V36aBJdnhn/ySwl1 xz9+BffO0XxJ24FuK9zWT0HEpxI4WfpmY2ul1tDHwhSJIVhnXIq1JCzDAc3fo2EQnGjeSwjn4yKDq bHbd48r6tyRmzB64yDr7zlOpjObBDIsRTVmPYs4EGpP64FQcaJ34Hs5WeR1dw1y8gOYHIv2ayjMpv AOCjqC/MWkNxPTeekSfw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSeZt-00Aa4o-Ih; Mon, 29 Aug 2022 13:13:21 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSeYz-00AZWz-9L for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 13:12:27 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1B2BE2B05FBA; Mon, 29 Aug 2022 09:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=g /ygx+NnVHUz6W/ywvCNFn+xh02OQ9tp8JwGbVFSgUpKdqiZgP+rMKsG+ccUmaZFD NfIVtp8ks3/1noWIAhRcteJNxYvp80NwrR7+7FnNrbC2NAn2DTzzgklKp6pm3O9U fOIJh7z1FGq2+Y/Nsij9cm2CXFHOpdbk9Ul+KRCdB7yc5iDVSOrrgh2Cdbs9K6A8 oX8Sk8Ubakai78jUa+snPaON4nMyYT3ljuenOGVTucwlcRCgN1nzeS8GYEODKkAE KrRRF46Se+tr81L1RcBSh3Qv3wAhbiARzvuZPgcc8tLNR17ZsLFKBPtEfC4rlPRE RHKQRigOW75k4r1FaureQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=A TT3OGdl6RU9/Rm4elzm4Exq3UNekOVV2wqAtiTRgHBHxqEhxsvcJHGo1A2QcB+FM z9P1+/jteDn4vEXuQtKj9MHCbXjwyUIPZ6UMtjouSPE/v5pP2mf5p+kNrdvn2k4W seNi4/81QXJJ7f0llZVKhMijHBc56e4CQ5YAqH3MsvaqVWg3yBG7PKvuRj5pGXZ3 NqiUC7FGHjiFmwzhrVFU5JqBBzpYziDgO5xxzl9L0HxUqil1gh/aSdr8/ZwDkPBQ /zNw2skRv4k+x61ovk5t3DyzFEgzbHogPhlEILFDa+XIK6l/ypl0h3d1ZjuAVwH9 2NIXJAvKzNmK/GfMx1WyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpedvueehkefhhefghedugefhieevhfdvudegleeuteetlefgudevgfet kedtlefhtdenucffohhmrghinhepmhgrrhhgihhnshdrthhophenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdr thgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:12:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Cc: Maxime Ripard , Hans de Goede , linux-arm-kernel@lists.infradead.org, Phil Elwell , intel-gfx@lists.freedesktop.org, Dave Stevenson , dri-devel@lists.freedesktop.org, Dom Cobley , linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Mateusz Kwiatkowski , Geert Uytterhoeven 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> X-Mailer: git-send-email 2.37.1 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 X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4933; i=maxime@cerno.tech; h=from:subject:message-id; bh=tneD6WL3cA9YngB/zjXILq0672FR3xbphbAAyAQ5g1M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+QbFvh8k7rUZPI7asqriudtjVVuN1hUenat00m/7DPl pOSyjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzEcwMjw5PSFv3OILffXmnnXGx5WO UO8j7eWrcwzU+1QSj45dfVsxgZWq8prj2292TmtwfhVY/0ixsCfq7S5b4jtTKHq5NrikAxEwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_061225_400244_9990CF28 X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org V2UgY3VycmVudGx5IGhhdmUgdHdvIHNldHMgb2YgVFYgcHJvcGVydGllcy4NCg0KVGhlIGZpcnN0 IG9uZSBpcyB0aGVyZSB0byBkZWFsIHdpdGggYW5hbG9nIFRWIHByb3BlcnRpZXMsIGNyZWF0aW5n DQpwcm9wZXJ0aWVzIHN1Y2ggYXMgdGhlIFRWIG1vZGUsIHN1YmNvbm5lY3RvcnMsIHNhdHVyYXRp b24sIGh1ZSBhbmQgc28gb24uDQpJdCdzIGNyZWF0ZWQgYnkgY2FsbGluZyB0aGUgZHJtX21vZGVf Y3JlYXRlX3R2X3Byb3BlcnRpZXMoKSBmdW5jdGlvbi4NCg0KVGhlIHNlY29uZCBvbmUgaXMgdGhl cmUgdG8gZGVhbCB3aXRoIHByb3BlcnRpZXMgdGhhdCBtaWdodCBiZSB1c2VmdWwgb24gYQ0KVFYs IGNyZWF0aW5nIHRoZSBvdmVyc2NhbiBtYXJnaW5zIGZvciBleGFtcGxlLiBJdCdzIGNyZWF0ZWQg YnkgY2FsbGluZyB0aGUNCmRybV9tb2RlX2NyZWF0ZV90dl9tYXJnaW5fcHJvcGVydGllcygpLg0K DQpIb3dldmVyLCB3ZSBhbHNvIGhhdmUgYSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZf cmVzZXQoKSBmdW5jdGlvbg0KdGhhdCB3aWxsIHJlc2V0IHRoZSBUViBtYXJnaW4gcHJvcGVydGll cyB0byB0aGVpciBkZWZhdWx0IHZhbHVlcywgYW5kIHRodXMNCmlzIHN1cHBvc2VkIHRvIGJlIGNh bGxlZCBmb3IgdGhlIGxhdHRlciBzZXQuIFRoaXMgY3JlYXRlcyBhbiBhbWJpZ3VpdHkgZHVlDQp0 byB0aGUgaW5jb25zaXN0ZW50IG5hbWluZy4NCg0KV2UgY2FuIHRodXMgcmVuYW1lIHRoZSBkcm1f YXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfcmVzZXQoKSBmdW5jdGlvbiB0bw0KZHJtX2F0b21p Y19oZWxwZXJfY29ubmVjdG9yX3R2X21hcmdpbnNfcmVzZXQoKSB0byByZW1vdmUgdGhhdCBhbWJp Z3VpdHkNCmFuZCBob3BlZnVsbHkgbWFrZSBpdCBtb3JlIG9idmlvdXMuDQoNClNpZ25lZC1vZmYt Ynk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50ZWNoPg0KUmV2aWV3ZWQtYnk6IE5vcmFs ZiBUcsO4bm5lcyA8bm9yYWxmQHRyb25uZXMub3JnPg0KDQpkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVyLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0 b21pY19zdGF0ZV9oZWxwZXIuYw0KaW5kZXggYmYzMWI5ZDkyMDk0Li5kZmI1NzIxNzI1M2IgMTAw NjQ0DQotLS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19zdGF0ZV9oZWxwZXIuYw0KKysr IGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVyLmMNCkBAIC00NjQsMTIg KzQ2NCwxMiBAQCB2b2lkIGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9yZXNldChzdHJ1Y3Qg ZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQ0KIEVYUE9SVF9TWU1CT0woZHJtX2F0b21pY19oZWxw ZXJfY29ubmVjdG9yX3Jlc2V0KTsNCiANCiAvKioNCi0gKiBkcm1fYXRvbWljX2hlbHBlcl9jb25u ZWN0b3JfdHZfcmVzZXQgLSBSZXNldHMgVFYgY29ubmVjdG9yIHByb3BlcnRpZXMNCisgKiBkcm1f YXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfbWFyZ2luc19yZXNldCAtIFJlc2V0cyBUViBjb25u ZWN0b3IgcHJvcGVydGllcw0KICAqIEBjb25uZWN0b3I6IERSTSBjb25uZWN0b3INCiAgKg0KICAq IFJlc2V0cyB0aGUgVFYtcmVsYXRlZCBwcm9wZXJ0aWVzIGF0dGFjaGVkIHRvIGEgY29ubmVjdG9y Lg0KICAqLw0KLXZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X3Jlc2V0KHN0cnVj dCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpDQordm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb25u ZWN0b3JfdHZfbWFyZ2luc19yZXNldChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKQ0K IHsNCiAJc3RydWN0IGRybV9jbWRsaW5lX21vZGUgKmNtZGxpbmUgPSAmY29ubmVjdG9yLT5jbWRs aW5lX21vZGU7DQogCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpzdGF0ZSA9IGNvbm5lY3Rv ci0+c3RhdGU7DQpAQCAtNDc5LDcgKzQ3OSw3IEBAIHZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29u bmVjdG9yX3R2X3Jlc2V0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpDQogCXN0YXRl LT50di5tYXJnaW5zLnRvcCA9IGNtZGxpbmUtPnR2X21hcmdpbnMudG9wOw0KIAlzdGF0ZS0+dHYu bWFyZ2lucy5ib3R0b20gPSBjbWRsaW5lLT50dl9tYXJnaW5zLmJvdHRvbTsNCiB9DQotRVhQT1JU X1NZTUJPTChkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfcmVzZXQpOw0KK0VYUE9SVF9T WU1CT0woZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X21hcmdpbnNfcmVzZXQpOw0KIA0K IC8qKg0KICAqIF9fZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSAt IGNvcHkgYXRvbWljIGNvbm5lY3RvciBzdGF0ZQ0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9ndWQvZ3VkX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUvZHJtL2d1ZC9ndWRfY29ubmVjdG9y LmMNCmluZGV4IGQwYWRkZDQ3ODgxNS4uZmE2MzYyMDZmMjMyIDEwMDY0NA0KLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2d1ZC9ndWRfY29ubmVjdG9yLmMNCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9ndWQv Z3VkX2Nvbm5lY3Rvci5jDQpAQCAtMzU1LDcgKzM1NSw3IEBAIHN0YXRpYyB2b2lkIGd1ZF9jb25u ZWN0b3JfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikNCiAJZHJtX2F0b21p Y19oZWxwZXJfY29ubmVjdG9yX3Jlc2V0KGNvbm5lY3Rvcik7DQogCWNvbm5lY3Rvci0+c3RhdGUt PnR2ID0gZ2Nvbm4tPmluaXRpYWxfdHZfc3RhdGU7DQogCS8qIFNldCBtYXJnaW5zIGZyb20gY29t bWFuZCBsaW5lICovDQotCWRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl90dl9yZXNldChjb25u ZWN0b3IpOw0KKwlkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfbWFyZ2luc19yZXNldChj b25uZWN0b3IpOw0KIAlpZiAoZ2Nvbm4tPmluaXRpYWxfYnJpZ2h0bmVzcyA+PSAwKQ0KIAkJY29u bmVjdG9yLT5zdGF0ZS0+dHYuYnJpZ2h0bmVzcyA9IGdjb25uLT5pbml0aWFsX2JyaWdodG5lc3M7 DQogfQ0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYyBiL2RyaXZl cnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYw0KaW5kZXggODRlNWE5MWMyZWE3Li42ODc3YWRkOGUx ZmEgMTAwNjQ0DQotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMNCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS92YzQvdmM0X2hkbWkuYw0KQEAgLTM5Niw3ICszOTYsNyBAQCBzdGF0aWMg dm9pZCB2YzRfaGRtaV9jb25uZWN0b3JfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5l Y3RvcikNCiAJbmV3X3N0YXRlLT5iYXNlLm1heF9icGMgPSA4Ow0KIAluZXdfc3RhdGUtPmJhc2Uu bWF4X3JlcXVlc3RlZF9icGMgPSA4Ow0KIAluZXdfc3RhdGUtPm91dHB1dF9mb3JtYXQgPSBWQzRf SERNSV9PVVRQVVRfUkdCOw0KLQlkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfcmVzZXQo Y29ubmVjdG9yKTsNCisJZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X21hcmdpbnNfcmVz ZXQoY29ubmVjdG9yKTsNCiB9DQogDQogc3RhdGljIHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICoNCmRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljX3N0YXRlX2hlbHBlci5oIGIv aW5jbHVkZS9kcm0vZHJtX2F0b21pY19zdGF0ZV9oZWxwZXIuaA0KaW5kZXggM2Y4ZjFkNjI3Zjdj Li4xOTI3NjY2NTZiODggMTAwNjQ0DQotLS0gYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljX3N0YXRl X2hlbHBlci5oDQorKysgYi9pbmNsdWRlL2RybS9kcm1fYXRvbWljX3N0YXRlX2hlbHBlci5oDQpA QCAtNzAsNyArNzAsNyBAQCB2b2lkIF9fZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3N0YXRl X3Jlc2V0KHN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRlICpjb25uXw0KIHZvaWQgX19kcm1fYXRv bWljX2hlbHBlcl9jb25uZWN0b3JfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rv ciwNCiAJCQkJCSBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl9zdGF0ZSk7DQogdm9p ZCBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3Rvcik7DQotdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfcmVzZXQo c3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3Rvcik7DQordm9pZCBkcm1fYXRvbWljX2hlbHBl cl9jb25uZWN0b3JfdHZfbWFyZ2luc19yZXNldChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVj dG9yKTsNCiB2b2lkDQogX19kcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZHVwbGljYXRlX3N0 YXRlKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IsDQogCQkJCQkgICBzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqc3RhdGUpOw0KZGlmZiAtLWdpdCBhL2luY2x1ZGUvZHJtL2RybV9j b25uZWN0b3IuaCBiL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaA0KaW5kZXggMjQ4MjA2YmJk OTc1Li4yMzExMmYwYzExY2YgMTAwNjQ0DQotLS0gYS9pbmNsdWRlL2RybS9kcm1fY29ubmVjdG9y LmgNCisrKyBiL2luY2x1ZGUvZHJtL2RybV9jb25uZWN0b3IuaA0KQEAgLTY5Miw3ICs2OTIsNyBA QCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl90dl9tYXJnaW5zIHsNCiANCiAvKioNCiAgKiBzdHJ1Y3Qg ZHJtX3R2X2Nvbm5lY3Rvcl9zdGF0ZSAtIFRWIGNvbm5lY3RvciByZWxhdGVkIHN0YXRlcw0KLSAq IEBzdWJjb25uZWN0b3I6IHNlbGVjdGVkIHN1YmNvbm5lY3Rvcg0KKyAqIEBzZWxlY3Rfc3ViY29u bmVjdG9yOiBzZWxlY3RlZCBzdWJjb25uZWN0b3INCiAgKiBAbWFyZ2luczogVFYgbWFyZ2lucw0K ICAqIEBtb2RlOiBUViBtb2RlDQogICogQGJyaWdodG5lc3M6IGJyaWdodG5lc3MgaW4gcGVyY2Vu dA0KDQotLSANCmI0IDAuMTAuMC1kZXYtNjViYTcNCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51 eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4910EECAAD5 for ; Mon, 29 Aug 2022 13:21:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1504710F298; Mon, 29 Aug 2022 13:21:03 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 596F910F299; Mon, 29 Aug 2022 13:20:49 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1B2BE2B05FBA; Mon, 29 Aug 2022 09:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=g /ygx+NnVHUz6W/ywvCNFn+xh02OQ9tp8JwGbVFSgUpKdqiZgP+rMKsG+ccUmaZFD NfIVtp8ks3/1noWIAhRcteJNxYvp80NwrR7+7FnNrbC2NAn2DTzzgklKp6pm3O9U fOIJh7z1FGq2+Y/Nsij9cm2CXFHOpdbk9Ul+KRCdB7yc5iDVSOrrgh2Cdbs9K6A8 oX8Sk8Ubakai78jUa+snPaON4nMyYT3ljuenOGVTucwlcRCgN1nzeS8GYEODKkAE KrRRF46Se+tr81L1RcBSh3Qv3wAhbiARzvuZPgcc8tLNR17ZsLFKBPtEfC4rlPRE RHKQRigOW75k4r1FaureQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=A TT3OGdl6RU9/Rm4elzm4Exq3UNekOVV2wqAtiTRgHBHxqEhxsvcJHGo1A2QcB+FM z9P1+/jteDn4vEXuQtKj9MHCbXjwyUIPZ6UMtjouSPE/v5pP2mf5p+kNrdvn2k4W seNi4/81QXJJ7f0llZVKhMijHBc56e4CQ5YAqH3MsvaqVWg3yBG7PKvuRj5pGXZ3 NqiUC7FGHjiFmwzhrVFU5JqBBzpYziDgO5xxzl9L0HxUqil1gh/aSdr8/ZwDkPBQ /zNw2skRv4k+x61ovk5t3DyzFEgzbHogPhlEILFDa+XIK6l/ypl0h3d1ZjuAVwH9 2NIXJAvKzNmK/GfMx1WyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpedvueehkefhhefghedugefhieevhfdvudegleeuteetlefgudevgfet kedtlefhtdenucffohhmrghinhepmhgrrhhgihhnshdrthhophenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdr thgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:12:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Date: Mon, 29 Aug 2022 15:11:17 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-3-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 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" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4933; i=maxime@cerno.tech; h=from:subject:message-id; bh=tneD6WL3cA9YngB/zjXILq0672FR3xbphbAAyAQ5g1M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+QbFvh8k7rUZPI7asqriudtjVVuN1hUenat00m/7DPl pOSyjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzEcwMjw5PSFv3OILffXmnnXGx5WO UO8j7eWrcwzU+1QSj45dfVsxgZWq8prj2292TmtwfhVY/0ixsCfq7S5b4jtTKHq5NrikAxEwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable Subject: [Intel-gfx] [PATCH v2 03/41] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 =0D Reviewed-by: Noralf Tr=C3=B8nnes =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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F716C38145 for ; Tue, 6 Sep 2022 20:32:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 489CB10EAC3; Tue, 6 Sep 2022 20:31:35 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 596F910F299; Mon, 29 Aug 2022 13:20:49 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1B2BE2B05FBA; Mon, 29 Aug 2022 09:12:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:12:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=g /ygx+NnVHUz6W/ywvCNFn+xh02OQ9tp8JwGbVFSgUpKdqiZgP+rMKsG+ccUmaZFD NfIVtp8ks3/1noWIAhRcteJNxYvp80NwrR7+7FnNrbC2NAn2DTzzgklKp6pm3O9U fOIJh7z1FGq2+Y/Nsij9cm2CXFHOpdbk9Ul+KRCdB7yc5iDVSOrrgh2Cdbs9K6A8 oX8Sk8Ubakai78jUa+snPaON4nMyYT3ljuenOGVTucwlcRCgN1nzeS8GYEODKkAE KrRRF46Se+tr81L1RcBSh3Qv3wAhbiARzvuZPgcc8tLNR17ZsLFKBPtEfC4rlPRE RHKQRigOW75k4r1FaureQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1661778741; x= 1661785941; bh=ZOUld/v3fqwEg7IGW6tGDT41DPLt0Lfah3fjUTcgbpc=; b=A TT3OGdl6RU9/Rm4elzm4Exq3UNekOVV2wqAtiTRgHBHxqEhxsvcJHGo1A2QcB+FM z9P1+/jteDn4vEXuQtKj9MHCbXjwyUIPZ6UMtjouSPE/v5pP2mf5p+kNrdvn2k4W seNi4/81QXJJ7f0llZVKhMijHBc56e4CQ5YAqH3MsvaqVWg3yBG7PKvuRj5pGXZ3 NqiUC7FGHjiFmwzhrVFU5JqBBzpYziDgO5xxzl9L0HxUqil1gh/aSdr8/ZwDkPBQ /zNw2skRv4k+x61ovk5t3DyzFEgzbHogPhlEILFDa+XIK6l/ypl0h3d1ZjuAVwH9 2NIXJAvKzNmK/GfMx1WyA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgiedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpedvueehkefhhefghedugefhieevhfdvudegleeuteetlefgudevgfet kedtlefhtdenucffohhmrghinhepmhgrrhhgihhnshdrthhophenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdr thgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:12:20 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Date: Mon, 29 Aug 2022 15:11:17 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-3-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 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" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4933; i=maxime@cerno.tech; h=from:subject:message-id; bh=tneD6WL3cA9YngB/zjXILq0672FR3xbphbAAyAQ5g1M=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8u+QbFvh8k7rUZPI7asqriudtjVVuN1hUenat00m/7DPl pOSyjlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAEzEcwMjw5PSFv3OILffXmnnXGx5WO UO8j7eWrcwzU+1QSj45dfVsxgZWq8prj2292TmtwfhVY/0ixsCfq7S5b4jtTKHq5NrikAxEwA= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable X-Mailman-Approved-At: Tue, 06 Sep 2022 20:31:04 +0000 Subject: [Nouveau] [PATCH v2 03/41] drm/atomic-helper: Rename drm_atomic_helper_connector_tv_reset to avoid ambiguity X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" 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 =0D Reviewed-by: Noralf Tr=C3=B8nnes =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