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 06E1BBA55 for ; Mon, 7 Nov 2022 14:18:02 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 4EF9E2B06707; Mon, 7 Nov 2022 09:17:59 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 07 Nov 2022 09:18:01 -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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=A 9p+g4rFH5v4gnIVU4TKMeKx205irTv6V/LH7m/3CqamG6KP5Pnlh7UyNTTJwgnRo y96JMEGFJkujfIs9V2XPLz5it676l1Rqf9AjQ+swEaC1EE9s5ZunoIkiTMI4OReM 8JBBTsasTeYkAjw6yC2QnbtQYaP7S8u/jJVlQmWkfelK3mNiTbxc2+aTjCTkjjTp pX493G0fzTby40DP7fx1W68vOHl8XVfxASwoh0Zl02qwqimFr1wE+Jdr/ddqXZPP HuYCrj2x4urU8tITiR1O3z+KJauRjS1+aAmK6KHFBepmL9XMfuj5Us/lLloHU+NT xV2ztcc+ZBtkDNOzs0g/g== 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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=r toW4qd3c4NdtJObGCIgY1Qve2MTOnU1hweRzTuWctUvqpAy3qbczeE3pwwYRaMMw 994wvJzZcjvXmSV1HWmI9BmL8T1p8dtRwvBZ8KfjhAycxvdaHKs1/LdMmR4wZRv/ YwidzGLQlG3fAqKlI6v/BJzg+2BiBkZFfCs2WzLm99k6WEU6maImhK41YSprsMd5 jXsEl+2TH8jE/q9Poy4SuTdSiGMedaPqlTBWOlJ27t+5usPOW/tMJZZf7Ra7I+h9 IMaOn2BWnfm62kwsMh2efANalIbbWw3RxhGP7CyH7dSeIhKF/amRiPguZ8ffvloj KDnNumQynFr7ggvIcDIag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:58 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:43 +0100 Subject: [PATCH v7 17/23] drm/atomic-helper: Add a TV properties reset helper 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-17-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=4374; i=maxime@cerno.tech; h=from:subject:message-id; bh=UtWard2Kai/O6yyag/3mB3Zscqt5UbEIDevckU35kvo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7X0iRNVW3bQmawflrw03bh3soPjNd2R206tzta09M/ 4bVSRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbicZmR4dKBsNkqU9pnGvWklYjP2z JBJuKc5u2Xx/SeHv+8QNOq6AfDPw0GVZV5TzLvPZ5QsdxJvLD4/175B/l1V7ySdOyfbfgkzgIA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D The drm_tv_create_properties() function will create a bunch of properties, but it's up to each and every driver using that function to properly reset the state of these properties leading to inconsistent behaviours. Let's create a helper that will take care of it. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v6: - Use tv_mode_specified instead of a !0 tv_mode to set the default --- drivers/gpu/drm/drm_atomic_state_helper.c | 75 +++++++++++++++++++++++++++++++ include/drm/drm_atomic_state_helper.h | 1 + 2 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index dfb57217253b..e1fc3f26340a 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connecto } EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset); +/** + * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector properties + * @connector: DRM connector + * + * Resets the analog TV properties attached to a connector + */ +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_cmdline_mode *cmdline = &connector->cmdline_mode; + struct drm_connector_state *state = connector->state; + struct drm_property *prop; + uint64_t val; + + prop = dev->mode_config.tv_mode_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.mode = val; + + if (cmdline->tv_mode_specified) + state->tv.mode = cmdline->tv_mode; + + prop = dev->mode_config.tv_select_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.select_subconnector = val; + + prop = dev->mode_config.tv_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.subconnector = val; + + prop = dev->mode_config.tv_brightness_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.brightness = val; + + prop = dev->mode_config.tv_contrast_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.contrast = val; + + prop = dev->mode_config.tv_flicker_reduction_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.flicker_reduction = val; + + prop = dev->mode_config.tv_overscan_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.overscan = val; + + prop = dev->mode_config.tv_saturation_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.saturation = val; + + prop = dev->mode_config.tv_hue_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.hue = val; + + drm_atomic_helper_connector_tv_margins_reset(connector); +} +EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset); + /** * __drm_atomic_helper_connector_duplicate_state - copy atomic connector state * @connector: connector object diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 192766656b88..c8fbce795ee7 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm_connector_state *conn_ void __drm_atomic_helper_connector_reset(struct drm_connector *connector, struct drm_connector_state *conn_state); void drm_atomic_helper_connector_reset(struct drm_connector *connector); +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector); void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connector); void __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector, -- 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 0F592C4332F for ; Mon, 7 Nov 2022 14:18:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CB35610E34E; Mon, 7 Nov 2022 14:18:12 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 627DD10E352; Mon, 7 Nov 2022 14:18:02 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 4EF9E2B06707; Mon, 7 Nov 2022 09:17:59 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 07 Nov 2022 09:18:01 -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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=A 9p+g4rFH5v4gnIVU4TKMeKx205irTv6V/LH7m/3CqamG6KP5Pnlh7UyNTTJwgnRo y96JMEGFJkujfIs9V2XPLz5it676l1Rqf9AjQ+swEaC1EE9s5ZunoIkiTMI4OReM 8JBBTsasTeYkAjw6yC2QnbtQYaP7S8u/jJVlQmWkfelK3mNiTbxc2+aTjCTkjjTp pX493G0fzTby40DP7fx1W68vOHl8XVfxASwoh0Zl02qwqimFr1wE+Jdr/ddqXZPP HuYCrj2x4urU8tITiR1O3z+KJauRjS1+aAmK6KHFBepmL9XMfuj5Us/lLloHU+NT xV2ztcc+ZBtkDNOzs0g/g== 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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=r toW4qd3c4NdtJObGCIgY1Qve2MTOnU1hweRzTuWctUvqpAy3qbczeE3pwwYRaMMw 994wvJzZcjvXmSV1HWmI9BmL8T1p8dtRwvBZ8KfjhAycxvdaHKs1/LdMmR4wZRv/ YwidzGLQlG3fAqKlI6v/BJzg+2BiBkZFfCs2WzLm99k6WEU6maImhK41YSprsMd5 jXsEl+2TH8jE/q9Poy4SuTdSiGMedaPqlTBWOlJ27t+5usPOW/tMJZZf7Ra7I+h9 IMaOn2BWnfm62kwsMh2efANalIbbWw3RxhGP7CyH7dSeIhKF/amRiPguZ8ffvloj KDnNumQynFr7ggvIcDIag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:58 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:43 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-17-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=4374; i=maxime@cerno.tech; h=from:subject:message-id; bh=UtWard2Kai/O6yyag/3mB3Zscqt5UbEIDevckU35kvo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7X0iRNVW3bQmawflrw03bh3soPjNd2R206tzta09M/ 4bVSRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbicZmR4dKBsNkqU9pnGvWklYjP2z JBJuKc5u2Xx/SeHv+8QNOq6AfDPw0GVZV5TzLvPZ5QsdxJvLD4/175B/l1V7ySdOyfbfgkzgIA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Nouveau] [PATCH v7 17/23] drm/atomic-helper: Add a TV properties reset helper 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_tv_create_properties() function will create a bunch of properties, but it's up to each and every driver using that function to properly reset the state of these properties leading to inconsistent behaviours. Let's create a helper that will take care of it. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v6: - Use tv_mode_specified instead of a !0 tv_mode to set the default --- drivers/gpu/drm/drm_atomic_state_helper.c | 75 +++++++++++++++++++++++++++++++ include/drm/drm_atomic_state_helper.h | 1 + 2 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index dfb57217253b..e1fc3f26340a 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connecto } EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset); +/** + * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector properties + * @connector: DRM connector + * + * Resets the analog TV properties attached to a connector + */ +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_cmdline_mode *cmdline = &connector->cmdline_mode; + struct drm_connector_state *state = connector->state; + struct drm_property *prop; + uint64_t val; + + prop = dev->mode_config.tv_mode_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.mode = val; + + if (cmdline->tv_mode_specified) + state->tv.mode = cmdline->tv_mode; + + prop = dev->mode_config.tv_select_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.select_subconnector = val; + + prop = dev->mode_config.tv_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.subconnector = val; + + prop = dev->mode_config.tv_brightness_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.brightness = val; + + prop = dev->mode_config.tv_contrast_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.contrast = val; + + prop = dev->mode_config.tv_flicker_reduction_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.flicker_reduction = val; + + prop = dev->mode_config.tv_overscan_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.overscan = val; + + prop = dev->mode_config.tv_saturation_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.saturation = val; + + prop = dev->mode_config.tv_hue_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.hue = val; + + drm_atomic_helper_connector_tv_margins_reset(connector); +} +EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset); + /** * __drm_atomic_helper_connector_duplicate_state - copy atomic connector state * @connector: connector object diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 192766656b88..c8fbce795ee7 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm_connector_state *conn_ void __drm_atomic_helper_connector_reset(struct drm_connector *connector, struct drm_connector_state *conn_state); void drm_atomic_helper_connector_reset(struct drm_connector *connector); +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector); void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connector); void __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector, -- 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 84D20C4332F for ; Mon, 7 Nov 2022 14:19:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76B4210E35F; Mon, 7 Nov 2022 14:18: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 627DD10E352; Mon, 7 Nov 2022 14:18:02 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 4EF9E2B06707; Mon, 7 Nov 2022 09:17:59 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 07 Nov 2022 09:18:01 -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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=A 9p+g4rFH5v4gnIVU4TKMeKx205irTv6V/LH7m/3CqamG6KP5Pnlh7UyNTTJwgnRo y96JMEGFJkujfIs9V2XPLz5it676l1Rqf9AjQ+swEaC1EE9s5ZunoIkiTMI4OReM 8JBBTsasTeYkAjw6yC2QnbtQYaP7S8u/jJVlQmWkfelK3mNiTbxc2+aTjCTkjjTp pX493G0fzTby40DP7fx1W68vOHl8XVfxASwoh0Zl02qwqimFr1wE+Jdr/ddqXZPP HuYCrj2x4urU8tITiR1O3z+KJauRjS1+aAmK6KHFBepmL9XMfuj5Us/lLloHU+NT xV2ztcc+ZBtkDNOzs0g/g== 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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=r toW4qd3c4NdtJObGCIgY1Qve2MTOnU1hweRzTuWctUvqpAy3qbczeE3pwwYRaMMw 994wvJzZcjvXmSV1HWmI9BmL8T1p8dtRwvBZ8KfjhAycxvdaHKs1/LdMmR4wZRv/ YwidzGLQlG3fAqKlI6v/BJzg+2BiBkZFfCs2WzLm99k6WEU6maImhK41YSprsMd5 jXsEl+2TH8jE/q9Poy4SuTdSiGMedaPqlTBWOlJ27t+5usPOW/tMJZZf7Ra7I+h9 IMaOn2BWnfm62kwsMh2efANalIbbWw3RxhGP7CyH7dSeIhKF/amRiPguZ8ffvloj KDnNumQynFr7ggvIcDIag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:58 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:43 +0100 Subject: [PATCH v7 17/23] drm/atomic-helper: Add a TV properties reset helper MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-17-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=4374; i=maxime@cerno.tech; h=from:subject:message-id; bh=UtWard2Kai/O6yyag/3mB3Zscqt5UbEIDevckU35kvo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7X0iRNVW3bQmawflrw03bh3soPjNd2R206tzta09M/ 4bVSRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbicZmR4dKBsNkqU9pnGvWklYjP2z JBJuKc5u2Xx/SeHv+8QNOq6AfDPw0GVZV5TzLvPZ5QsdxJvLD4/175B/l1V7ySdOyfbfgkzgIA 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_tv_create_properties() function will create a bunch of properties, but it's up to each and every driver using that function to properly reset the state of these properties leading to inconsistent behaviours. Let's create a helper that will take care of it. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v6: - Use tv_mode_specified instead of a !0 tv_mode to set the default --- drivers/gpu/drm/drm_atomic_state_helper.c | 75 +++++++++++++++++++++++++++++++ include/drm/drm_atomic_state_helper.h | 1 + 2 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index dfb57217253b..e1fc3f26340a 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connecto } EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset); +/** + * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector properties + * @connector: DRM connector + * + * Resets the analog TV properties attached to a connector + */ +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_cmdline_mode *cmdline = &connector->cmdline_mode; + struct drm_connector_state *state = connector->state; + struct drm_property *prop; + uint64_t val; + + prop = dev->mode_config.tv_mode_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.mode = val; + + if (cmdline->tv_mode_specified) + state->tv.mode = cmdline->tv_mode; + + prop = dev->mode_config.tv_select_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.select_subconnector = val; + + prop = dev->mode_config.tv_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.subconnector = val; + + prop = dev->mode_config.tv_brightness_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.brightness = val; + + prop = dev->mode_config.tv_contrast_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.contrast = val; + + prop = dev->mode_config.tv_flicker_reduction_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.flicker_reduction = val; + + prop = dev->mode_config.tv_overscan_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.overscan = val; + + prop = dev->mode_config.tv_saturation_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.saturation = val; + + prop = dev->mode_config.tv_hue_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.hue = val; + + drm_atomic_helper_connector_tv_margins_reset(connector); +} +EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset); + /** * __drm_atomic_helper_connector_duplicate_state - copy atomic connector state * @connector: connector object diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 192766656b88..c8fbce795ee7 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm_connector_state *conn_ void __drm_atomic_helper_connector_reset(struct drm_connector *connector, struct drm_connector_state *conn_state); void drm_atomic_helper_connector_reset(struct drm_connector *connector); +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector); void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connector); void __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector, -- 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 C0702C4332F for ; Mon, 7 Nov 2022 14:19:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A58410E351; Mon, 7 Nov 2022 14:18:16 +0000 (UTC) Received: from wnew2-smtp.messagingengine.com (wnew2-smtp.messagingengine.com [64.147.123.27]) by gabe.freedesktop.org (Postfix) with ESMTPS id 627DD10E352; Mon, 7 Nov 2022 14:18:02 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 4EF9E2B06707; Mon, 7 Nov 2022 09:17:59 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 07 Nov 2022 09:18:01 -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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=A 9p+g4rFH5v4gnIVU4TKMeKx205irTv6V/LH7m/3CqamG6KP5Pnlh7UyNTTJwgnRo y96JMEGFJkujfIs9V2XPLz5it676l1Rqf9AjQ+swEaC1EE9s5ZunoIkiTMI4OReM 8JBBTsasTeYkAjw6yC2QnbtQYaP7S8u/jJVlQmWkfelK3mNiTbxc2+aTjCTkjjTp pX493G0fzTby40DP7fx1W68vOHl8XVfxASwoh0Zl02qwqimFr1wE+Jdr/ddqXZPP HuYCrj2x4urU8tITiR1O3z+KJauRjS1+aAmK6KHFBepmL9XMfuj5Us/lLloHU+NT xV2ztcc+ZBtkDNOzs0g/g== 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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=r toW4qd3c4NdtJObGCIgY1Qve2MTOnU1hweRzTuWctUvqpAy3qbczeE3pwwYRaMMw 994wvJzZcjvXmSV1HWmI9BmL8T1p8dtRwvBZ8KfjhAycxvdaHKs1/LdMmR4wZRv/ YwidzGLQlG3fAqKlI6v/BJzg+2BiBkZFfCs2WzLm99k6WEU6maImhK41YSprsMd5 jXsEl+2TH8jE/q9Poy4SuTdSiGMedaPqlTBWOlJ27t+5usPOW/tMJZZf7Ra7I+h9 IMaOn2BWnfm62kwsMh2efANalIbbWw3RxhGP7CyH7dSeIhKF/amRiPguZ8ffvloj KDnNumQynFr7ggvIcDIag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:58 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:43 +0100 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v7-17-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=4374; i=maxime@cerno.tech; h=from:subject:message-id; bh=UtWard2Kai/O6yyag/3mB3Zscqt5UbEIDevckU35kvo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7X0iRNVW3bQmawflrw03bh3soPjNd2R206tzta09M/ 4bVSRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbicZmR4dKBsNkqU9pnGvWklYjP2z JBJuKc5u2Xx/SeHv+8QNOq6AfDPw0GVZV5TzLvPZ5QsdxJvLD4/175B/l1V7ySdOyfbfgkzgIA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Intel-gfx] [PATCH v7 17/23] drm/atomic-helper: Add a TV properties reset helper 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_tv_create_properties() function will create a bunch of properties, but it's up to each and every driver using that function to properly reset the state of these properties leading to inconsistent behaviours. Let's create a helper that will take care of it. Reviewed-by: Noralf Trønnes Signed-off-by: Maxime Ripard --- Changes in v6: - Use tv_mode_specified instead of a !0 tv_mode to set the default --- drivers/gpu/drm/drm_atomic_state_helper.c | 75 +++++++++++++++++++++++++++++++ include/drm/drm_atomic_state_helper.h | 1 + 2 files changed, 76 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/drm_atomic_state_helper.c index dfb57217253b..e1fc3f26340a 100644 --- a/drivers/gpu/drm/drm_atomic_state_helper.c +++ b/drivers/gpu/drm/drm_atomic_state_helper.c @@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connecto } EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset); +/** + * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector properties + * @connector: DRM connector + * + * Resets the analog TV properties attached to a connector + */ +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_cmdline_mode *cmdline = &connector->cmdline_mode; + struct drm_connector_state *state = connector->state; + struct drm_property *prop; + uint64_t val; + + prop = dev->mode_config.tv_mode_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.mode = val; + + if (cmdline->tv_mode_specified) + state->tv.mode = cmdline->tv_mode; + + prop = dev->mode_config.tv_select_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.select_subconnector = val; + + prop = dev->mode_config.tv_subconnector_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.subconnector = val; + + prop = dev->mode_config.tv_brightness_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.brightness = val; + + prop = dev->mode_config.tv_contrast_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.contrast = val; + + prop = dev->mode_config.tv_flicker_reduction_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.flicker_reduction = val; + + prop = dev->mode_config.tv_overscan_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.overscan = val; + + prop = dev->mode_config.tv_saturation_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.saturation = val; + + prop = dev->mode_config.tv_hue_property; + if (prop) + if (!drm_object_property_get_default_value(&connector->base, + prop, &val)) + state->tv.hue = val; + + drm_atomic_helper_connector_tv_margins_reset(connector); +} +EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset); + /** * __drm_atomic_helper_connector_duplicate_state - copy atomic connector state * @connector: connector object diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic_state_helper.h index 192766656b88..c8fbce795ee7 100644 --- a/include/drm/drm_atomic_state_helper.h +++ b/include/drm/drm_atomic_state_helper.h @@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm_connector_state *conn_ void __drm_atomic_helper_connector_reset(struct drm_connector *connector, struct drm_connector_state *conn_state); void drm_atomic_helper_connector_reset(struct drm_connector *connector); +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector); void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *connector); void __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector, -- 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 130ECC43219 for ; Mon, 7 Nov 2022 14:30:23 +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=AxANF/c/UcD3Yq/tCOALkwQo63kOf29PQ2GwQbGk+to=; b=LjccN3CRBzOoaa VYf7occY8Mv62iYuwo8GTQ8NuHqpya0m5O5l0lT2lrZzgmqisPRCOzdQa2Qe7ljVSZf53uldT/qxj x/mkni0ZvSjF+b0B4ZWhVgWd70dr2+uRMCTn+tICr62RfR63bRbeGRbj0KL+FggYPTGMWVwSvShoA J/WVeL891jR3Cy4RhFJFZgNB5K5p2qajysI1qU0R0NhsfaVkSIjEviv2/qqaeHVvvTNUteXL/8DjJ +lItBoyKaRbVR47fZxcDahse1P87fjHsTJXRkTiICtu0g37iFDsf1QLqQHm5sg1J4z83E8Bsxtuma GT/9oHE8oq/kqEfCL+SA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1os37O-00FEpK-7U; Mon, 07 Nov 2022 14:28:56 +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 1os2ws-00FALj-7Y for linux-arm-kernel@lists.infradead.org; Mon, 07 Nov 2022 14:18:03 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id 4EF9E2B06707; Mon, 7 Nov 2022 09:17:59 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Mon, 07 Nov 2022 09:18:01 -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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=A 9p+g4rFH5v4gnIVU4TKMeKx205irTv6V/LH7m/3CqamG6KP5Pnlh7UyNTTJwgnRo y96JMEGFJkujfIs9V2XPLz5it676l1Rqf9AjQ+swEaC1EE9s5ZunoIkiTMI4OReM 8JBBTsasTeYkAjw6yC2QnbtQYaP7S8u/jJVlQmWkfelK3mNiTbxc2+aTjCTkjjTp pX493G0fzTby40DP7fx1W68vOHl8XVfxASwoh0Zl02qwqimFr1wE+Jdr/ddqXZPP HuYCrj2x4urU8tITiR1O3z+KJauRjS1+aAmK6KHFBepmL9XMfuj5Us/lLloHU+NT xV2ztcc+ZBtkDNOzs0g/g== 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=1667830678; x= 1667837878; bh=jcOnOdXWLsvfuERAn7jxcp7yCPzCHCf0KyOetRLO8bI=; b=r toW4qd3c4NdtJObGCIgY1Qve2MTOnU1hweRzTuWctUvqpAy3qbczeE3pwwYRaMMw 994wvJzZcjvXmSV1HWmI9BmL8T1p8dtRwvBZ8KfjhAycxvdaHKs1/LdMmR4wZRv/ YwidzGLQlG3fAqKlI6v/BJzg+2BiBkZFfCs2WzLm99k6WEU6maImhK41YSprsMd5 jXsEl+2TH8jE/q9Poy4SuTdSiGMedaPqlTBWOlJ27t+5usPOW/tMJZZf7Ra7I+h9 IMaOn2BWnfm62kwsMh2efANalIbbWw3RxhGP7CyH7dSeIhKF/amRiPguZ8ffvloj KDnNumQynFr7ggvIcDIag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrvdekgdeiudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepofgrgihi mhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtffrrg htthgvrhhnpedvgfevjefhtdetveevhfelieeuueetgfdvgeevkeegudejffegfffgtedt leelhfenucevlhhushhtvghrufhiiigvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Nov 2022 09:17:58 -0500 (EST) From: Maxime Ripard Date: Mon, 07 Nov 2022 15:16:43 +0100 Subject: [PATCH v7 17/23] drm/atomic-helper: Add a TV properties reset helper MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v7-17-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=4374; i=maxime@cerno.tech; h=from:subject:message-id; bh=UtWard2Kai/O6yyag/3mB3Zscqt5UbEIDevckU35kvo=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmZwg7X0iRNVW3bQmawflrw03bh3soPjNd2R206tzta09M/ 4bVSRykLgxgXg6yYIkuMsPmSuFOzXney8c2DmcPKBDKEgYtTACbicZmR4dKBsNkqU9pnGvWklYjP2z JBJuKc5u2Xx/SeHv+8QNOq6AfDPw0GVZV5TzLvPZ5QsdxJvLD4/175B/l1V7ySdOyfbfgkzgIA 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_061802_338684_5771A963 X-CRM114-Status: GOOD ( 11.40 ) 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 VGhlIGRybV90dl9jcmVhdGVfcHJvcGVydGllcygpIGZ1bmN0aW9uIHdpbGwgY3JlYXRlIGEgYnVu Y2ggb2YgcHJvcGVydGllcywKYnV0IGl0J3MgdXAgdG8gZWFjaCBhbmQgZXZlcnkgZHJpdmVyIHVz aW5nIHRoYXQgZnVuY3Rpb24gdG8gcHJvcGVybHkgcmVzZXQKdGhlIHN0YXRlIG9mIHRoZXNlIHBy b3BlcnRpZXMgbGVhZGluZyB0byBpbmNvbnNpc3RlbnQgYmVoYXZpb3Vycy4KCkxldCdzIGNyZWF0 ZSBhIGhlbHBlciB0aGF0IHdpbGwgdGFrZSBjYXJlIG9mIGl0LgoKUmV2aWV3ZWQtYnk6IE5vcmFs ZiBUcsO4bm5lcyA8bm9yYWxmQHRyb25uZXMub3JnPgpTaWduZWQtb2ZmLWJ5OiBNYXhpbWUgUmlw YXJkIDxtYXhpbWVAY2Vybm8udGVjaD4KCi0tLQpDaGFuZ2VzIGluIHY2OgotIFVzZSB0dl9tb2Rl X3NwZWNpZmllZCBpbnN0ZWFkIG9mIGEgITAgdHZfbW9kZSB0byBzZXQgdGhlIGRlZmF1bHQKLS0t CiBkcml2ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19zdGF0ZV9oZWxwZXIuYyB8IDc1ICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIGluY2x1ZGUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVs cGVyLmggICAgIHwgIDEgKwogMiBmaWxlcyBjaGFuZ2VkLCA3NiBpbnNlcnRpb25zKCspCgpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVyLmMgYi9kcml2 ZXJzL2dwdS9kcm0vZHJtX2F0b21pY19zdGF0ZV9oZWxwZXIuYwppbmRleCBkZmI1NzIxNzI1M2Iu LmUxZmMzZjI2MzQwYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfc3Rh dGVfaGVscGVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVy LmMKQEAgLTQ4MSw2ICs0ODEsODEgQEAgdm9pZCBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3Jf dHZfbWFyZ2luc19yZXNldChzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29ubmVjdG8KIH0KIEVYUE9S VF9TWU1CT0woZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X21hcmdpbnNfcmVzZXQpOwog CisvKioKKyAqIGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl90dl9yZXNldCAtIFJlc2V0cyBB bmFsb2cgVFYgY29ubmVjdG9yIHByb3BlcnRpZXMKKyAqIEBjb25uZWN0b3I6IERSTSBjb25uZWN0 b3IKKyAqCisgKiBSZXNldHMgdGhlIGFuYWxvZyBUViBwcm9wZXJ0aWVzIGF0dGFjaGVkIHRvIGEg Y29ubmVjdG9yCisgKi8KK3ZvaWQgZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X3Jlc2V0 KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCit7CisJc3RydWN0IGRybV9kZXZpY2Ug KmRldiA9IGNvbm5lY3Rvci0+ZGV2OworCXN0cnVjdCBkcm1fY21kbGluZV9tb2RlICpjbWRsaW5l ID0gJmNvbm5lY3Rvci0+Y21kbGluZV9tb2RlOworCXN0cnVjdCBkcm1fY29ubmVjdG9yX3N0YXRl ICpzdGF0ZSA9IGNvbm5lY3Rvci0+c3RhdGU7CisJc3RydWN0IGRybV9wcm9wZXJ0eSAqcHJvcDsK Kwl1aW50NjRfdCB2YWw7CisKKwlwcm9wID0gZGV2LT5tb2RlX2NvbmZpZy50dl9tb2RlX3Byb3Bl cnR5OworCWlmIChwcm9wKQorCQlpZiAoIWRybV9vYmplY3RfcHJvcGVydHlfZ2V0X2RlZmF1bHRf dmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKKwkJCQkJCQkgICBwcm9wLCAmdmFsKSkKKwkJCXN0YXRl LT50di5tb2RlID0gdmFsOworCisJaWYgKGNtZGxpbmUtPnR2X21vZGVfc3BlY2lmaWVkKQorCQlz dGF0ZS0+dHYubW9kZSA9IGNtZGxpbmUtPnR2X21vZGU7CisKKwlwcm9wID0gZGV2LT5tb2RlX2Nv bmZpZy50dl9zZWxlY3Rfc3ViY29ubmVjdG9yX3Byb3BlcnR5OworCWlmIChwcm9wKQorCQlpZiAo IWRybV9vYmplY3RfcHJvcGVydHlfZ2V0X2RlZmF1bHRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwK KwkJCQkJCQkgICBwcm9wLCAmdmFsKSkKKwkJCXN0YXRlLT50di5zZWxlY3Rfc3ViY29ubmVjdG9y ID0gdmFsOworCisJcHJvcCA9IGRldi0+bW9kZV9jb25maWcudHZfc3ViY29ubmVjdG9yX3Byb3Bl cnR5OworCWlmIChwcm9wKQorCQlpZiAoIWRybV9vYmplY3RfcHJvcGVydHlfZ2V0X2RlZmF1bHRf dmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKKwkJCQkJCQkgICBwcm9wLCAmdmFsKSkKKwkJCXN0YXRl LT50di5zdWJjb25uZWN0b3IgPSB2YWw7CisKKwlwcm9wID0gZGV2LT5tb2RlX2NvbmZpZy50dl9i cmlnaHRuZXNzX3Byb3BlcnR5OworCWlmIChwcm9wKQorCQlpZiAoIWRybV9vYmplY3RfcHJvcGVy dHlfZ2V0X2RlZmF1bHRfdmFsdWUoJmNvbm5lY3Rvci0+YmFzZSwKKwkJCQkJCQkgICBwcm9wLCAm dmFsKSkKKwkJCXN0YXRlLT50di5icmlnaHRuZXNzID0gdmFsOworCisJcHJvcCA9IGRldi0+bW9k ZV9jb25maWcudHZfY29udHJhc3RfcHJvcGVydHk7CisJaWYgKHByb3ApCisJCWlmICghZHJtX29i amVjdF9wcm9wZXJ0eV9nZXRfZGVmYXVsdF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLAorCQkJCQkJ CSAgIHByb3AsICZ2YWwpKQorCQkJc3RhdGUtPnR2LmNvbnRyYXN0ID0gdmFsOworCisJcHJvcCA9 IGRldi0+bW9kZV9jb25maWcudHZfZmxpY2tlcl9yZWR1Y3Rpb25fcHJvcGVydHk7CisJaWYgKHBy b3ApCisJCWlmICghZHJtX29iamVjdF9wcm9wZXJ0eV9nZXRfZGVmYXVsdF92YWx1ZSgmY29ubmVj dG9yLT5iYXNlLAorCQkJCQkJCSAgIHByb3AsICZ2YWwpKQorCQkJc3RhdGUtPnR2LmZsaWNrZXJf cmVkdWN0aW9uID0gdmFsOworCisJcHJvcCA9IGRldi0+bW9kZV9jb25maWcudHZfb3ZlcnNjYW5f cHJvcGVydHk7CisJaWYgKHByb3ApCisJCWlmICghZHJtX29iamVjdF9wcm9wZXJ0eV9nZXRfZGVm YXVsdF92YWx1ZSgmY29ubmVjdG9yLT5iYXNlLAorCQkJCQkJCSAgIHByb3AsICZ2YWwpKQorCQkJ c3RhdGUtPnR2Lm92ZXJzY2FuID0gdmFsOworCisJcHJvcCA9IGRldi0+bW9kZV9jb25maWcudHZf c2F0dXJhdGlvbl9wcm9wZXJ0eTsKKwlpZiAocHJvcCkKKwkJaWYgKCFkcm1fb2JqZWN0X3Byb3Bl cnR5X2dldF9kZWZhdWx0X3ZhbHVlKCZjb25uZWN0b3ItPmJhc2UsCisJCQkJCQkJICAgcHJvcCwg JnZhbCkpCisJCQlzdGF0ZS0+dHYuc2F0dXJhdGlvbiA9IHZhbDsKKworCXByb3AgPSBkZXYtPm1v ZGVfY29uZmlnLnR2X2h1ZV9wcm9wZXJ0eTsKKwlpZiAocHJvcCkKKwkJaWYgKCFkcm1fb2JqZWN0 X3Byb3BlcnR5X2dldF9kZWZhdWx0X3ZhbHVlKCZjb25uZWN0b3ItPmJhc2UsCisJCQkJCQkJICAg cHJvcCwgJnZhbCkpCisJCQlzdGF0ZS0+dHYuaHVlID0gdmFsOworCisJZHJtX2F0b21pY19oZWxw ZXJfY29ubmVjdG9yX3R2X21hcmdpbnNfcmVzZXQoY29ubmVjdG9yKTsKK30KK0VYUE9SVF9TWU1C T0woZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X3Jlc2V0KTsKKwogLyoqCiAgKiBfX2Ry bV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9kdXBsaWNhdGVfc3RhdGUgLSBjb3B5IGF0b21pYyBj b25uZWN0b3Igc3RhdGUKICAqIEBjb25uZWN0b3I6IGNvbm5lY3RvciBvYmplY3QKZGlmZiAtLWdp dCBhL2luY2x1ZGUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVyLmggYi9pbmNsdWRlL2RybS9k cm1fYXRvbWljX3N0YXRlX2hlbHBlci5oCmluZGV4IDE5Mjc2NjY1NmI4OC4uYzhmYmNlNzk1ZWU3 IDEwMDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYXRvbWljX3N0YXRlX2hlbHBlci5oCisrKyBi L2luY2x1ZGUvZHJtL2RybV9hdG9taWNfc3RhdGVfaGVscGVyLmgKQEAgLTcwLDYgKzcwLDcgQEAg dm9pZCBfX2RybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl9zdGF0ZV9yZXNldChzdHJ1Y3QgZHJt X2Nvbm5lY3Rvcl9zdGF0ZSAqY29ubl8KIHZvaWQgX19kcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0 b3JfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvciwKIAkJCQkJIHN0cnVjdCBk cm1fY29ubmVjdG9yX3N0YXRlICpjb25uX3N0YXRlKTsKIHZvaWQgZHJtX2F0b21pY19oZWxwZXJf Y29ubmVjdG9yX3Jlc2V0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpOwordm9pZCBk cm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfdHZfcmVzZXQoc3RydWN0IGRybV9jb25uZWN0b3Ig KmNvbm5lY3Rvcik7CiB2b2lkIGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl90dl9tYXJnaW5z X3Jlc2V0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpOwogdm9pZAogX19kcm1fYXRv bWljX2hlbHBlcl9jb25uZWN0b3JfZHVwbGljYXRlX3N0YXRlKHN0cnVjdCBkcm1fY29ubmVjdG9y ICpjb25uZWN0b3IsCgotLSAKYjQgMC4xMS4wLWRldi05OWUzYQoKX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxp c3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZy YWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=