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 9BEECECAAD4 for ; Mon, 29 Aug 2022 13:14:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95D4310F22E; Mon, 29 Aug 2022 13:14: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 63C5910F219 for ; Mon, 29 Aug 2022 13:14:31 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 3E2FD2B0606B; Mon, 29 Aug 2022 09:14:28 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Mon, 29 Aug 2022 09:14:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cerno.tech; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1661778867; x= 1661786067; bh=JaYvZqhoL+I2fhvomldPF+TuSJaxqGQFbEriKS3Go/A=; b=Y Xfs3mbm989aKrGXKe0mGPveD6TPj5bQ6DjeLA3Tr3o641EmcPbgVXNlHlKtrIIYc aQuCxg1mCEIHWdCyuTVoUCQgiNW7Pp3SCe7ZxiUUXG+Yn5XUkOkVv3qAjGgkMRWb UDuGRvsiFpf5S25z95YNTkn+mvx6qsrpqmgWlneSuCFpb4/bU9/nu7hdJtWoVLtp 6PQyT1TE24meqojJszFcGZhy7rlSK2ruX+HW76t6RJe7hrZhDgq4GHEsr2sYWB+h dvLP4njPB1WJKJZhHgiuqeW2cbFqgKsrKrNSiJPIT9Qud1Q3EVLCBnv4pehUxT5T NCap1Lv3409l86k+KWLtA== 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=1661778867; x= 1661786067; bh=JaYvZqhoL+I2fhvomldPF+TuSJaxqGQFbEriKS3Go/A=; b=J H3tunYjZBoytNo+XqAZeI9jkkrDEu/nhP3JhChpfadLKlkoo7/aiVLr5FjSqialA QeX8yxYIRhTu4mmd+VeEytRMZUzu+xnN2qkbg31TqMoipp2GKYZ8c3fJIksmJF6X 8XRm+muDJDNsKK9w3Vi2VcS/Rpd8kilUgF8+AuBce1WMwKiz5mScgdPhfLjtTR36 WRL3TEjsS+mpFotJwGsBNIrjRr6sCZf/OcdDqPW0gJcJudDJb3omC5X3ZiKZuEz4 x1mzzQwvqdlV4NRMqW+l/SNBNE1nVR0S6oUKFq0ep8JUjI5f9CUJOkZkTYSFHDdw Yp3/sBwHeeIVLC2KJl/tA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdekuddgieefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfogfesthhqredtredtjeenucfhrhhomhepofgr gihimhgvucftihhprghrugcuoehmrgigihhmvgestggvrhhnohdrthgvtghhqeenucggtf frrghtthgvrhhnpeefiedvfefggffgffehveejieffuddtgffhjefggeetieduvdeileet lefgveegtdenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhroh hmpehmrgigihhmvgestggvrhhnohdrthgvtghh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Aug 2022 09:14:26 -0400 (EDT) From: Maxime Ripard To: Maxime Ripard , Ben Skeggs , David Airlie , Chen-Yu Tsai , Thomas Zimmermann , Jani Nikula , Lyude Paul , Philipp Zabel , Maarten Lankhorst , Rodrigo Vivi , Tvrtko Ursulin , Jernej Skrabec , Samuel Holland , Karol Herbst , =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= , Emma Anholt , Daniel Vetter , Joonas Lahtinen Subject: [PATCH v2 22/41] drm/atomic-helper: Add a TV properties reset helper Date: Mon, 29 Aug 2022 15:11:36 +0200 Message-Id: <20220728-rpi-analog-tv-properties-v2-22-459522d653a7@cerno.tech> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> References: <20220728-rpi-analog-tv-properties-v2-0-459522d653a7@cerno.tech> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Mailer: b4 0.10.0-dev-65ba7 X-Developer-Signature: v=1; a=openpgp-sha256; l=4049; i=maxime@cerno.tech; h=from:subject:message-id; bh=svXKowsDyxo006OqnLCPuhwNUZ0/qgk/SYOpnaKRW24=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMk8uxTKjk3UUTvSvv657Fpvy6LIp1NYLpV5Sd7wf6jrsnXG 2iW3OkpZGMS4GGTFFFlihM2XxJ2a9bqTjW8ezBxWJpAhDFycAjCRqdUM/5Ryjs/53BAcc2qO6RbO/c emr/c5WTVHVfHa+yW39/hfvbmYkaHZbpJokZDgm83NFQFREkYP3xpMPSsyiyv0uGNb7a6QfcwA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Content-Transfer-Encoding: quoted-printable X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The drm_tv_create_properties() function will create a bunch of properties,= =0D but it's up to each and every driver using that function to properly reset= =0D the state of these properties leading to inconsistent behaviours.=0D =0D Let's create a helper that will take care of it.=0D =0D Signed-off-by: Maxime Ripard =0D =0D diff --git a/drivers/gpu/drm/drm_atomic_state_helper.c b/drivers/gpu/drm/dr= m_atomic_state_helper.c=0D index dfb57217253b..0373c3dc824b 100644=0D --- a/drivers/gpu/drm/drm_atomic_state_helper.c=0D +++ b/drivers/gpu/drm/drm_atomic_state_helper.c=0D @@ -481,6 +481,81 @@ void drm_atomic_helper_connector_tv_margins_reset(stru= ct drm_connector *connecto=0D }=0D EXPORT_SYMBOL(drm_atomic_helper_connector_tv_margins_reset);=0D =0D +/**=0D + * drm_atomic_helper_connector_tv_reset - Resets Analog TV connector prope= rties=0D + * @connector: DRM connector=0D + *=0D + * Resets the analog TV properties attached to a connector=0D + */=0D +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)= =0D +{=0D + struct drm_device *dev =3D connector->dev;=0D + struct drm_cmdline_mode *cmdline =3D &connector->cmdline_mode;=0D + struct drm_connector_state *state =3D connector->state;=0D + struct drm_property *prop;=0D + uint64_t val;=0D +=0D + prop =3D dev->mode_config.tv_mode_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.mode =3D val;=0D +=0D + if (cmdline->tv_mode)=0D + state->tv.mode =3D cmdline->tv_mode;=0D +=0D + prop =3D dev->mode_config.tv_select_subconnector_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.select_subconnector =3D val;=0D +=0D + prop =3D dev->mode_config.tv_subconnector_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.subconnector =3D val;=0D +=0D + prop =3D dev->mode_config.tv_brightness_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.brightness =3D val;=0D +=0D + prop =3D dev->mode_config.tv_contrast_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.contrast =3D val;=0D +=0D + prop =3D dev->mode_config.tv_flicker_reduction_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.flicker_reduction =3D val;=0D +=0D + prop =3D dev->mode_config.tv_overscan_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.overscan =3D val;=0D +=0D + prop =3D dev->mode_config.tv_saturation_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.saturation =3D val;=0D +=0D + prop =3D dev->mode_config.tv_hue_property;=0D + if (prop)=0D + if (!drm_object_property_get_default_value(&connector->base,=0D + prop, &val))=0D + state->tv.hue =3D val;=0D +=0D + drm_atomic_helper_connector_tv_margins_reset(connector);=0D +}=0D +EXPORT_SYMBOL(drm_atomic_helper_connector_tv_reset);=0D +=0D /**=0D * __drm_atomic_helper_connector_duplicate_state - copy atomic connector s= tate=0D * @connector: connector object=0D diff --git a/include/drm/drm_atomic_state_helper.h b/include/drm/drm_atomic= _state_helper.h=0D index 192766656b88..c8fbce795ee7 100644=0D --- a/include/drm/drm_atomic_state_helper.h=0D +++ b/include/drm/drm_atomic_state_helper.h=0D @@ -70,6 +70,7 @@ void __drm_atomic_helper_connector_state_reset(struct drm= _connector_state *conn_=0D void __drm_atomic_helper_connector_reset(struct drm_connector *connector,= =0D struct drm_connector_state *conn_state);=0D void drm_atomic_helper_connector_reset(struct drm_connector *connector);=0D +void drm_atomic_helper_connector_tv_reset(struct drm_connector *connector)= ;=0D void drm_atomic_helper_connector_tv_margins_reset(struct drm_connector *co= nnector);=0D void=0D __drm_atomic_helper_connector_duplicate_state(struct drm_connector *connec= tor,=0D =0D -- =0D b4 0.10.0-dev-65ba7=0D