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 7D7F5C4332F for ; Mon, 7 Nov 2022 14:17:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DFAD10E327; Mon, 7 Nov 2022 14:17:04 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id C38DF10E325; Mon, 7 Nov 2022 14:16:55 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id C12C32B05E60; Mon, 7 Nov 2022 09:16:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:16:55 -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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=k sLeOkeV4ma3hghCmEGtFb1EFdhH/oYJuNu26Pt1SdDTJmsbQmr6fORRpQVGWSK10 81EtrRZMRVmq23a4ZRc8CaTatg1phpJIsv440bxSA40DcPojyeM5eKodek9qbFq/ DoiZR8EFvZkngNLTHrxcyK11T08PDfG8io36dt83xKCFKDm4FTQ5PfWpa6bHipfV w3N+sYf+JiNrWazjIvWqSg063buasU+wzXl84MS54/Sd/tKnqiOfBce4XpwGqQgr NNca1UDRWfFLH8Jal2TqQBVG6blKAHKTNweLwYsF5dFqf7cDwUjIDPR1NDgM/UqL IVShsHsF6FjRMnlO3wYYg== 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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=h U4rrn9I03qKmAIRaztcUi3GSEnEB/RhJmqjrkVFq5FkNU4lmna8NTmkZSaiOavPf 6PKkCS03ytPSWTtiIzmCJpZZ8ZCn/UV8ecteKhvpFKMF5NrB9kjXYo8s3vgN1Mgj dZFpmlQ/DGzhmR9mbJUx98S1MljB3wBDQqUdIdNs6Ss4H4+Knm+ZfvzBZymKnjxr xvAbLeoaizih9ED9NifnHraCzWMPZy6dBumnEJphovJQVZhvqDdm1CTEko6iDoN0 4rYVODJ7Ejc6JRfPmBTBUBckNEwqXDgLFDvO8iMBW+UR5jyhcNCGm8m+OkZ6njeq SdIkhrQSqAB0+mNprTVVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:16:50 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:29 +0100 Subject: [PATCH v7 03/23] drm/connector: Only register TV mode property if present MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-3-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=1618; i=maxime@cerno.tech; h=from:subject:message-id; bh=JMejCU/s/gpF+Xr3qgC8U1y+p70nBDad28T6UzRMYXQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYNWgf/fprJvj19x/1zi2ytXNQkLxyr+fTadKvmrHju x7PSO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR4ycZGV6KrL2oa2zy3MbpYPTKi/ J1XE/natSe7FWKt8sPLLibPYfhD+dr5cw/+wPXXTstIznngoNPwOZQ+de7HrBeVHXYXMruwQwA 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 drm_create_tv_properties() will create the TV mode property unconditionally. However, since we'll gradually phase it out, let's register it only if we have a list passed as an argument. This will make the transition easier. Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 98bfbaf29273..6e9e2f96f3a8 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1690,15 +1690,18 @@ int drm_mode_create_tv_properties(struct drm_device *dev, if (drm_mode_create_tv_margin_properties(dev)) goto nomem; - dev->mode_config.legacy_tv_mode_property = - drm_property_create(dev, DRM_MODE_PROP_ENUM, - "mode", num_modes); - if (!dev->mode_config.legacy_tv_mode_property) - goto nomem; - for (i = 0; i < num_modes; i++) - drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, - i, modes[i]); + if (num_modes) { + dev->mode_config.legacy_tv_mode_property = + drm_property_create(dev, DRM_MODE_PROP_ENUM, + "mode", num_modes); + if (!dev->mode_config.legacy_tv_mode_property) + goto nomem; + + for (i = 0; i < num_modes; i++) + drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, + i, modes[i]); + } dev->mode_config.tv_brightness_property = drm_property_create_range(dev, 0, "brightness", 0, 100); -- b4 0.11.0-dev-99e3a 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 94583BA55 for ; Mon, 7 Nov 2022 14:16:55 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id C12C32B05E60; Mon, 7 Nov 2022 09:16:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:16:55 -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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=k sLeOkeV4ma3hghCmEGtFb1EFdhH/oYJuNu26Pt1SdDTJmsbQmr6fORRpQVGWSK10 81EtrRZMRVmq23a4ZRc8CaTatg1phpJIsv440bxSA40DcPojyeM5eKodek9qbFq/ DoiZR8EFvZkngNLTHrxcyK11T08PDfG8io36dt83xKCFKDm4FTQ5PfWpa6bHipfV w3N+sYf+JiNrWazjIvWqSg063buasU+wzXl84MS54/Sd/tKnqiOfBce4XpwGqQgr NNca1UDRWfFLH8Jal2TqQBVG6blKAHKTNweLwYsF5dFqf7cDwUjIDPR1NDgM/UqL IVShsHsF6FjRMnlO3wYYg== 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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=h U4rrn9I03qKmAIRaztcUi3GSEnEB/RhJmqjrkVFq5FkNU4lmna8NTmkZSaiOavPf 6PKkCS03ytPSWTtiIzmCJpZZ8ZCn/UV8ecteKhvpFKMF5NrB9kjXYo8s3vgN1Mgj dZFpmlQ/DGzhmR9mbJUx98S1MljB3wBDQqUdIdNs6Ss4H4+Knm+ZfvzBZymKnjxr xvAbLeoaizih9ED9NifnHraCzWMPZy6dBumnEJphovJQVZhvqDdm1CTEko6iDoN0 4rYVODJ7Ejc6JRfPmBTBUBckNEwqXDgLFDvO8iMBW+UR5jyhcNCGm8m+OkZ6njeq SdIkhrQSqAB0+mNprTVVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:16:50 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:29 +0100 Subject: [PATCH v7 03/23] drm/connector: Only register TV mode property if present 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-3-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=1618; i=maxime@cerno.tech; h=from:subject:message-id; bh=JMejCU/s/gpF+Xr3qgC8U1y+p70nBDad28T6UzRMYXQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYNWgf/fprJvj19x/1zi2ytXNQkLxyr+fTadKvmrHju x7PSO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR4ycZGV6KrL2oa2zy3MbpYPTKi/ J1XE/natSe7FWKt8sPLLibPYfhD+dr5cw/+wPXXTstIznngoNPwOZQ+de7HrBeVHXYXMruwQwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The drm_create_tv_properties() will create the TV mode property unconditionally. However, since we'll gradually phase it out, let's register it only if we have a list passed as an argument. This will make the transition easier. Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 98bfbaf29273..6e9e2f96f3a8 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1690,15 +1690,18 @@ int drm_mode_create_tv_properties(struct drm_device *dev, if (drm_mode_create_tv_margin_properties(dev)) goto nomem; - dev->mode_config.legacy_tv_mode_property = - drm_property_create(dev, DRM_MODE_PROP_ENUM, - "mode", num_modes); - if (!dev->mode_config.legacy_tv_mode_property) - goto nomem; - for (i = 0; i < num_modes; i++) - drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, - i, modes[i]); + if (num_modes) { + dev->mode_config.legacy_tv_mode_property = + drm_property_create(dev, DRM_MODE_PROP_ENUM, + "mode", num_modes); + if (!dev->mode_config.legacy_tv_mode_property) + goto nomem; + + for (i = 0; i < num_modes; i++) + drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, + i, modes[i]); + } dev->mode_config.tv_brightness_property = drm_property_create_range(dev, 0, "brightness", 0, 100); -- 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 755AAC433FE for ; Mon, 7 Nov 2022 14:17:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 489E910E31E; Mon, 7 Nov 2022 14:17:06 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id C38DF10E325; Mon, 7 Nov 2022 14:16:55 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id C12C32B05E60; Mon, 7 Nov 2022 09:16:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:16:55 -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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=k sLeOkeV4ma3hghCmEGtFb1EFdhH/oYJuNu26Pt1SdDTJmsbQmr6fORRpQVGWSK10 81EtrRZMRVmq23a4ZRc8CaTatg1phpJIsv440bxSA40DcPojyeM5eKodek9qbFq/ DoiZR8EFvZkngNLTHrxcyK11T08PDfG8io36dt83xKCFKDm4FTQ5PfWpa6bHipfV w3N+sYf+JiNrWazjIvWqSg063buasU+wzXl84MS54/Sd/tKnqiOfBce4XpwGqQgr NNca1UDRWfFLH8Jal2TqQBVG6blKAHKTNweLwYsF5dFqf7cDwUjIDPR1NDgM/UqL IVShsHsF6FjRMnlO3wYYg== 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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=h U4rrn9I03qKmAIRaztcUi3GSEnEB/RhJmqjrkVFq5FkNU4lmna8NTmkZSaiOavPf 6PKkCS03ytPSWTtiIzmCJpZZ8ZCn/UV8ecteKhvpFKMF5NrB9kjXYo8s3vgN1Mgj dZFpmlQ/DGzhmR9mbJUx98S1MljB3wBDQqUdIdNs6Ss4H4+Knm+ZfvzBZymKnjxr xvAbLeoaizih9ED9NifnHraCzWMPZy6dBumnEJphovJQVZhvqDdm1CTEko6iDoN0 4rYVODJ7Ejc6JRfPmBTBUBckNEwqXDgLFDvO8iMBW+UR5jyhcNCGm8m+OkZ6njeq SdIkhrQSqAB0+mNprTVVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:16:50 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:29 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-3-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=1618; i=maxime@cerno.tech; h=from:subject:message-id; bh=JMejCU/s/gpF+Xr3qgC8U1y+p70nBDad28T6UzRMYXQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYNWgf/fprJvj19x/1zi2ytXNQkLxyr+fTadKvmrHju x7PSO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR4ycZGV6KrL2oa2zy3MbpYPTKi/ J1XE/natSe7FWKt8sPLLibPYfhD+dr5cw/+wPXXTstIznngoNPwOZQ+de7HrBeVHXYXMruwQwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Nouveau] [PATCH v7 03/23] drm/connector: Only register TV mode property if present 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 drm_create_tv_properties() will create the TV mode property unconditionally. However, since we'll gradually phase it out, let's register it only if we have a list passed as an argument. This will make the transition easier. Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 98bfbaf29273..6e9e2f96f3a8 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1690,15 +1690,18 @@ int drm_mode_create_tv_properties(struct drm_device *dev, if (drm_mode_create_tv_margin_properties(dev)) goto nomem; - dev->mode_config.legacy_tv_mode_property = - drm_property_create(dev, DRM_MODE_PROP_ENUM, - "mode", num_modes); - if (!dev->mode_config.legacy_tv_mode_property) - goto nomem; - for (i = 0; i < num_modes; i++) - drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, - i, modes[i]); + if (num_modes) { + dev->mode_config.legacy_tv_mode_property = + drm_property_create(dev, DRM_MODE_PROP_ENUM, + "mode", num_modes); + if (!dev->mode_config.legacy_tv_mode_property) + goto nomem; + + for (i = 0; i < num_modes; i++) + drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, + i, modes[i]); + } dev->mode_config.tv_brightness_property = drm_property_create_range(dev, 0, "brightness", 0, 100); -- 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 8F56DC43219 for ; Mon, 7 Nov 2022 14:17:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2F3D710E32D; Mon, 7 Nov 2022 14:17:11 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id C38DF10E325; Mon, 7 Nov 2022 14:16:55 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id C12C32B05E60; Mon, 7 Nov 2022 09:16:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:16:55 -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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=k sLeOkeV4ma3hghCmEGtFb1EFdhH/oYJuNu26Pt1SdDTJmsbQmr6fORRpQVGWSK10 81EtrRZMRVmq23a4ZRc8CaTatg1phpJIsv440bxSA40DcPojyeM5eKodek9qbFq/ DoiZR8EFvZkngNLTHrxcyK11T08PDfG8io36dt83xKCFKDm4FTQ5PfWpa6bHipfV w3N+sYf+JiNrWazjIvWqSg063buasU+wzXl84MS54/Sd/tKnqiOfBce4XpwGqQgr NNca1UDRWfFLH8Jal2TqQBVG6blKAHKTNweLwYsF5dFqf7cDwUjIDPR1NDgM/UqL IVShsHsF6FjRMnlO3wYYg== 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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=h U4rrn9I03qKmAIRaztcUi3GSEnEB/RhJmqjrkVFq5FkNU4lmna8NTmkZSaiOavPf 6PKkCS03ytPSWTtiIzmCJpZZ8ZCn/UV8ecteKhvpFKMF5NrB9kjXYo8s3vgN1Mgj dZFpmlQ/DGzhmR9mbJUx98S1MljB3wBDQqUdIdNs6Ss4H4+Knm+ZfvzBZymKnjxr xvAbLeoaizih9ED9NifnHraCzWMPZy6dBumnEJphovJQVZhvqDdm1CTEko6iDoN0 4rYVODJ7Ejc6JRfPmBTBUBckNEwqXDgLFDvO8iMBW+UR5jyhcNCGm8m+OkZ6njeq SdIkhrQSqAB0+mNprTVVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:16:50 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:29 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-3-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=1618; i=maxime@cerno.tech; h=from:subject:message-id; bh=JMejCU/s/gpF+Xr3qgC8U1y+p70nBDad28T6UzRMYXQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYNWgf/fprJvj19x/1zi2ytXNQkLxyr+fTadKvmrHju x7PSO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR4ycZGV6KrL2oa2zy3MbpYPTKi/ J1XE/natSe7FWKt8sPLLibPYfhD+dr5cw/+wPXXTstIznngoNPwOZQ+de7HrBeVHXYXMruwQwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Intel-gfx] [PATCH v7 03/23] drm/connector: Only register TV mode property if present 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 drm_create_tv_properties() will create the TV mode property unconditionally. However, since we'll gradually phase it out, let's register it only if we have a list passed as an argument. This will make the transition easier. Acked-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- drivers/gpu/drm/drm_connector.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 98bfbaf29273..6e9e2f96f3a8 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1690,15 +1690,18 @@ int drm_mode_create_tv_properties(struct drm_device *dev, if (drm_mode_create_tv_margin_properties(dev)) goto nomem; - dev->mode_config.legacy_tv_mode_property = - drm_property_create(dev, DRM_MODE_PROP_ENUM, - "mode", num_modes); - if (!dev->mode_config.legacy_tv_mode_property) - goto nomem; - for (i = 0; i < num_modes; i++) - drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, - i, modes[i]); + if (num_modes) { + dev->mode_config.legacy_tv_mode_property = + drm_property_create(dev, DRM_MODE_PROP_ENUM, + "mode", num_modes); + if (!dev->mode_config.legacy_tv_mode_property) + goto nomem; + + for (i = 0; i < num_modes; i++) + drm_property_add_enum(dev->mode_config.legacy_tv_mode_property, + i, modes[i]); + } dev->mode_config.tv_brightness_property = drm_property_create_range(dev, 0, "brightness", 0, 100); -- 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 35AE1C43217 for ; Mon, 7 Nov 2022 14:19:37 +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=4ed39GL8IgtjM2p8/F9vosCbPSYTh6e/1oyTnVtlbxk=; b=GDSvk4XZ1P5m/i A+OLomOCj5Hb9Ex2pDpaEGdgXbfrD4o++MEewzkj0OGYIcAU4xop/YPWnZS9YlEXYy+IYZ6mhzkgr dDIRoGdkYQw70yvmE6/OYa2Vk+8IISEu+ewatjwZBA5QJUpITK3LP2gz/mGBNhLxjvBJSRu0i9jOb hJyZ3B8lkyUozQ8Q4eG9qW2LLbgv3aU+CP3X5DqfJ+emS2C0CSnFFypbq7w+ixeZgfrTzQhUunF1t 1J989v+A5kJ55k9am8wJeFq6ZKpAAWRi1ny+NgWq5hSzM2EfR28AIAgFlblVdx8WHE0SPlGs1r7DD tfD5FRMkgeubLBQ/E6pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1os2xH-00FAaL-H3; Mon, 07 Nov 2022 14:18:27 +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 1os2vn-00F9g0-Mm for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 14:16:58 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id C12C32B05E60; Mon, 7 Nov 2022 09:16:52 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 07 Nov 2022 09:16:55 -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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=k sLeOkeV4ma3hghCmEGtFb1EFdhH/oYJuNu26Pt1SdDTJmsbQmr6fORRpQVGWSK10 81EtrRZMRVmq23a4ZRc8CaTatg1phpJIsv440bxSA40DcPojyeM5eKodek9qbFq/ DoiZR8EFvZkngNLTHrxcyK11T08PDfG8io36dt83xKCFKDm4FTQ5PfWpa6bHipfV w3N+sYf+JiNrWazjIvWqSg063buasU+wzXl84MS54/Sd/tKnqiOfBce4XpwGqQgr NNca1UDRWfFLH8Jal2TqQBVG6blKAHKTNweLwYsF5dFqf7cDwUjIDPR1NDgM/UqL IVShsHsF6FjRMnlO3wYYg== 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=1667830612; x= 1667837812; bh=fyi2TvlgzV3RXXjQh+4+NY3ECe0Qn799H5ajsQPxG8U=; b=h U4rrn9I03qKmAIRaztcUi3GSEnEB/RhJmqjrkVFq5FkNU4lmna8NTmkZSaiOavPf 6PKkCS03ytPSWTtiIzmCJpZZ8ZCn/UV8ecteKhvpFKMF5NrB9kjXYo8s3vgN1Mgj dZFpmlQ/DGzhmR9mbJUx98S1MljB3wBDQqUdIdNs6Ss4H4+Knm+ZfvzBZymKnjxr xvAbLeoaizih9ED9NifnHraCzWMPZy6dBumnEJphovJQVZhvqDdm1CTEko6iDoN0 4rYVODJ7Ejc6JRfPmBTBUBckNEwqXDgLFDvO8iMBW+UR5jyhcNCGm8m+OkZ6njeq SdIkhrQSqAB0+mNprTVVw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:16:50 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:29 +0100 Subject: [PATCH v7 03/23] drm/connector: Only register TV mode property if present MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v7-3-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=1618; i=maxime@cerno.tech; h=from:subject:message-id; bh=JMejCU/s/gpF+Xr3qgC8U1y+p70nBDad28T6UzRMYXQ=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwvYNWgf/fprJvj19x/1zi2ytXNQkLxyr+fTadKvmrHju x7PSO0pZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCR4ycZGV6KrL2oa2zy3MbpYPTKi/ J1XE/natSe7FWKt8sPLLibPYfhD+dr5cw/+wPXXTstIznngoNPwOZQ+de7HrBeVHXYXMruwQwA 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_061655_824932_A5DC3674 X-CRM114-Status: GOOD ( 11.35 ) 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 VGhlIGRybV9jcmVhdGVfdHZfcHJvcGVydGllcygpIHdpbGwgY3JlYXRlIHRoZSBUViBtb2RlIHBy b3BlcnR5CnVuY29uZGl0aW9uYWxseS4KCkhvd2V2ZXIsIHNpbmNlIHdlJ2xsIGdyYWR1YWxseSBw aGFzZSBpdCBvdXQsIGxldCdzIHJlZ2lzdGVyIGl0IG9ubHkgaWYgd2UKaGF2ZSBhIGxpc3QgcGFz c2VkIGFzIGFuIGFyZ3VtZW50LiBUaGlzIHdpbGwgbWFrZSB0aGUgdHJhbnNpdGlvbiBlYXNpZXIu CgpBY2tlZC1ieTogTm9yYWxmIFRyw7hubmVzIDxub3JhbGZAdHJvbm5lcy5vcmc+ClNpZ25lZC1v ZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50ZWNoPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9kcm1fY29ubmVjdG9yLmMgfCAxOSArKysrKysrKysrKy0tLS0tLS0tCiAxIGZpbGUgY2hh bmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0 b3IuYwppbmRleCA5OGJmYmFmMjkyNzMuLjZlOWUyZjk2ZjNhOCAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5l Y3Rvci5jCkBAIC0xNjkwLDE1ICsxNjkwLDE4IEBAIGludCBkcm1fbW9kZV9jcmVhdGVfdHZfcHJv cGVydGllcyhzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCWlmIChkcm1fbW9kZV9jcmVhdGVfdHZf bWFyZ2luX3Byb3BlcnRpZXMoZGV2KSkKIAkJZ290byBub21lbTsKIAotCWRldi0+bW9kZV9jb25m aWcubGVnYWN5X3R2X21vZGVfcHJvcGVydHkgPQotCQlkcm1fcHJvcGVydHlfY3JlYXRlKGRldiwg RFJNX01PREVfUFJPUF9FTlVNLAotCQkJCSAgICAibW9kZSIsIG51bV9tb2Rlcyk7Ci0JaWYgKCFk ZXYtPm1vZGVfY29uZmlnLmxlZ2FjeV90dl9tb2RlX3Byb3BlcnR5KQotCQlnb3RvIG5vbWVtOwog Ci0JZm9yIChpID0gMDsgaSA8IG51bV9tb2RlczsgaSsrKQotCQlkcm1fcHJvcGVydHlfYWRkX2Vu dW0oZGV2LT5tb2RlX2NvbmZpZy5sZWdhY3lfdHZfbW9kZV9wcm9wZXJ0eSwKLQkJCQkgICAgICBp LCBtb2Rlc1tpXSk7CisJaWYgKG51bV9tb2RlcykgeworCQlkZXYtPm1vZGVfY29uZmlnLmxlZ2Fj eV90dl9tb2RlX3Byb3BlcnR5ID0KKwkJCWRybV9wcm9wZXJ0eV9jcmVhdGUoZGV2LCBEUk1fTU9E RV9QUk9QX0VOVU0sCisJCQkJCSAgICAibW9kZSIsIG51bV9tb2Rlcyk7CisJCWlmICghZGV2LT5t b2RlX2NvbmZpZy5sZWdhY3lfdHZfbW9kZV9wcm9wZXJ0eSkKKwkJCWdvdG8gbm9tZW07CisKKwkJ Zm9yIChpID0gMDsgaSA8IG51bV9tb2RlczsgaSsrKQorCQkJZHJtX3Byb3BlcnR5X2FkZF9lbnVt KGRldi0+bW9kZV9jb25maWcubGVnYWN5X3R2X21vZGVfcHJvcGVydHksCisJCQkJCSAgICAgIGks IG1vZGVzW2ldKTsKKwl9CiAKIAlkZXYtPm1vZGVfY29uZmlnLnR2X2JyaWdodG5lc3NfcHJvcGVy dHkgPQogCQlkcm1fcHJvcGVydHlfY3JlYXRlX3JhbmdlKGRldiwgMCwgImJyaWdodG5lc3MiLCAw LCAxMDApOwoKLS0gCmI0IDAuMTEuMC1kZXYtOTllM2EKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0Cmxp bnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFk Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK