From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) (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 BCDC7847C for ; Wed, 26 Oct 2022 15:33:41 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D722758020E; Wed, 26 Oct 2022 11:33:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:33:40 -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=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=I yy3ncwq/IFGKyB7y8bScrR/I6yoaE2FvfZk3uCEIqbh896mKCq2SsFLHifQ9tMvb Xfww4CJNSFqpnZOrI0hKqmzNTSqG18SsbUJyeHJxOTB0+yl2JniwyYaunBhWGcEq LQ6dr6Olw1xsc7yvoEZc3ZOuJAssukmljODuBvi32CqtnFW6ugc5LQ/HB6vtwvDY mK8c7gPxBRLwUZ3AhBwKwx88lLCVxERRjzxICp+1JN0x8XQU9C/ICFd8ggBrU8Ex XR5iLx7xOH4L1b82o3czoqvExaUO7n8FhzFkomG/QPTauV1b74BG9E8BTNk3TTV6 i6BQ1OH7Fg4MFXX62pV2w== 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=fm3; t=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=f 1AF2EnevOam07VS4Y6lFAR/zNlixu3IEPxV9TBaq5Mzbg2y0dnF+4UhilZsBjqLn EmHWnaxEMpgBY37pGpMhAm7+LG5/tdTT9lVjTZrBUQPxfveAgYBeMHfKSsY0Uasy PZy1Zl3mgzrRi9UQGpII5WnK99VqWvrqi6iwjoc62G8PMz0Cn+mnyORNxD6c2YzH iYLxcRnpq5H92si9f9f4U8cjbAByQIJs2IAV2pyntn9EUsu4iK1UgxMBR0gaFSx9 fP/AvqP3GY1OALnw6hdBfYhyb/E+FP24Uv6ytB9Znr0GDbW3ZSAoHdi1ZXhqB0RC h1o6UynQIOUNi9Hi6gM9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:39 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:23 +0200 Subject: [PATCH v6 04/23] drm/connector: Rename drm_mode_create_tv_properties Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-4-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: linux-sunxi@lists.linux.dev, Maxime Ripard , intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Noralf Trønnes , Geert Uytterhoeven X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7225; i=maxime@cerno.tech; h=from:subject:message-id; bh=LAHuDhiCCvcHX74pAAH7nyY5O1gAlCgceYdUnZcqbdE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4ZHQ/sF7x6WbfZQPTgm1n2Qttb9P+eaXjjfHJn6rGN F5fYdJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiJh2MDD8UwtsUni4P/7F/RUnZ4q MqCo5VG8QYjni9/mM9P1Qs5jcjw98vm86XXZD+smtZyLVLDFsX9l27a7mIuYftnFxtO+fL5dwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D drm_mode_create_tv_properties(), among other things, will create the "mode" property that stores the analog TV mode that connector is supposed to output. However, that property is getting deprecated, so let's rename that function to mention it's deprecated. We'll introduce a new variant of that function creating the property superseeding it in a later patch. Reviewed-by: Lyude Paul # nouveau Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 12 ++++++------ drivers/gpu/drm/gud/gud_connector.c | 4 ++-- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/vc4/vc4_vec.c | 5 +++-- include/drm/drm_connector.h | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 17a5913cefe3..4e4fbc9e0049 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1600,7 +1600,7 @@ EXPORT_SYMBOL(drm_connector_attach_tv_margin_properties); * Called by a driver's HDMI connector initialization routine, this function * creates the TV margin properties for a given device. No need to call this * function for an SDTV connector, it's already called from - * drm_mode_create_tv_properties(). + * drm_mode_create_tv_properties_legacy(). * * Returns: * 0 on success or a negative error code on failure. @@ -1635,7 +1635,7 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); /** - * drm_mode_create_tv_properties - create TV specific connector properties + * drm_mode_create_tv_properties_legacy - create TV specific connector properties * @dev: DRM device * @num_modes: number of different TV formats (modes) supported * @modes: array of pointers to strings containing name of each format @@ -1648,9 +1648,9 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); * Returns: * 0 on success or a negative error code on failure. */ -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]) +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]) { struct drm_property *tv_selector; struct drm_property *tv_subconnector; @@ -1733,7 +1733,7 @@ int drm_mode_create_tv_properties(struct drm_device *dev, nomem: return -ENOMEM; } -EXPORT_SYMBOL(drm_mode_create_tv_properties); +EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy); /** * drm_mode_create_scaling_mode_property - create scaling mode property diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c index 86e992b2108b..034e78360d4f 100644 --- a/drivers/gpu/drm/gud/gud_connector.c +++ b/drivers/gpu/drm/gud/gud_connector.c @@ -400,7 +400,7 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect for (i = 0; i < num_modes; i++) modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN]; - ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); + ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes); free: kfree(buf); if (ret < 0) @@ -539,7 +539,7 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn fallthrough; case GUD_PROPERTY_TV_HUE: /* This is a no-op if already added. */ - ret = drm_mode_create_tv_properties(drm, 0, NULL); + ret = drm_mode_create_tv_properties_legacy(drm, 0, NULL); if (ret) goto out; break; diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index ef69f9bdeace..b63bad04b09d 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -250,7 +250,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_mode_config *conf = &dev->mode_config; - drm_mode_create_tv_properties(dev, NUM_TV_NORMS, ch7006_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, NUM_TV_NORMS, ch7006_tv_norm_names); priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); if (!priv->scale_property) diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c index b2f42bf929e2..748821ebdf65 100644 --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@ -1995,7 +1995,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) tv_format_names[i] = tv_modes[i].name; } - drm_mode_create_tv_properties(dev, i, tv_format_names); + drm_mode_create_tv_properties_legacy(dev, i, tv_format_names); drm_object_attach_property(&connector->base, dev->mode_config.legacy_tv_mode_property, diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 1a15534adc60..e5480dab55e3 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -653,7 +653,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, tv_enc->tv_norm = i; } - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, num_tv_norms, nv17_tv_norm_names); drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index e6043cf5d40e..adc9bf99e3fd 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -514,8 +514,9 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) struct vc4_vec *vec; int ret; - ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(tv_mode_names), - tv_mode_names); + ret = drm_mode_create_tv_properties_legacy(drm, + ARRAY_SIZE(tv_mode_names), + tv_mode_names); if (ret) return ret; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f93f83161ed5..e1c88ae0149a 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1799,9 +1799,9 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev); void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); int drm_mode_create_tv_margin_properties(struct drm_device *dev); -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]); +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]); void drm_connector_attach_tv_margin_properties(struct drm_connector *conn); int drm_mode_create_scaling_mode_property(struct drm_device *dev); int drm_connector_attach_content_type_property(struct drm_connector *dev); -- b4 0.11.0-dev-99e3a 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 E2CDAC433FE for ; Wed, 26 Oct 2022 15:34:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E099E10E315; Wed, 26 Oct 2022 15:33:48 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 766E010E39A; Wed, 26 Oct 2022 15:33:41 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D722758020E; Wed, 26 Oct 2022 11:33:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:33:40 -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=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=I yy3ncwq/IFGKyB7y8bScrR/I6yoaE2FvfZk3uCEIqbh896mKCq2SsFLHifQ9tMvb Xfww4CJNSFqpnZOrI0hKqmzNTSqG18SsbUJyeHJxOTB0+yl2JniwyYaunBhWGcEq LQ6dr6Olw1xsc7yvoEZc3ZOuJAssukmljODuBvi32CqtnFW6ugc5LQ/HB6vtwvDY mK8c7gPxBRLwUZ3AhBwKwx88lLCVxERRjzxICp+1JN0x8XQU9C/ICFd8ggBrU8Ex XR5iLx7xOH4L1b82o3czoqvExaUO7n8FhzFkomG/QPTauV1b74BG9E8BTNk3TTV6 i6BQ1OH7Fg4MFXX62pV2w== 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=fm3; t=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=f 1AF2EnevOam07VS4Y6lFAR/zNlixu3IEPxV9TBaq5Mzbg2y0dnF+4UhilZsBjqLn EmHWnaxEMpgBY37pGpMhAm7+LG5/tdTT9lVjTZrBUQPxfveAgYBeMHfKSsY0Uasy PZy1Zl3mgzrRi9UQGpII5WnK99VqWvrqi6iwjoc62G8PMz0Cn+mnyORNxD6c2YzH iYLxcRnpq5H92si9f9f4U8cjbAByQIJs2IAV2pyntn9EUsu4iK1UgxMBR0gaFSx9 fP/AvqP3GY1OALnw6hdBfYhyb/E+FP24Uv6ytB9Znr0GDbW3ZSAoHdi1ZXhqB0RC h1o6UynQIOUNi9Hi6gM9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:39 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:23 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-4-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7225; i=maxime@cerno.tech; h=from:subject:message-id; bh=LAHuDhiCCvcHX74pAAH7nyY5O1gAlCgceYdUnZcqbdE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4ZHQ/sF7x6WbfZQPTgm1n2Qttb9P+eaXjjfHJn6rGN F5fYdJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiJh2MDD8UwtsUni4P/7F/RUnZ4q MqCo5VG8QYjni9/mM9P1Qs5jcjw98vm86XXZD+smtZyLVLDFsX9l27a7mIuYftnFxtO+fL5dwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Nouveau] [PATCH v6 04/23] drm/connector: Rename drm_mode_create_tv_properties 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 , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" drm_mode_create_tv_properties(), among other things, will create the "mode" property that stores the analog TV mode that connector is supposed to output. However, that property is getting deprecated, so let's rename that function to mention it's deprecated. We'll introduce a new variant of that function creating the property superseeding it in a later patch. Reviewed-by: Lyude Paul # nouveau Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 12 ++++++------ drivers/gpu/drm/gud/gud_connector.c | 4 ++-- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/vc4/vc4_vec.c | 5 +++-- include/drm/drm_connector.h | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 17a5913cefe3..4e4fbc9e0049 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1600,7 +1600,7 @@ EXPORT_SYMBOL(drm_connector_attach_tv_margin_properties); * Called by a driver's HDMI connector initialization routine, this function * creates the TV margin properties for a given device. No need to call this * function for an SDTV connector, it's already called from - * drm_mode_create_tv_properties(). + * drm_mode_create_tv_properties_legacy(). * * Returns: * 0 on success or a negative error code on failure. @@ -1635,7 +1635,7 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); /** - * drm_mode_create_tv_properties - create TV specific connector properties + * drm_mode_create_tv_properties_legacy - create TV specific connector properties * @dev: DRM device * @num_modes: number of different TV formats (modes) supported * @modes: array of pointers to strings containing name of each format @@ -1648,9 +1648,9 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); * Returns: * 0 on success or a negative error code on failure. */ -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]) +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]) { struct drm_property *tv_selector; struct drm_property *tv_subconnector; @@ -1733,7 +1733,7 @@ int drm_mode_create_tv_properties(struct drm_device *dev, nomem: return -ENOMEM; } -EXPORT_SYMBOL(drm_mode_create_tv_properties); +EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy); /** * drm_mode_create_scaling_mode_property - create scaling mode property diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c index 86e992b2108b..034e78360d4f 100644 --- a/drivers/gpu/drm/gud/gud_connector.c +++ b/drivers/gpu/drm/gud/gud_connector.c @@ -400,7 +400,7 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect for (i = 0; i < num_modes; i++) modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN]; - ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); + ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes); free: kfree(buf); if (ret < 0) @@ -539,7 +539,7 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn fallthrough; case GUD_PROPERTY_TV_HUE: /* This is a no-op if already added. */ - ret = drm_mode_create_tv_properties(drm, 0, NULL); + ret = drm_mode_create_tv_properties_legacy(drm, 0, NULL); if (ret) goto out; break; diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index ef69f9bdeace..b63bad04b09d 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -250,7 +250,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_mode_config *conf = &dev->mode_config; - drm_mode_create_tv_properties(dev, NUM_TV_NORMS, ch7006_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, NUM_TV_NORMS, ch7006_tv_norm_names); priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); if (!priv->scale_property) diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c index b2f42bf929e2..748821ebdf65 100644 --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@ -1995,7 +1995,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) tv_format_names[i] = tv_modes[i].name; } - drm_mode_create_tv_properties(dev, i, tv_format_names); + drm_mode_create_tv_properties_legacy(dev, i, tv_format_names); drm_object_attach_property(&connector->base, dev->mode_config.legacy_tv_mode_property, diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 1a15534adc60..e5480dab55e3 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -653,7 +653,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, tv_enc->tv_norm = i; } - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, num_tv_norms, nv17_tv_norm_names); drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index e6043cf5d40e..adc9bf99e3fd 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -514,8 +514,9 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) struct vc4_vec *vec; int ret; - ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(tv_mode_names), - tv_mode_names); + ret = drm_mode_create_tv_properties_legacy(drm, + ARRAY_SIZE(tv_mode_names), + tv_mode_names); if (ret) return ret; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f93f83161ed5..e1c88ae0149a 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1799,9 +1799,9 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev); void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); int drm_mode_create_tv_margin_properties(struct drm_device *dev); -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]); +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]); void drm_connector_attach_tv_margin_properties(struct drm_connector *conn); int drm_mode_create_scaling_mode_property(struct drm_device *dev); int drm_connector_attach_content_type_property(struct drm_connector *dev); -- b4 0.11.0-dev-99e3a 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 C5C48FA373E for ; Wed, 26 Oct 2022 15:34:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F31110E3DA; Wed, 26 Oct 2022 15:33:48 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 766E010E39A; Wed, 26 Oct 2022 15:33:41 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D722758020E; Wed, 26 Oct 2022 11:33:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:33:40 -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=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=I yy3ncwq/IFGKyB7y8bScrR/I6yoaE2FvfZk3uCEIqbh896mKCq2SsFLHifQ9tMvb Xfww4CJNSFqpnZOrI0hKqmzNTSqG18SsbUJyeHJxOTB0+yl2JniwyYaunBhWGcEq LQ6dr6Olw1xsc7yvoEZc3ZOuJAssukmljODuBvi32CqtnFW6ugc5LQ/HB6vtwvDY mK8c7gPxBRLwUZ3AhBwKwx88lLCVxERRjzxICp+1JN0x8XQU9C/ICFd8ggBrU8Ex XR5iLx7xOH4L1b82o3czoqvExaUO7n8FhzFkomG/QPTauV1b74BG9E8BTNk3TTV6 i6BQ1OH7Fg4MFXX62pV2w== 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=fm3; t=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=f 1AF2EnevOam07VS4Y6lFAR/zNlixu3IEPxV9TBaq5Mzbg2y0dnF+4UhilZsBjqLn EmHWnaxEMpgBY37pGpMhAm7+LG5/tdTT9lVjTZrBUQPxfveAgYBeMHfKSsY0Uasy PZy1Zl3mgzrRi9UQGpII5WnK99VqWvrqi6iwjoc62G8PMz0Cn+mnyORNxD6c2YzH iYLxcRnpq5H92si9f9f4U8cjbAByQIJs2IAV2pyntn9EUsu4iK1UgxMBR0gaFSx9 fP/AvqP3GY1OALnw6hdBfYhyb/E+FP24Uv6ytB9Znr0GDbW3ZSAoHdi1ZXhqB0RC h1o6UynQIOUNi9Hi6gM9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:39 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:23 +0200 Subject: [PATCH v6 04/23] drm/connector: Rename drm_mode_create_tv_properties MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-4-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7225; i=maxime@cerno.tech; h=from:subject:message-id; bh=LAHuDhiCCvcHX74pAAH7nyY5O1gAlCgceYdUnZcqbdE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4ZHQ/sF7x6WbfZQPTgm1n2Qttb9P+eaXjjfHJn6rGN F5fYdJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiJh2MDD8UwtsUni4P/7F/RUnZ4q MqCo5VG8QYjni9/mM9P1Qs5jcjw98vm86XXZD+smtZyLVLDFsX9l27a7mIuYftnFxtO+fL5dwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D 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 , Noralf Trønnes , 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" drm_mode_create_tv_properties(), among other things, will create the "mode" property that stores the analog TV mode that connector is supposed to output. However, that property is getting deprecated, so let's rename that function to mention it's deprecated. We'll introduce a new variant of that function creating the property superseeding it in a later patch. Reviewed-by: Lyude Paul # nouveau Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 12 ++++++------ drivers/gpu/drm/gud/gud_connector.c | 4 ++-- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/vc4/vc4_vec.c | 5 +++-- include/drm/drm_connector.h | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 17a5913cefe3..4e4fbc9e0049 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1600,7 +1600,7 @@ EXPORT_SYMBOL(drm_connector_attach_tv_margin_properties); * Called by a driver's HDMI connector initialization routine, this function * creates the TV margin properties for a given device. No need to call this * function for an SDTV connector, it's already called from - * drm_mode_create_tv_properties(). + * drm_mode_create_tv_properties_legacy(). * * Returns: * 0 on success or a negative error code on failure. @@ -1635,7 +1635,7 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); /** - * drm_mode_create_tv_properties - create TV specific connector properties + * drm_mode_create_tv_properties_legacy - create TV specific connector properties * @dev: DRM device * @num_modes: number of different TV formats (modes) supported * @modes: array of pointers to strings containing name of each format @@ -1648,9 +1648,9 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); * Returns: * 0 on success or a negative error code on failure. */ -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]) +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]) { struct drm_property *tv_selector; struct drm_property *tv_subconnector; @@ -1733,7 +1733,7 @@ int drm_mode_create_tv_properties(struct drm_device *dev, nomem: return -ENOMEM; } -EXPORT_SYMBOL(drm_mode_create_tv_properties); +EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy); /** * drm_mode_create_scaling_mode_property - create scaling mode property diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c index 86e992b2108b..034e78360d4f 100644 --- a/drivers/gpu/drm/gud/gud_connector.c +++ b/drivers/gpu/drm/gud/gud_connector.c @@ -400,7 +400,7 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect for (i = 0; i < num_modes; i++) modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN]; - ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); + ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes); free: kfree(buf); if (ret < 0) @@ -539,7 +539,7 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn fallthrough; case GUD_PROPERTY_TV_HUE: /* This is a no-op if already added. */ - ret = drm_mode_create_tv_properties(drm, 0, NULL); + ret = drm_mode_create_tv_properties_legacy(drm, 0, NULL); if (ret) goto out; break; diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index ef69f9bdeace..b63bad04b09d 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -250,7 +250,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_mode_config *conf = &dev->mode_config; - drm_mode_create_tv_properties(dev, NUM_TV_NORMS, ch7006_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, NUM_TV_NORMS, ch7006_tv_norm_names); priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); if (!priv->scale_property) diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c index b2f42bf929e2..748821ebdf65 100644 --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@ -1995,7 +1995,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) tv_format_names[i] = tv_modes[i].name; } - drm_mode_create_tv_properties(dev, i, tv_format_names); + drm_mode_create_tv_properties_legacy(dev, i, tv_format_names); drm_object_attach_property(&connector->base, dev->mode_config.legacy_tv_mode_property, diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 1a15534adc60..e5480dab55e3 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -653,7 +653,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, tv_enc->tv_norm = i; } - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, num_tv_norms, nv17_tv_norm_names); drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index e6043cf5d40e..adc9bf99e3fd 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -514,8 +514,9 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) struct vc4_vec *vec; int ret; - ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(tv_mode_names), - tv_mode_names); + ret = drm_mode_create_tv_properties_legacy(drm, + ARRAY_SIZE(tv_mode_names), + tv_mode_names); if (ret) return ret; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f93f83161ed5..e1c88ae0149a 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1799,9 +1799,9 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev); void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); int drm_mode_create_tv_margin_properties(struct drm_device *dev); -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]); +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]); void drm_connector_attach_tv_margin_properties(struct drm_connector *conn); int drm_mode_create_scaling_mode_property(struct drm_device *dev); int drm_connector_attach_content_type_property(struct drm_connector *dev); -- b4 0.11.0-dev-99e3a 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 B5FA0C433FE for ; Wed, 26 Oct 2022 15:34:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 68FE010E33F; Wed, 26 Oct 2022 15:33:51 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 766E010E39A; Wed, 26 Oct 2022 15:33:41 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D722758020E; Wed, 26 Oct 2022 11:33:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:33:40 -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=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=I yy3ncwq/IFGKyB7y8bScrR/I6yoaE2FvfZk3uCEIqbh896mKCq2SsFLHifQ9tMvb Xfww4CJNSFqpnZOrI0hKqmzNTSqG18SsbUJyeHJxOTB0+yl2JniwyYaunBhWGcEq LQ6dr6Olw1xsc7yvoEZc3ZOuJAssukmljODuBvi32CqtnFW6ugc5LQ/HB6vtwvDY mK8c7gPxBRLwUZ3AhBwKwx88lLCVxERRjzxICp+1JN0x8XQU9C/ICFd8ggBrU8Ex XR5iLx7xOH4L1b82o3czoqvExaUO7n8FhzFkomG/QPTauV1b74BG9E8BTNk3TTV6 i6BQ1OH7Fg4MFXX62pV2w== 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=fm3; t=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=f 1AF2EnevOam07VS4Y6lFAR/zNlixu3IEPxV9TBaq5Mzbg2y0dnF+4UhilZsBjqLn EmHWnaxEMpgBY37pGpMhAm7+LG5/tdTT9lVjTZrBUQPxfveAgYBeMHfKSsY0Uasy PZy1Zl3mgzrRi9UQGpII5WnK99VqWvrqi6iwjoc62G8PMz0Cn+mnyORNxD6c2YzH iYLxcRnpq5H92si9f9f4U8cjbAByQIJs2IAV2pyntn9EUsu4iK1UgxMBR0gaFSx9 fP/AvqP3GY1OALnw6hdBfYhyb/E+FP24Uv6ytB9Znr0GDbW3ZSAoHdi1ZXhqB0RC h1o6UynQIOUNi9Hi6gM9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:39 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:23 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-4-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7225; i=maxime@cerno.tech; h=from:subject:message-id; bh=LAHuDhiCCvcHX74pAAH7nyY5O1gAlCgceYdUnZcqbdE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4ZHQ/sF7x6WbfZQPTgm1n2Qttb9P+eaXjjfHJn6rGN F5fYdJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiJh2MDD8UwtsUni4P/7F/RUnZ4q MqCo5VG8QYjni9/mM9P1Qs5jcjw98vm86XXZD+smtZyLVLDFsX9l27a7mIuYftnFxtO+fL5dwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Intel-gfx] [PATCH v6 04/23] drm/connector: Rename drm_mode_create_tv_properties 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, Hans de Goede , Noralf Trønnes , 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" drm_mode_create_tv_properties(), among other things, will create the "mode" property that stores the analog TV mode that connector is supposed to output. However, that property is getting deprecated, so let's rename that function to mention it's deprecated. We'll introduce a new variant of that function creating the property superseeding it in a later patch. Reviewed-by: Lyude Paul # nouveau Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 12 ++++++------ drivers/gpu/drm/gud/gud_connector.c | 4 ++-- drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- drivers/gpu/drm/i915/display/intel_tv.c | 2 +- drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 2 +- drivers/gpu/drm/vc4/vc4_vec.c | 5 +++-- include/drm/drm_connector.h | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 17a5913cefe3..4e4fbc9e0049 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1600,7 +1600,7 @@ EXPORT_SYMBOL(drm_connector_attach_tv_margin_properties); * Called by a driver's HDMI connector initialization routine, this function * creates the TV margin properties for a given device. No need to call this * function for an SDTV connector, it's already called from - * drm_mode_create_tv_properties(). + * drm_mode_create_tv_properties_legacy(). * * Returns: * 0 on success or a negative error code on failure. @@ -1635,7 +1635,7 @@ int drm_mode_create_tv_margin_properties(struct drm_device *dev) EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); /** - * drm_mode_create_tv_properties - create TV specific connector properties + * drm_mode_create_tv_properties_legacy - create TV specific connector properties * @dev: DRM device * @num_modes: number of different TV formats (modes) supported * @modes: array of pointers to strings containing name of each format @@ -1648,9 +1648,9 @@ EXPORT_SYMBOL(drm_mode_create_tv_margin_properties); * Returns: * 0 on success or a negative error code on failure. */ -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]) +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]) { struct drm_property *tv_selector; struct drm_property *tv_subconnector; @@ -1733,7 +1733,7 @@ int drm_mode_create_tv_properties(struct drm_device *dev, nomem: return -ENOMEM; } -EXPORT_SYMBOL(drm_mode_create_tv_properties); +EXPORT_SYMBOL(drm_mode_create_tv_properties_legacy); /** * drm_mode_create_scaling_mode_property - create scaling mode property diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c index 86e992b2108b..034e78360d4f 100644 --- a/drivers/gpu/drm/gud/gud_connector.c +++ b/drivers/gpu/drm/gud/gud_connector.c @@ -400,7 +400,7 @@ static int gud_connector_add_tv_mode(struct gud_device *gdrm, struct drm_connect for (i = 0; i < num_modes; i++) modes[i] = &buf[i * GUD_CONNECTOR_TV_MODE_NAME_LEN]; - ret = drm_mode_create_tv_properties(connector->dev, num_modes, modes); + ret = drm_mode_create_tv_properties_legacy(connector->dev, num_modes, modes); free: kfree(buf); if (ret < 0) @@ -539,7 +539,7 @@ static int gud_connector_add_properties(struct gud_device *gdrm, struct gud_conn fallthrough; case GUD_PROPERTY_TV_HUE: /* This is a no-op if already added. */ - ret = drm_mode_create_tv_properties(drm, 0, NULL); + ret = drm_mode_create_tv_properties_legacy(drm, 0, NULL); if (ret) goto out; break; diff --git a/drivers/gpu/drm/i2c/ch7006_drv.c b/drivers/gpu/drm/i2c/ch7006_drv.c index ef69f9bdeace..b63bad04b09d 100644 --- a/drivers/gpu/drm/i2c/ch7006_drv.c +++ b/drivers/gpu/drm/i2c/ch7006_drv.c @@ -250,7 +250,7 @@ static int ch7006_encoder_create_resources(struct drm_encoder *encoder, struct drm_device *dev = encoder->dev; struct drm_mode_config *conf = &dev->mode_config; - drm_mode_create_tv_properties(dev, NUM_TV_NORMS, ch7006_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, NUM_TV_NORMS, ch7006_tv_norm_names); priv->scale_property = drm_property_create_range(dev, 0, "scale", 0, 2); if (!priv->scale_property) diff --git a/drivers/gpu/drm/i915/display/intel_tv.c b/drivers/gpu/drm/i915/display/intel_tv.c index b2f42bf929e2..748821ebdf65 100644 --- a/drivers/gpu/drm/i915/display/intel_tv.c +++ b/drivers/gpu/drm/i915/display/intel_tv.c @@ -1995,7 +1995,7 @@ intel_tv_init(struct drm_i915_private *dev_priv) tv_format_names[i] = tv_modes[i].name; } - drm_mode_create_tv_properties(dev, i, tv_format_names); + drm_mode_create_tv_properties_legacy(dev, i, tv_format_names); drm_object_attach_property(&connector->base, dev->mode_config.legacy_tv_mode_property, diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c index 1a15534adc60..e5480dab55e3 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c @@ -653,7 +653,7 @@ static int nv17_tv_create_resources(struct drm_encoder *encoder, tv_enc->tv_norm = i; } - drm_mode_create_tv_properties(dev, num_tv_norms, nv17_tv_norm_names); + drm_mode_create_tv_properties_legacy(dev, num_tv_norms, nv17_tv_norm_names); drm_object_attach_property(&connector->base, conf->tv_select_subconnector_property, diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index e6043cf5d40e..adc9bf99e3fd 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -514,8 +514,9 @@ static int vc4_vec_bind(struct device *dev, struct device *master, void *data) struct vc4_vec *vec; int ret; - ret = drm_mode_create_tv_properties(drm, ARRAY_SIZE(tv_mode_names), - tv_mode_names); + ret = drm_mode_create_tv_properties_legacy(drm, + ARRAY_SIZE(tv_mode_names), + tv_mode_names); if (ret) return ret; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index f93f83161ed5..e1c88ae0149a 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1799,9 +1799,9 @@ int drm_mode_create_dvi_i_properties(struct drm_device *dev); void drm_connector_attach_dp_subconnector_property(struct drm_connector *connector); int drm_mode_create_tv_margin_properties(struct drm_device *dev); -int drm_mode_create_tv_properties(struct drm_device *dev, - unsigned int num_modes, - const char * const modes[]); +int drm_mode_create_tv_properties_legacy(struct drm_device *dev, + unsigned int num_modes, + const char * const modes[]); void drm_connector_attach_tv_margin_properties(struct drm_connector *conn); int drm_mode_create_scaling_mode_property(struct drm_device *dev); int drm_connector_attach_content_type_property(struct drm_connector *dev); -- b4 0.11.0-dev-99e3a 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 4936FFA373E for ; Wed, 26 Oct 2022 15:37:06 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=RbUluiuWP5469ZsiLS+2Ytkweqz5QYkPQGYoL7iZReg=; b=nTFEfISTcoN/sG e0PvEwq7z+WMBYCLZJkfbMIWIsKq9hcOB1RjVvFCR2tJx0ofSROxWHp5KxKGtKq06FAnFTp7osoSp Ix9Wqi62f0OKDUZKrPx/UP4MrPjQxtLCkjUyRRzBbi8MkljBZF6csjsG4iDzxLAPMTmMIJJDyuTgn J3fFEjHj69NPpvBdD5cylKK0A56CN1Usj/Hwqu9C2Gp/zMRWIiGNSt0pmZC5e8Qq6WmkbuEsp7TtC WUxm/YaV9ibozs3P2hIAt+P+7+GCAMclK3yuj/f0qIS17UAWQdL803jvd90fHEV2C5MObLDNYEIlt MIO50BddPB+ipPGIoE0g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oniR6-009udN-PY; Wed, 26 Oct 2022 15:35:22 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oniPV-009u0Q-Fj for linux-arm-kernel@lists.infradead.org; Wed, 26 Oct 2022 15:33:43 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id D722758020E; Wed, 26 Oct 2022 11:33:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:33:40 -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=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=I yy3ncwq/IFGKyB7y8bScrR/I6yoaE2FvfZk3uCEIqbh896mKCq2SsFLHifQ9tMvb Xfww4CJNSFqpnZOrI0hKqmzNTSqG18SsbUJyeHJxOTB0+yl2JniwyYaunBhWGcEq LQ6dr6Olw1xsc7yvoEZc3ZOuJAssukmljODuBvi32CqtnFW6ugc5LQ/HB6vtwvDY mK8c7gPxBRLwUZ3AhBwKwx88lLCVxERRjzxICp+1JN0x8XQU9C/ICFd8ggBrU8Ex XR5iLx7xOH4L1b82o3czoqvExaUO7n8FhzFkomG/QPTauV1b74BG9E8BTNk3TTV6 i6BQ1OH7Fg4MFXX62pV2w== 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=fm3; t=1666798420; x= 1666805620; bh=aJFPwKqNB5FMyAfZaSz4ZtKCShLvfWWgS0ATLNLSh3Y=; b=f 1AF2EnevOam07VS4Y6lFAR/zNlixu3IEPxV9TBaq5Mzbg2y0dnF+4UhilZsBjqLn EmHWnaxEMpgBY37pGpMhAm7+LG5/tdTT9lVjTZrBUQPxfveAgYBeMHfKSsY0Uasy PZy1Zl3mgzrRi9UQGpII5WnK99VqWvrqi6iwjoc62G8PMz0Cn+mnyORNxD6c2YzH iYLxcRnpq5H92si9f9f4U8cjbAByQIJs2IAV2pyntn9EUsu4iK1UgxMBR0gaFSx9 fP/AvqP3GY1OALnw6hdBfYhyb/E+FP24Uv6ytB9Znr0GDbW3ZSAoHdi1ZXhqB0RC h1o6UynQIOUNi9Hi6gM9w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv pedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:33:39 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:23 +0200 Subject: [PATCH v6 04/23] drm/connector: Rename drm_mode_create_tv_properties MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v6-4-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: linux-sunxi@lists.linux.dev, Maxime Ripard , intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Noralf Trønnes , Geert Uytterhoeven X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7225; i=maxime@cerno.tech; h=from:subject:message-id; bh=LAHuDhiCCvcHX74pAAH7nyY5O1gAlCgceYdUnZcqbdE=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwW4ZHQ/sF7x6WbfZQPTgm1n2Qttb9P+eaXjjfHJn6rGN F5fYdJSyMIhxMciKKbLECJsviTs163UnG988mDmsTCBDGLg4BWAiJh2MDD8UwtsUni4P/7F/RUnZ4q MqCo5VG8QYjni9/mM9P1Qs5jcjw98vm86XXZD+smtZyLVLDFsX9l27a7mIuYftnFxtO+fL5dwA 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-20221026_083341_624715_11CF2177 X-CRM114-Status: GOOD ( 18.01 ) 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 ZHJtX21vZGVfY3JlYXRlX3R2X3Byb3BlcnRpZXMoKSwgYW1vbmcgb3RoZXIgdGhpbmdzLCB3aWxs IGNyZWF0ZSB0aGUKIm1vZGUiIHByb3BlcnR5IHRoYXQgc3RvcmVzIHRoZSBhbmFsb2cgVFYgbW9k ZSB0aGF0IGNvbm5lY3RvciBpcwpzdXBwb3NlZCB0byBvdXRwdXQuCgpIb3dldmVyLCB0aGF0IHBy b3BlcnR5IGlzIGdldHRpbmcgZGVwcmVjYXRlZCwgc28gbGV0J3MgcmVuYW1lIHRoYXQKZnVuY3Rp b24gdG8gbWVudGlvbiBpdCdzIGRlcHJlY2F0ZWQuIFdlJ2xsIGludHJvZHVjZSBhIG5ldyB2YXJp YW50IG9mCnRoYXQgZnVuY3Rpb24gY3JlYXRpbmcgdGhlIHByb3BlcnR5IHN1cGVyc2VlZGluZyBp dCBpbiBhIGxhdGVyIHBhdGNoLgoKUmV2aWV3ZWQtYnk6IEx5dWRlIFBhdWwgPGx5dWRlQHJlZGhh dC5jb20+ICMgbm91dmVhdQpSZXZpZXdlZC1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJv bm5lcy5vcmc+ClNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50ZWNo PgotLS0KIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMgICAgICAgICAgIHwgMTIgKysr KysrLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vZ3VkL2d1ZF9jb25uZWN0b3IuYyAgICAgICB8ICA0 ICsrLS0KIGRyaXZlcnMvZ3B1L2RybS9pMmMvY2g3MDA2X2Rydi5jICAgICAgICAgIHwgIDIgKy0K IGRyaXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfdHYuYyAgIHwgIDIgKy0KIGRyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L2Rpc3BudjA0L3R2bnYxNy5jIHwgIDIgKy0KIGRyaXZlcnMvZ3B1 L2RybS92YzQvdmM0X3ZlYy5jICAgICAgICAgICAgIHwgIDUgKysrLS0KIGluY2x1ZGUvZHJtL2Ry bV9jb25uZWN0b3IuaCAgICAgICAgICAgICAgIHwgIDYgKysrLS0tCiA3IGZpbGVzIGNoYW5nZWQs IDE3IGluc2VydGlvbnMoKyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9kcm1fY29ubmVjdG9yLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5j CmluZGV4IDE3YTU5MTNjZWZlMy4uNGU0ZmJjOWUwMDQ5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw dS9kcm0vZHJtX2Nvbm5lY3Rvci5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9y LmMKQEAgLTE2MDAsNyArMTYwMCw3IEBAIEVYUE9SVF9TWU1CT0woZHJtX2Nvbm5lY3Rvcl9hdHRh Y2hfdHZfbWFyZ2luX3Byb3BlcnRpZXMpOwogICogQ2FsbGVkIGJ5IGEgZHJpdmVyJ3MgSERNSSBj b25uZWN0b3IgaW5pdGlhbGl6YXRpb24gcm91dGluZSwgdGhpcyBmdW5jdGlvbgogICogY3JlYXRl cyB0aGUgVFYgbWFyZ2luIHByb3BlcnRpZXMgZm9yIGEgZ2l2ZW4gZGV2aWNlLiBObyBuZWVkIHRv IGNhbGwgdGhpcwogICogZnVuY3Rpb24gZm9yIGFuIFNEVFYgY29ubmVjdG9yLCBpdCdzIGFscmVh ZHkgY2FsbGVkIGZyb20KLSAqIGRybV9tb2RlX2NyZWF0ZV90dl9wcm9wZXJ0aWVzKCkuCisgKiBk cm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVydGllc19sZWdhY3koKS4KICAqCiAgKiBSZXR1cm5zOgog ICogMCBvbiBzdWNjZXNzIG9yIGEgbmVnYXRpdmUgZXJyb3IgY29kZSBvbiBmYWlsdXJlLgpAQCAt MTYzNSw3ICsxNjM1LDcgQEAgaW50IGRybV9tb2RlX2NyZWF0ZV90dl9tYXJnaW5fcHJvcGVydGll cyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2KQogRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jcmVhdGVf dHZfbWFyZ2luX3Byb3BlcnRpZXMpOwogCiAvKioKLSAqIGRybV9tb2RlX2NyZWF0ZV90dl9wcm9w ZXJ0aWVzIC0gY3JlYXRlIFRWIHNwZWNpZmljIGNvbm5lY3RvciBwcm9wZXJ0aWVzCisgKiBkcm1f bW9kZV9jcmVhdGVfdHZfcHJvcGVydGllc19sZWdhY3kgLSBjcmVhdGUgVFYgc3BlY2lmaWMgY29u bmVjdG9yIHByb3BlcnRpZXMKICAqIEBkZXY6IERSTSBkZXZpY2UKICAqIEBudW1fbW9kZXM6IG51 bWJlciBvZiBkaWZmZXJlbnQgVFYgZm9ybWF0cyAobW9kZXMpIHN1cHBvcnRlZAogICogQG1vZGVz OiBhcnJheSBvZiBwb2ludGVycyB0byBzdHJpbmdzIGNvbnRhaW5pbmcgbmFtZSBvZiBlYWNoIGZv cm1hdApAQCAtMTY0OCw5ICsxNjQ4LDkgQEAgRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jcmVhdGVf dHZfbWFyZ2luX3Byb3BlcnRpZXMpOwogICogUmV0dXJuczoKICAqIDAgb24gc3VjY2VzcyBvciBh IG5lZ2F0aXZlIGVycm9yIGNvZGUgb24gZmFpbHVyZS4KICAqLwotaW50IGRybV9tb2RlX2NyZWF0 ZV90dl9wcm9wZXJ0aWVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCi0JCQkJICB1bnNpZ25lZCBp bnQgbnVtX21vZGVzLAotCQkJCSAgY29uc3QgY2hhciAqIGNvbnN0IG1vZGVzW10pCitpbnQgZHJt X21vZGVfY3JlYXRlX3R2X3Byb3BlcnRpZXNfbGVnYWN5KHN0cnVjdCBkcm1fZGV2aWNlICpkZXYs CisJCQkJCSB1bnNpZ25lZCBpbnQgbnVtX21vZGVzLAorCQkJCQkgY29uc3QgY2hhciAqIGNvbnN0 IG1vZGVzW10pCiB7CiAJc3RydWN0IGRybV9wcm9wZXJ0eSAqdHZfc2VsZWN0b3I7CiAJc3RydWN0 IGRybV9wcm9wZXJ0eSAqdHZfc3ViY29ubmVjdG9yOwpAQCAtMTczMyw3ICsxNzMzLDcgQEAgaW50 IGRybV9tb2RlX2NyZWF0ZV90dl9wcm9wZXJ0aWVzKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsCiBu b21lbToKIAlyZXR1cm4gLUVOT01FTTsKIH0KLUVYUE9SVF9TWU1CT0woZHJtX21vZGVfY3JlYXRl X3R2X3Byb3BlcnRpZXMpOworRVhQT1JUX1NZTUJPTChkcm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVy dGllc19sZWdhY3kpOwogCiAvKioKICAqIGRybV9tb2RlX2NyZWF0ZV9zY2FsaW5nX21vZGVfcHJv cGVydHkgLSBjcmVhdGUgc2NhbGluZyBtb2RlIHByb3BlcnR5CmRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vZ3VkL2d1ZF9jb25uZWN0b3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9ndWQvZ3VkX2Nv bm5lY3Rvci5jCmluZGV4IDg2ZTk5MmIyMTA4Yi4uMDM0ZTc4MzYwZDRmIDEwMDY0NAotLS0gYS9k cml2ZXJzL2dwdS9kcm0vZ3VkL2d1ZF9jb25uZWN0b3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v Z3VkL2d1ZF9jb25uZWN0b3IuYwpAQCAtNDAwLDcgKzQwMCw3IEBAIHN0YXRpYyBpbnQgZ3VkX2Nv bm5lY3Rvcl9hZGRfdHZfbW9kZShzdHJ1Y3QgZ3VkX2RldmljZSAqZ2RybSwgc3RydWN0IGRybV9j b25uZWN0CiAJZm9yIChpID0gMDsgaSA8IG51bV9tb2RlczsgaSsrKQogCQltb2Rlc1tpXSA9ICZi dWZbaSAqIEdVRF9DT05ORUNUT1JfVFZfTU9ERV9OQU1FX0xFTl07CiAKLQlyZXQgPSBkcm1fbW9k ZV9jcmVhdGVfdHZfcHJvcGVydGllcyhjb25uZWN0b3ItPmRldiwgbnVtX21vZGVzLCBtb2Rlcyk7 CisJcmV0ID0gZHJtX21vZGVfY3JlYXRlX3R2X3Byb3BlcnRpZXNfbGVnYWN5KGNvbm5lY3Rvci0+ ZGV2LCBudW1fbW9kZXMsIG1vZGVzKTsKIGZyZWU6CiAJa2ZyZWUoYnVmKTsKIAlpZiAocmV0IDwg MCkKQEAgLTUzOSw3ICs1MzksNyBAQCBzdGF0aWMgaW50IGd1ZF9jb25uZWN0b3JfYWRkX3Byb3Bl cnRpZXMoc3RydWN0IGd1ZF9kZXZpY2UgKmdkcm0sIHN0cnVjdCBndWRfY29ubgogCQkJZmFsbHRo cm91Z2g7CiAJCWNhc2UgR1VEX1BST1BFUlRZX1RWX0hVRToKIAkJCS8qIFRoaXMgaXMgYSBuby1v cCBpZiBhbHJlYWR5IGFkZGVkLiAqLwotCQkJcmV0ID0gZHJtX21vZGVfY3JlYXRlX3R2X3Byb3Bl cnRpZXMoZHJtLCAwLCBOVUxMKTsKKwkJCXJldCA9IGRybV9tb2RlX2NyZWF0ZV90dl9wcm9wZXJ0 aWVzX2xlZ2FjeShkcm0sIDAsIE5VTEwpOwogCQkJaWYgKHJldCkKIAkJCQlnb3RvIG91dDsKIAkJ CWJyZWFrOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2kyYy9jaDcwMDZfZHJ2LmMgYi9k cml2ZXJzL2dwdS9kcm0vaTJjL2NoNzAwNl9kcnYuYwppbmRleCBlZjY5ZjliZGVhY2UuLmI2M2Jh ZDA0YjA5ZCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2kyYy9jaDcwMDZfZHJ2LmMKKysr IGIvZHJpdmVycy9ncHUvZHJtL2kyYy9jaDcwMDZfZHJ2LmMKQEAgLTI1MCw3ICsyNTAsNyBAQCBz dGF0aWMgaW50IGNoNzAwNl9lbmNvZGVyX2NyZWF0ZV9yZXNvdXJjZXMoc3RydWN0IGRybV9lbmNv ZGVyICplbmNvZGVyLAogCXN0cnVjdCBkcm1fZGV2aWNlICpkZXYgPSBlbmNvZGVyLT5kZXY7CiAJ c3RydWN0IGRybV9tb2RlX2NvbmZpZyAqY29uZiA9ICZkZXYtPm1vZGVfY29uZmlnOwogCi0JZHJt X21vZGVfY3JlYXRlX3R2X3Byb3BlcnRpZXMoZGV2LCBOVU1fVFZfTk9STVMsIGNoNzAwNl90dl9u b3JtX25hbWVzKTsKKwlkcm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVydGllc19sZWdhY3koZGV2LCBO VU1fVFZfTk9STVMsIGNoNzAwNl90dl9ub3JtX25hbWVzKTsKIAogCXByaXYtPnNjYWxlX3Byb3Bl cnR5ID0gZHJtX3Byb3BlcnR5X2NyZWF0ZV9yYW5nZShkZXYsIDAsICJzY2FsZSIsIDAsIDIpOwog CWlmICghcHJpdi0+c2NhbGVfcHJvcGVydHkpCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0v aTkxNS9kaXNwbGF5L2ludGVsX3R2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9kaXNwbGF5L2lu dGVsX3R2LmMKaW5kZXggYjJmNDJiZjkyOWUyLi43NDg4MjFlYmRmNjUgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9pOTE1L2Rpc3BsYXkvaW50ZWxfdHYuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vaTkxNS9kaXNwbGF5L2ludGVsX3R2LmMKQEAgLTE5OTUsNyArMTk5NSw3IEBAIGludGVsX3R2 X2luaXQoc3RydWN0IGRybV9pOTE1X3ByaXZhdGUgKmRldl9wcml2KQogCiAJCXR2X2Zvcm1hdF9u YW1lc1tpXSA9IHR2X21vZGVzW2ldLm5hbWU7CiAJfQotCWRybV9tb2RlX2NyZWF0ZV90dl9wcm9w ZXJ0aWVzKGRldiwgaSwgdHZfZm9ybWF0X25hbWVzKTsKKwlkcm1fbW9kZV9jcmVhdGVfdHZfcHJv cGVydGllc19sZWdhY3koZGV2LCBpLCB0dl9mb3JtYXRfbmFtZXMpOwogCiAJZHJtX29iamVjdF9h dHRhY2hfcHJvcGVydHkoJmNvbm5lY3Rvci0+YmFzZSwKIAkJCQkgICBkZXYtPm1vZGVfY29uZmln LmxlZ2FjeV90dl9tb2RlX3Byb3BlcnR5LApkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL25v dXZlYXUvZGlzcG52MDQvdHZudjE3LmMgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9kaXNwbnYw NC90dm52MTcuYwppbmRleCAxYTE1NTM0YWRjNjAuLmU1NDgwZGFiNTVlMyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvZGlzcG52MDQvdHZudjE3LmMKKysrIGIvZHJpdmVycy9n cHUvZHJtL25vdXZlYXUvZGlzcG52MDQvdHZudjE3LmMKQEAgLTY1Myw3ICs2NTMsNyBAQCBzdGF0 aWMgaW50IG52MTdfdHZfY3JlYXRlX3Jlc291cmNlcyhzdHJ1Y3QgZHJtX2VuY29kZXIgKmVuY29k ZXIsCiAJCQl0dl9lbmMtPnR2X25vcm0gPSBpOwogCX0KIAotCWRybV9tb2RlX2NyZWF0ZV90dl9w cm9wZXJ0aWVzKGRldiwgbnVtX3R2X25vcm1zLCBudjE3X3R2X25vcm1fbmFtZXMpOworCWRybV9t b2RlX2NyZWF0ZV90dl9wcm9wZXJ0aWVzX2xlZ2FjeShkZXYsIG51bV90dl9ub3JtcywgbnYxN190 dl9ub3JtX25hbWVzKTsKIAogCWRybV9vYmplY3RfYXR0YWNoX3Byb3BlcnR5KCZjb25uZWN0b3It PmJhc2UsCiAJCQkJCWNvbmYtPnR2X3NlbGVjdF9zdWJjb25uZWN0b3JfcHJvcGVydHksCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF92ZWMuYyBiL2RyaXZlcnMvZ3B1L2RybS92 YzQvdmM0X3ZlYy5jCmluZGV4IGU2MDQzY2Y1ZDQwZS4uYWRjOWJmOTllM2ZkIDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF92ZWMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0 L3ZjNF92ZWMuYwpAQCAtNTE0LDggKzUxNCw5IEBAIHN0YXRpYyBpbnQgdmM0X3ZlY19iaW5kKHN0 cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IGRldmljZSAqbWFzdGVyLCB2b2lkICpkYXRhKQogCXN0 cnVjdCB2YzRfdmVjICp2ZWM7CiAJaW50IHJldDsKIAotCXJldCA9IGRybV9tb2RlX2NyZWF0ZV90 dl9wcm9wZXJ0aWVzKGRybSwgQVJSQVlfU0laRSh0dl9tb2RlX25hbWVzKSwKLQkJCQkJICAgIHR2 X21vZGVfbmFtZXMpOworCXJldCA9IGRybV9tb2RlX2NyZWF0ZV90dl9wcm9wZXJ0aWVzX2xlZ2Fj eShkcm0sCisJCQkJCQkgICBBUlJBWV9TSVpFKHR2X21vZGVfbmFtZXMpLAorCQkJCQkJICAgdHZf bW9kZV9uYW1lcyk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIApkaWZmIC0tZ2l0IGEvaW5j bHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oIGIvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oCmlu ZGV4IGY5M2Y4MzE2MWVkNS4uZTFjODhhZTAxNDlhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9k cm1fY29ubmVjdG9yLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJtX2Nvbm5lY3Rvci5oCkBAIC0xNzk5 LDkgKzE3OTksOSBAQCBpbnQgZHJtX21vZGVfY3JlYXRlX2R2aV9pX3Byb3BlcnRpZXMoc3RydWN0 IGRybV9kZXZpY2UgKmRldik7CiB2b2lkIGRybV9jb25uZWN0b3JfYXR0YWNoX2RwX3N1YmNvbm5l Y3Rvcl9wcm9wZXJ0eShzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG9yKTsKIAogaW50IGRy bV9tb2RlX2NyZWF0ZV90dl9tYXJnaW5fcHJvcGVydGllcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 KTsKLWludCBkcm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVydGllcyhzdHJ1Y3QgZHJtX2RldmljZSAq ZGV2LAotCQkJCSAgdW5zaWduZWQgaW50IG51bV9tb2RlcywKLQkJCQkgIGNvbnN0IGNoYXIgKiBj b25zdCBtb2Rlc1tdKTsKK2ludCBkcm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVydGllc19sZWdhY3ko c3RydWN0IGRybV9kZXZpY2UgKmRldiwKKwkJCQkJIHVuc2lnbmVkIGludCBudW1fbW9kZXMsCisJ CQkJCSBjb25zdCBjaGFyICogY29uc3QgbW9kZXNbXSk7CiB2b2lkIGRybV9jb25uZWN0b3JfYXR0 YWNoX3R2X21hcmdpbl9wcm9wZXJ0aWVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uKTsKIGlu dCBkcm1fbW9kZV9jcmVhdGVfc2NhbGluZ19tb2RlX3Byb3BlcnR5KHN0cnVjdCBkcm1fZGV2aWNl ICpkZXYpOwogaW50IGRybV9jb25uZWN0b3JfYXR0YWNoX2NvbnRlbnRfdHlwZV9wcm9wZXJ0eShz dHJ1Y3QgZHJtX2Nvbm5lY3RvciAqZGV2KTsKCi0tIApiNCAwLjExLjAtZGV2LTk5ZTNhCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2Vy bmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0 cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVs Cg==