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 6F281BA55 for ; Mon, 7 Nov 2022 14:17:24 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id F2BBC2B05E60; Mon, 7 Nov 2022 09:17:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:17:24 -0500 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=fm2; t=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=A l5I+53NvF/3kJYph2+PsxaNTCxRBJhmgu6YvDTiCRlZAn/oxwzm7qWFQbAQjGDp2 QRJa8tQ1xeEGdpkgTQdDlEiOmApHSwR2Rtr230hwt9JBsL21eqcERmXlSjocOIfO FTQHRayxhaQKXJp0KZBQb84jMKCZPrbnxfjB9RAgViIKvwmMJJDtajOIeoJDVZgH M9Ce3xaEzugil6eC+Wjz7+d4yxl76Ic10iP68L/nDukJhg3+zyF0bIUSDamv+jw+ 7mIQIfvnUUocSR0rDFzWGsuvitL6PdptzBS9jM4ObWN0rPUGcMDkC+ibGVhTsgCb qYXrTTZQxiq2OYZT8Zn5g== 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=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=T b/9BoGAJxgdYClum5zGkfVrrmDADkJnlHBig+tRw8ooWolZozxgabUpkvfzFn/1v PYQpknr1oi1CUNhGPzIzEUNwVJ2fGMXOa8zjwwiRQZRaWHeB2jsuma220rq4zbgH kLLlfozrp04z59O6nfznC9zJzUWuy37VOOoBNZqlqYMg59//jkx92MSJMca8Ndvb ZWuEeQDsdF3dkmBEdkK6HuxChu8s53yccsPMs2dLzTNVFzssF0eOaK7dhpPZUVcD RXnqGbVeailIE3NzjdDyDc0Edz/knRJ9UPBhS9gbK9MtLoeSwTKaug48X0Qan99N 839zrMrY0IROGa8cTIiFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:20 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:35 +0100 Subject: [PATCH v7 09/23] drm/modes: Switch to named mode descriptors 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-v7-9-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie Cc: Phil Elwell , Maxime Ripard , Hans de Goede , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Dave Stevenson , linux-arm-kernel@lists.infradead.org, Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, Noralf Trønnes X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; i=maxime@cerno.tech; h=from:subject:message-id; bh=LGxFbW1leMxSUo+AXGr7lI8fRey9Y1cyWt8jC4z5gpk=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7Ox0RzQo8J3Rb8Hnv0wyKBEyZHL22t1IzWZNpiKXmA dW5uRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbCIcPIcDr5dKDHC+6j62+Yc85j/l l+++f1p+qnyzT0WCYGFn/tVGBkWJQ/q6i1q7Z+u7nOXYk9DSe4/thGHdluvuxdrvrf3S6beAE= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The current named mode parsing relies only on the mode name, and doesn't allow to specify any other parameter. Let's convert that string list to an array of a custom structure that will hold the name and some additional parameters in the future. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v7: - Fix typo in the commit log - Add Noralf Reviewed-by --- drivers/gpu/drm/drm_modes.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 37542612912b..7594b657f86a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2224,9 +2224,13 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -static const char * const drm_named_modes_whitelist[] = { - "NTSC", - "PAL", +struct drm_named_mode { + const char *name; +}; + +static const struct drm_named_mode drm_named_modes[] = { + { "NTSC", }, + { "PAL", }, }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2258,14 +2262,15 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at this point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { + const struct drm_named_mode *mode = &drm_named_modes[i]; int ret; - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); + ret = str_has_prefix(name, mode->name); if (ret != name_end) continue; - strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]); + strcpy(cmdline_mode->name, mode->name); cmdline_mode->specified = true; return 1; -- 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 44A5DC43217 for ; Mon, 7 Nov 2022 14:18:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8911E10E338; Mon, 7 Nov 2022 14:17:31 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2D9710E339; Mon, 7 Nov 2022 14:17:24 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id F2BBC2B05E60; Mon, 7 Nov 2022 09:17:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:17:24 -0500 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=fm2; t=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=A l5I+53NvF/3kJYph2+PsxaNTCxRBJhmgu6YvDTiCRlZAn/oxwzm7qWFQbAQjGDp2 QRJa8tQ1xeEGdpkgTQdDlEiOmApHSwR2Rtr230hwt9JBsL21eqcERmXlSjocOIfO FTQHRayxhaQKXJp0KZBQb84jMKCZPrbnxfjB9RAgViIKvwmMJJDtajOIeoJDVZgH M9Ce3xaEzugil6eC+Wjz7+d4yxl76Ic10iP68L/nDukJhg3+zyF0bIUSDamv+jw+ 7mIQIfvnUUocSR0rDFzWGsuvitL6PdptzBS9jM4ObWN0rPUGcMDkC+ibGVhTsgCb qYXrTTZQxiq2OYZT8Zn5g== 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=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=T b/9BoGAJxgdYClum5zGkfVrrmDADkJnlHBig+tRw8ooWolZozxgabUpkvfzFn/1v PYQpknr1oi1CUNhGPzIzEUNwVJ2fGMXOa8zjwwiRQZRaWHeB2jsuma220rq4zbgH kLLlfozrp04z59O6nfznC9zJzUWuy37VOOoBNZqlqYMg59//jkx92MSJMca8Ndvb ZWuEeQDsdF3dkmBEdkK6HuxChu8s53yccsPMs2dLzTNVFzssF0eOaK7dhpPZUVcD RXnqGbVeailIE3NzjdDyDc0Edz/knRJ9UPBhS9gbK9MtLoeSwTKaug48X0Qan99N 839zrMrY0IROGa8cTIiFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:20 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:35 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-9-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; i=maxime@cerno.tech; h=from:subject:message-id; bh=LGxFbW1leMxSUo+AXGr7lI8fRey9Y1cyWt8jC4z5gpk=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7Ox0RzQo8J3Rb8Hnv0wyKBEyZHL22t1IzWZNpiKXmA dW5uRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbCIcPIcDr5dKDHC+6j62+Yc85j/l l+++f1p+qnyzT0WCYGFn/tVGBkWJQ/q6i1q7Z+u7nOXYk9DSe4/thGHdluvuxdrvrf3S6beAE= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Nouveau] [PATCH v7 09/23] drm/modes: Switch to named mode descriptors 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, Phil Elwell , Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" The current named mode parsing relies only on the mode name, and doesn't allow to specify any other parameter. Let's convert that string list to an array of a custom structure that will hold the name and some additional parameters in the future. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v7: - Fix typo in the commit log - Add Noralf Reviewed-by --- drivers/gpu/drm/drm_modes.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 37542612912b..7594b657f86a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2224,9 +2224,13 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -static const char * const drm_named_modes_whitelist[] = { - "NTSC", - "PAL", +struct drm_named_mode { + const char *name; +}; + +static const struct drm_named_mode drm_named_modes[] = { + { "NTSC", }, + { "PAL", }, }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2258,14 +2262,15 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at this point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { + const struct drm_named_mode *mode = &drm_named_modes[i]; int ret; - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); + ret = str_has_prefix(name, mode->name); if (ret != name_end) continue; - strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]); + strcpy(cmdline_mode->name, mode->name); cmdline_mode->specified = true; return 1; -- 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 82420C43219 for ; Mon, 7 Nov 2022 14:18:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A7F010E343; Mon, 7 Nov 2022 14:17:41 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2D9710E339; Mon, 7 Nov 2022 14:17:24 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id F2BBC2B05E60; Mon, 7 Nov 2022 09:17:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:17:24 -0500 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=fm2; t=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=A l5I+53NvF/3kJYph2+PsxaNTCxRBJhmgu6YvDTiCRlZAn/oxwzm7qWFQbAQjGDp2 QRJa8tQ1xeEGdpkgTQdDlEiOmApHSwR2Rtr230hwt9JBsL21eqcERmXlSjocOIfO FTQHRayxhaQKXJp0KZBQb84jMKCZPrbnxfjB9RAgViIKvwmMJJDtajOIeoJDVZgH M9Ce3xaEzugil6eC+Wjz7+d4yxl76Ic10iP68L/nDukJhg3+zyF0bIUSDamv+jw+ 7mIQIfvnUUocSR0rDFzWGsuvitL6PdptzBS9jM4ObWN0rPUGcMDkC+ibGVhTsgCb qYXrTTZQxiq2OYZT8Zn5g== 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=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=T b/9BoGAJxgdYClum5zGkfVrrmDADkJnlHBig+tRw8ooWolZozxgabUpkvfzFn/1v PYQpknr1oi1CUNhGPzIzEUNwVJ2fGMXOa8zjwwiRQZRaWHeB2jsuma220rq4zbgH kLLlfozrp04z59O6nfznC9zJzUWuy37VOOoBNZqlqYMg59//jkx92MSJMca8Ndvb ZWuEeQDsdF3dkmBEdkK6HuxChu8s53yccsPMs2dLzTNVFzssF0eOaK7dhpPZUVcD RXnqGbVeailIE3NzjdDyDc0Edz/knRJ9UPBhS9gbK9MtLoeSwTKaug48X0Qan99N 839zrMrY0IROGa8cTIiFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:20 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:35 +0100 Subject: [PATCH v7 09/23] drm/modes: Switch to named mode descriptors MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-9-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; i=maxime@cerno.tech; h=from:subject:message-id; bh=LGxFbW1leMxSUo+AXGr7lI8fRey9Y1cyWt8jC4z5gpk=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7Ox0RzQo8J3Rb8Hnv0wyKBEyZHL22t1IzWZNpiKXmA dW5uRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbCIcPIcDr5dKDHC+6j62+Yc85j/l l+++f1p+qnyzT0WCYGFn/tVGBkWJQ/q6i1q7Z+u7nOXYk9DSe4/thGHdluvuxdrvrf3S6beAE= 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, Phil Elwell , Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The current named mode parsing relies only on the mode name, and doesn't allow to specify any other parameter. Let's convert that string list to an array of a custom structure that will hold the name and some additional parameters in the future. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v7: - Fix typo in the commit log - Add Noralf Reviewed-by --- drivers/gpu/drm/drm_modes.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 37542612912b..7594b657f86a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2224,9 +2224,13 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -static const char * const drm_named_modes_whitelist[] = { - "NTSC", - "PAL", +struct drm_named_mode { + const char *name; +}; + +static const struct drm_named_mode drm_named_modes[] = { + { "NTSC", }, + { "PAL", }, }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2258,14 +2262,15 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at this point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { + const struct drm_named_mode *mode = &drm_named_modes[i]; int ret; - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); + ret = str_has_prefix(name, mode->name); if (ret != name_end) continue; - strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]); + strcpy(cmdline_mode->name, mode->name); cmdline_mode->specified = true; return 1; -- 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 DE4B6C4332F for ; Mon, 7 Nov 2022 14:18:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7976810E341; Mon, 7 Nov 2022 14:17:37 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2D9710E339; Mon, 7 Nov 2022 14:17:24 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id F2BBC2B05E60; Mon, 7 Nov 2022 09:17:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:17:24 -0500 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=fm2; t=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=A l5I+53NvF/3kJYph2+PsxaNTCxRBJhmgu6YvDTiCRlZAn/oxwzm7qWFQbAQjGDp2 QRJa8tQ1xeEGdpkgTQdDlEiOmApHSwR2Rtr230hwt9JBsL21eqcERmXlSjocOIfO FTQHRayxhaQKXJp0KZBQb84jMKCZPrbnxfjB9RAgViIKvwmMJJDtajOIeoJDVZgH M9Ce3xaEzugil6eC+Wjz7+d4yxl76Ic10iP68L/nDukJhg3+zyF0bIUSDamv+jw+ 7mIQIfvnUUocSR0rDFzWGsuvitL6PdptzBS9jM4ObWN0rPUGcMDkC+ibGVhTsgCb qYXrTTZQxiq2OYZT8Zn5g== 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=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=T b/9BoGAJxgdYClum5zGkfVrrmDADkJnlHBig+tRw8ooWolZozxgabUpkvfzFn/1v PYQpknr1oi1CUNhGPzIzEUNwVJ2fGMXOa8zjwwiRQZRaWHeB2jsuma220rq4zbgH kLLlfozrp04z59O6nfznC9zJzUWuy37VOOoBNZqlqYMg59//jkx92MSJMca8Ndvb ZWuEeQDsdF3dkmBEdkK6HuxChu8s53yccsPMs2dLzTNVFzssF0eOaK7dhpPZUVcD RXnqGbVeailIE3NzjdDyDc0Edz/knRJ9UPBhS9gbK9MtLoeSwTKaug48X0Qan99N 839zrMrY0IROGa8cTIiFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:20 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:35 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-9-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; i=maxime@cerno.tech; h=from:subject:message-id; bh=LGxFbW1leMxSUo+AXGr7lI8fRey9Y1cyWt8jC4z5gpk=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7Ox0RzQo8J3Rb8Hnv0wyKBEyZHL22t1IzWZNpiKXmA dW5uRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbCIcPIcDr5dKDHC+6j62+Yc85j/l l+++f1p+qnyzT0WCYGFn/tVGBkWJQ/q6i1q7Z+u7nOXYk9DSe4/thGHdluvuxdrvrf3S6beAE= X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Intel-gfx] [PATCH v7 09/23] drm/modes: Switch to named mode descriptors 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, Phil Elwell , Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The current named mode parsing relies only on the mode name, and doesn't allow to specify any other parameter. Let's convert that string list to an array of a custom structure that will hold the name and some additional parameters in the future. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v7: - Fix typo in the commit log - Add Noralf Reviewed-by --- drivers/gpu/drm/drm_modes.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 37542612912b..7594b657f86a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2224,9 +2224,13 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -static const char * const drm_named_modes_whitelist[] = { - "NTSC", - "PAL", +struct drm_named_mode { + const char *name; +}; + +static const struct drm_named_mode drm_named_modes[] = { + { "NTSC", }, + { "PAL", }, }; static int drm_mode_parse_cmdline_named_mode(const char *name, @@ -2258,14 +2262,15 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at this point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { + for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { + const struct drm_named_mode *mode = &drm_named_modes[i]; int ret; - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); + ret = str_has_prefix(name, mode->name); if (ret != name_end) continue; - strcpy(cmdline_mode->name, drm_named_modes_whitelist[i]); + strcpy(cmdline_mode->name, mode->name); cmdline_mode->specified = true; return 1; -- 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 E1007C433FE for ; Mon, 7 Nov 2022 14:22:56 +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=DQmlM96Y+Br1qrha7222Z/hV54uRhotmQ2YuVbSRRiY=; b=R2GMfz2d8+yspD mWe2VIjjdEDQqyB2MT3LNSZizK0ke9JerxINCJ9asxhoiwfTv066wV7IWQd/+goWghc3Wn8hurR56 m74MJCa4NJqv2f+YfwRVdUGo38YkeqbqVq9GzucZ5zTUHDy7rNgl8oYX0v7J3CoB5+/RNq/Fe/5ea l0d+qFpkmI1NatLGHfrRomMfTB45vq/kep43iArv3hzufucTuVRFW0kpHekNVkzLTdYcfVPf/mMAJ xxlHZShmwq7qzbxQuhkX3DsHTVf0467tKUwUsCIev1TjMAK68wPxr6J0kS3ArIDPF39a4DSDaUD/p ZxCZ4BolLYjxw6emQLEA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1os30U-00FCFI-LE; Mon, 07 Nov 2022 14:21:47 +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 1os2wG-00F9yn-N7 for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 14:17:26 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id F2BBC2B05E60; Mon, 7 Nov 2022 09:17:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:17:24 -0500 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=fm2; t=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=A l5I+53NvF/3kJYph2+PsxaNTCxRBJhmgu6YvDTiCRlZAn/oxwzm7qWFQbAQjGDp2 QRJa8tQ1xeEGdpkgTQdDlEiOmApHSwR2Rtr230hwt9JBsL21eqcERmXlSjocOIfO FTQHRayxhaQKXJp0KZBQb84jMKCZPrbnxfjB9RAgViIKvwmMJJDtajOIeoJDVZgH M9Ce3xaEzugil6eC+Wjz7+d4yxl76Ic10iP68L/nDukJhg3+zyF0bIUSDamv+jw+ 7mIQIfvnUUocSR0rDFzWGsuvitL6PdptzBS9jM4ObWN0rPUGcMDkC+ibGVhTsgCb qYXrTTZQxiq2OYZT8Zn5g== 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=1667830641; x= 1667837841; bh=XFfcPdcDhcdk33Fszy3XW5ENw976iYEz+wvYF4u8oEs=; b=T b/9BoGAJxgdYClum5zGkfVrrmDADkJnlHBig+tRw8ooWolZozxgabUpkvfzFn/1v PYQpknr1oi1CUNhGPzIzEUNwVJ2fGMXOa8zjwwiRQZRaWHeB2jsuma220rq4zbgH kLLlfozrp04z59O6nfznC9zJzUWuy37VOOoBNZqlqYMg59//jkx92MSJMca8Ndvb ZWuEeQDsdF3dkmBEdkK6HuxChu8s53yccsPMs2dLzTNVFzssF0eOaK7dhpPZUVcD RXnqGbVeailIE3NzjdDyDc0Edz/knRJ9UPBhS9gbK9MtLoeSwTKaug48X0Qan99N 839zrMrY0IROGa8cTIiFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:20 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:35 +0100 Subject: [PATCH v7 09/23] drm/modes: Switch to named mode descriptors MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v7-9-7072a478c6b3@cerno.tech> References: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v7-0-7072a478c6b3@cerno.tech> To: Jani Nikula , Joonas Lahtinen , Tvrtko Ursulin , Ben Skeggs , Rodrigo Vivi , Maxime Ripard , Samuel Holland , Jernej Skrabec , Maarten Lankhorst , Emma Anholt , Karol Herbst , Daniel Vetter , Chen-Yu Tsai , Lyude Paul , Thomas Zimmermann , David Airlie Cc: Phil Elwell , Maxime Ripard , Hans de Goede , linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Dave Stevenson , linux-arm-kernel@lists.infradead.org, Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, nouveau@lists.freedesktop.org, Noralf Trønnes X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=1862; i=maxime@cerno.tech; h=from:subject:message-id; bh=LGxFbW1leMxSUo+AXGr7lI8fRey9Y1cyWt8jC4z5gpk=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7Ox0RzQo8J3Rb8Hnv0wyKBEyZHL22t1IzWZNpiKXmA dW5uRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbCIcPIcDr5dKDHC+6j62+Yc85j/l l+++f1p+qnyzT0WCYGFn/tVGBkWJQ/q6i1q7Z+u7nOXYk9DSe4/thGHdluvuxdrvrf3S6beAE= 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-20221107_061724_857366_BE4A04BB X-CRM114-Status: GOOD ( 14.11 ) 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 VGhlIGN1cnJlbnQgbmFtZWQgbW9kZSBwYXJzaW5nIHJlbGllcyBvbmx5IG9uIHRoZSBtb2RlIG5h bWUsIGFuZCBkb2Vzbid0CmFsbG93IHRvIHNwZWNpZnkgYW55IG90aGVyIHBhcmFtZXRlci4KCkxl dCdzIGNvbnZlcnQgdGhhdCBzdHJpbmcgbGlzdCB0byBhbiBhcnJheSBvZiBhIGN1c3RvbSBzdHJ1 Y3R1cmUgdGhhdCB3aWxsCmhvbGQgdGhlIG5hbWUgYW5kIHNvbWUgYWRkaXRpb25hbCBwYXJhbWV0 ZXJzIGluIHRoZSBmdXR1cmUuCgpSZXZpZXdlZC1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZA dHJvbm5lcy5vcmc+ClNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50 ZWNoPgoKLS0tCkNoYW5nZXMgaW4gdjc6Ci0gRml4IHR5cG8gaW4gdGhlIGNvbW1pdCBsb2cKLSBB ZGQgTm9yYWxmIFJldmlld2VkLWJ5Ci0tLQogZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jIHwg MTcgKysrKysrKysrKystLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCA2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYyBi L2RyaXZlcnMvZ3B1L2RybS9kcm1fbW9kZXMuYwppbmRleCAzNzU0MjYxMjkxMmIuLjc1OTRiNjU3 Zjg2YSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2Rlcy5jCisrKyBiL2RyaXZl cnMvZ3B1L2RybS9kcm1fbW9kZXMuYwpAQCAtMjIyNCw5ICsyMjI0LDEzIEBAIHN0YXRpYyBpbnQg ZHJtX21vZGVfcGFyc2VfY21kbGluZV9vcHRpb25zKGNvbnN0IGNoYXIgKnN0ciwKIAlyZXR1cm4g MDsKIH0KIAotc3RhdGljIGNvbnN0IGNoYXIgKiBjb25zdCBkcm1fbmFtZWRfbW9kZXNfd2hpdGVs aXN0W10gPSB7Ci0JIk5UU0MiLAotCSJQQUwiLAorc3RydWN0IGRybV9uYW1lZF9tb2RlIHsKKwlj b25zdCBjaGFyICpuYW1lOworfTsKKworc3RhdGljIGNvbnN0IHN0cnVjdCBkcm1fbmFtZWRfbW9k ZSBkcm1fbmFtZWRfbW9kZXNbXSA9IHsKKwl7ICJOVFNDIiwgfSwKKwl7ICJQQUwiLCB9LAogfTsK IAogc3RhdGljIGludCBkcm1fbW9kZV9wYXJzZV9jbWRsaW5lX25hbWVkX21vZGUoY29uc3QgY2hh ciAqbmFtZSwKQEAgLTIyNTgsMTQgKzIyNjIsMTUgQEAgc3RhdGljIGludCBkcm1fbW9kZV9wYXJz ZV9jbWRsaW5lX25hbWVkX21vZGUoY29uc3QgY2hhciAqbmFtZSwKIAkgKiBXZSdyZSBzdXJlIHdl J3JlIGEgbmFtZWQgbW9kZSBhdCB0aGlzIHBvaW50LCBpdGVyYXRlIG92ZXIgdGhlCiAJICogbGlz dCBvZiBtb2RlcyB3ZSdyZSBhd2FyZSBvZi4KIAkgKi8KLQlmb3IgKGkgPSAwOyBpIDwgQVJSQVlf U0laRShkcm1fbmFtZWRfbW9kZXNfd2hpdGVsaXN0KTsgaSsrKSB7CisJZm9yIChpID0gMDsgaSA8 IEFSUkFZX1NJWkUoZHJtX25hbWVkX21vZGVzKTsgaSsrKSB7CisJCWNvbnN0IHN0cnVjdCBkcm1f bmFtZWRfbW9kZSAqbW9kZSA9ICZkcm1fbmFtZWRfbW9kZXNbaV07CiAJCWludCByZXQ7CiAKLQkJ cmV0ID0gc3RyX2hhc19wcmVmaXgobmFtZSwgZHJtX25hbWVkX21vZGVzX3doaXRlbGlzdFtpXSk7 CisJCXJldCA9IHN0cl9oYXNfcHJlZml4KG5hbWUsIG1vZGUtPm5hbWUpOwogCQlpZiAocmV0ICE9 IG5hbWVfZW5kKQogCQkJY29udGludWU7CiAKLQkJc3RyY3B5KGNtZGxpbmVfbW9kZS0+bmFtZSwg ZHJtX25hbWVkX21vZGVzX3doaXRlbGlzdFtpXSk7CisJCXN0cmNweShjbWRsaW5lX21vZGUtPm5h bWUsIG1vZGUtPm5hbWUpOwogCQljbWRsaW5lX21vZGUtPnNwZWNpZmllZCA9IHRydWU7CiAKIAkJ cmV0dXJuIDE7CgotLSAKYjQgMC4xMS4wLWRldi05OWUzYQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QK bGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRl YWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=