From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 95F1F7B for ; Wed, 26 Oct 2022 15:34:19 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id C1A06580418; Wed, 26 Oct 2022 11:34:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:18 -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=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=I OYKWkAUL4fqTm3eeMfQonDsDZMetnmKkktW61+SKYNJ83Z77yF20gInKjDkhWZ2V uMi6r6FN+d8AvfZdQTYgGB+zOKhWtCLpY17UZWdrp+U8C9fjH/fnEjFlnLehxChg OcAe7p3Ai77PKe5c+xR5d3eh8j1jHYzlsJX00U8QeHYP7ZNnJevv1b/NUSBkTc0b 0cYKwdbl/hlEVYkUVMeZrA+dsR6w0rBRqinIyLRFYy41qIH5G8A7AMw8tIk58m5l JqAHSUIyfqP+4HxsQISdKdl2D/jP9LYFIaNy/dH9ll9nrrZkrkkeNiEUfeV5JdIt 1JXCO1bUnaxliDUkNGjxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=c npehTTfRLM6AuBo/z4dD7NWSWDJYYAe56zDwrlBIYqDKxVmbaKEDJ9L5NReM4fuR Mk0o6mIOQ0s3qWULnVATn2MBUbeFAU86S0yaolGpnDc/HaReC1dTKTdegWNlUx/j D7M6ablNF5WJ2d4F99EkQsVYZPAJO296QWmkZiFIlrAEhQPrQYCrfjhvmGfI9biK TaABRxuV5B6ur7yDilYi+AfcC3Ib5zf3mJdE1E7iStHDuTSiOXYKvNE8izs59LVP X+CxTBStu4jVlpLd5dRRMa+jip6WFj3Q4l1xXHQwqh2+rX9B5LKvjpNU+t5acLqN Jmo4kWNltZtdoCciyG0Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:17 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:42 +0200 Subject: [PATCH v6 23/23] drm/sun4i: tv: Convert to the new TV mode property Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-23-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: linux-sunxi@lists.linux.dev, Maxime Ripard , intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Noralf Trønnes , Geert Uytterhoeven X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7620; i=maxime@cerno.tech; h=from:subject:message-id; bh=hsNs2n7C7f9hehl8S1tfoiQIMRx0LRBYDZVow6+rmgA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6WE6PeC8ZKJaksma3c8bTi4LZTeTmX1f5ZnN3uc+XS eg2ljlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAExkhwDD/wK+q7MebFApNXu0TnzCrC Py87/WW3Q3HVmhNW1RheOHH24Mv1mzNVUqev0y11QVMRtXMBcJ8b3R3/bSvbbw+OuZNkc3MAEA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Now that the core can deal fine with analog TV modes, let's convert the sun4i TV driver to leverage those new features. Acked-by: Noralf Trønnes Reviewed-by: Jernej Skrabec Signed-off-by: Maxime Ripard --- Changes in v6: - Convert to new get_modes helper Changes in v5: - Removed the count variable in get_modes - Removed spurious vc4 change --- drivers/gpu/drm/sun4i/sun4i_tv.c | 141 ++++++++++----------------------------- 1 file changed, 34 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index c65f0a89b6b0..9625a00a48ba 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -141,23 +141,14 @@ struct resync_parameters { struct tv_mode { char *name; + unsigned int tv_mode; + u32 mode; u32 chroma_freq; u16 back_porch; u16 front_porch; - u16 line_number; u16 vblank_level; - u32 hdisplay; - u16 hfront_porch; - u16 hsync_len; - u16 hback_porch; - - u32 vdisplay; - u16 vfront_porch; - u16 vsync_len; - u16 vback_porch; - bool yc_en; bool dac3_en; bool dac_bit25_en; @@ -213,7 +204,7 @@ static const struct resync_parameters pal_resync_parameters = { static const struct tv_mode tv_modes[] = { { - .name = "NTSC", + .tv_mode = DRM_MODE_TV_MODE_NTSC, .mode = SUN4I_TVE_CFG0_RES_480i, .chroma_freq = 0x21f07c1f, .yc_en = true, @@ -222,17 +213,6 @@ static const struct tv_mode tv_modes[] = { .back_porch = 118, .front_porch = 32, - .line_number = 525, - - .hdisplay = 720, - .hfront_porch = 18, - .hsync_len = 2, - .hback_porch = 118, - - .vdisplay = 480, - .vfront_porch = 26, - .vsync_len = 2, - .vback_porch = 17, .vblank_level = 240, @@ -242,23 +222,12 @@ static const struct tv_mode tv_modes[] = { .resync_params = &ntsc_resync_parameters, }, { - .name = "PAL", + .tv_mode = DRM_MODE_TV_MODE_PAL, .mode = SUN4I_TVE_CFG0_RES_576i, .chroma_freq = 0x2a098acb, .back_porch = 138, .front_porch = 24, - .line_number = 625, - - .hdisplay = 720, - .hfront_porch = 3, - .hsync_len = 2, - .hback_porch = 139, - - .vdisplay = 576, - .vfront_porch = 28, - .vsync_len = 2, - .vback_porch = 19, .vblank_level = 252, @@ -276,63 +245,21 @@ drm_encoder_to_sun4i_tv(struct drm_encoder *encoder) encoder); } -/* - * FIXME: If only the drm_display_mode private field was usable, this - * could go away... - * - * So far, it doesn't seem to be preserved when the mode is passed by - * to mode_set for some reason. - */ -static const struct tv_mode *sun4i_tv_find_tv_by_mode(const struct drm_display_mode *mode) +static const struct tv_mode * +sun4i_tv_find_tv_by_mode(unsigned int mode) { int i; - /* First try to identify the mode by name */ for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { const struct tv_mode *tv_mode = &tv_modes[i]; - DRM_DEBUG_DRIVER("Comparing mode %s vs %s", - mode->name, tv_mode->name); - - if (!strcmp(mode->name, tv_mode->name)) - return tv_mode; - } - - /* Then by number of lines */ - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - const struct tv_mode *tv_mode = &tv_modes[i]; - - DRM_DEBUG_DRIVER("Comparing mode %s vs %s (X: %d vs %d)", - mode->name, tv_mode->name, - mode->vdisplay, tv_mode->vdisplay); - - if (mode->vdisplay == tv_mode->vdisplay) + if (tv_mode->tv_mode == mode) return tv_mode; } return NULL; } -static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode, - struct drm_display_mode *mode) -{ - DRM_DEBUG_DRIVER("Creating mode %s\n", mode->name); - - mode->type = DRM_MODE_TYPE_DRIVER; - mode->clock = 13500; - mode->flags = DRM_MODE_FLAG_INTERLACE; - - mode->hdisplay = tv_mode->hdisplay; - mode->hsync_start = mode->hdisplay + tv_mode->hfront_porch; - mode->hsync_end = mode->hsync_start + tv_mode->hsync_len; - mode->htotal = mode->hsync_end + tv_mode->hback_porch; - - mode->vdisplay = tv_mode->vdisplay; - mode->vsync_start = mode->vdisplay + tv_mode->vfront_porch; - mode->vsync_end = mode->vsync_start + tv_mode->vsync_len; - mode->vtotal = mode->vsync_end + tv_mode->vback_porch; -} - static void sun4i_tv_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { @@ -356,7 +283,11 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, encoder->crtc); struct drm_display_mode *mode = &crtc_state->mode; - const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode); + struct drm_connector *connector = &tv->connector; + struct drm_connector_state *conn_state = + drm_atomic_get_new_connector_state(state, connector); + const struct tv_mode *tv_mode = + sun4i_tv_find_tv_by_mode(conn_state->tv.mode); DRM_DEBUG_DRIVER("Enabling the TV Output\n"); @@ -404,7 +335,7 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, /* Set the lines setup */ regmap_write(tv->regs, SUN4I_TVE_LINE_REG, SUN4I_TVE_LINE_FIRST(22) | - SUN4I_TVE_LINE_NUMBER(tv_mode->line_number)); + SUN4I_TVE_LINE_NUMBER(mode->vtotal)); regmap_write(tv->regs, SUN4I_TVE_LEVEL_REG, SUN4I_TVE_LEVEL_BLANK(tv_mode->video_levels->blank) | @@ -465,37 +396,21 @@ static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { .atomic_enable = sun4i_tv_enable, }; -static int sun4i_tv_comp_get_modes(struct drm_connector *connector) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - struct drm_display_mode *mode; - const struct tv_mode *tv_mode = &tv_modes[i]; - - mode = drm_mode_create(connector->dev); - if (!mode) { - DRM_ERROR("Failed to create a new display mode\n"); - return 0; - } - - strcpy(mode->name, tv_mode->name); - - sun4i_tv_mode_to_drm_mode(tv_mode, mode); - drm_mode_probed_add(connector, mode); - } - - return i; -} - static const struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = { - .get_modes = sun4i_tv_comp_get_modes, + .atomic_check = drm_atomic_helper_connector_tv_check, + .get_modes = drm_connector_helper_tv_get_modes, }; +static void sun4i_tv_connector_reset(struct drm_connector *connector) +{ + drm_atomic_helper_connector_reset(connector); + drm_atomic_helper_connector_tv_reset(connector); +} + static const struct drm_connector_funcs sun4i_tv_comp_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, - .reset = drm_atomic_helper_connector_reset, + .reset = sun4i_tv_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; @@ -587,8 +502,20 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, drm_connector_attach_encoder(&tv->connector, &tv->encoder); + ret = drm_mode_create_tv_properties(drm, + BIT(DRM_MODE_TV_MODE_NTSC) | + BIT(DRM_MODE_TV_MODE_PAL)); + if (ret) + goto err_cleanup_connector; + + drm_object_attach_property(&tv->connector.base, + drm->mode_config.tv_mode_property, + DRM_MODE_TV_MODE_NTSC); + return 0; +err_cleanup_connector: + drm_connector_cleanup(&tv->connector); err_cleanup_encoder: drm_encoder_cleanup(&tv->encoder); err_disable_clk: -- 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 07921C433FE for ; Wed, 26 Oct 2022 15:36:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AF5610E566; Wed, 26 Oct 2022 15:34:45 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6335110E540; Wed, 26 Oct 2022 15:34:19 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id C1A06580418; Wed, 26 Oct 2022 11:34:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:18 -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=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=I OYKWkAUL4fqTm3eeMfQonDsDZMetnmKkktW61+SKYNJ83Z77yF20gInKjDkhWZ2V uMi6r6FN+d8AvfZdQTYgGB+zOKhWtCLpY17UZWdrp+U8C9fjH/fnEjFlnLehxChg OcAe7p3Ai77PKe5c+xR5d3eh8j1jHYzlsJX00U8QeHYP7ZNnJevv1b/NUSBkTc0b 0cYKwdbl/hlEVYkUVMeZrA+dsR6w0rBRqinIyLRFYy41qIH5G8A7AMw8tIk58m5l JqAHSUIyfqP+4HxsQISdKdl2D/jP9LYFIaNy/dH9ll9nrrZkrkkeNiEUfeV5JdIt 1JXCO1bUnaxliDUkNGjxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=c npehTTfRLM6AuBo/z4dD7NWSWDJYYAe56zDwrlBIYqDKxVmbaKEDJ9L5NReM4fuR Mk0o6mIOQ0s3qWULnVATn2MBUbeFAU86S0yaolGpnDc/HaReC1dTKTdegWNlUx/j D7M6ablNF5WJ2d4F99EkQsVYZPAJO296QWmkZiFIlrAEhQPrQYCrfjhvmGfI9biK TaABRxuV5B6ur7yDilYi+AfcC3Ib5zf3mJdE1E7iStHDuTSiOXYKvNE8izs59LVP X+CxTBStu4jVlpLd5dRRMa+jip6WFj3Q4l1xXHQwqh2+rX9B5LKvjpNU+t5acLqN Jmo4kWNltZtdoCciyG0Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:17 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:42 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-23-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7620; i=maxime@cerno.tech; h=from:subject:message-id; bh=hsNs2n7C7f9hehl8S1tfoiQIMRx0LRBYDZVow6+rmgA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6WE6PeC8ZKJaksma3c8bTi4LZTeTmX1f5ZnN3uc+XS eg2ljlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAExkhwDD/wK+q7MebFApNXu0TnzCrC Py87/WW3Q3HVmhNW1RheOHH24Mv1mzNVUqev0y11QVMRtXMBcJ8b3R3/bSvbbw+OuZNkc3MAEA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Nouveau] [PATCH v6 23/23] drm/sun4i: tv: Convert to the new TV mode property X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" Now that the core can deal fine with analog TV modes, let's convert the sun4i TV driver to leverage those new features. Acked-by: Noralf Trønnes Reviewed-by: Jernej Skrabec Signed-off-by: Maxime Ripard --- Changes in v6: - Convert to new get_modes helper Changes in v5: - Removed the count variable in get_modes - Removed spurious vc4 change --- drivers/gpu/drm/sun4i/sun4i_tv.c | 141 ++++++++++----------------------------- 1 file changed, 34 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index c65f0a89b6b0..9625a00a48ba 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -141,23 +141,14 @@ struct resync_parameters { struct tv_mode { char *name; + unsigned int tv_mode; + u32 mode; u32 chroma_freq; u16 back_porch; u16 front_porch; - u16 line_number; u16 vblank_level; - u32 hdisplay; - u16 hfront_porch; - u16 hsync_len; - u16 hback_porch; - - u32 vdisplay; - u16 vfront_porch; - u16 vsync_len; - u16 vback_porch; - bool yc_en; bool dac3_en; bool dac_bit25_en; @@ -213,7 +204,7 @@ static const struct resync_parameters pal_resync_parameters = { static const struct tv_mode tv_modes[] = { { - .name = "NTSC", + .tv_mode = DRM_MODE_TV_MODE_NTSC, .mode = SUN4I_TVE_CFG0_RES_480i, .chroma_freq = 0x21f07c1f, .yc_en = true, @@ -222,17 +213,6 @@ static const struct tv_mode tv_modes[] = { .back_porch = 118, .front_porch = 32, - .line_number = 525, - - .hdisplay = 720, - .hfront_porch = 18, - .hsync_len = 2, - .hback_porch = 118, - - .vdisplay = 480, - .vfront_porch = 26, - .vsync_len = 2, - .vback_porch = 17, .vblank_level = 240, @@ -242,23 +222,12 @@ static const struct tv_mode tv_modes[] = { .resync_params = &ntsc_resync_parameters, }, { - .name = "PAL", + .tv_mode = DRM_MODE_TV_MODE_PAL, .mode = SUN4I_TVE_CFG0_RES_576i, .chroma_freq = 0x2a098acb, .back_porch = 138, .front_porch = 24, - .line_number = 625, - - .hdisplay = 720, - .hfront_porch = 3, - .hsync_len = 2, - .hback_porch = 139, - - .vdisplay = 576, - .vfront_porch = 28, - .vsync_len = 2, - .vback_porch = 19, .vblank_level = 252, @@ -276,63 +245,21 @@ drm_encoder_to_sun4i_tv(struct drm_encoder *encoder) encoder); } -/* - * FIXME: If only the drm_display_mode private field was usable, this - * could go away... - * - * So far, it doesn't seem to be preserved when the mode is passed by - * to mode_set for some reason. - */ -static const struct tv_mode *sun4i_tv_find_tv_by_mode(const struct drm_display_mode *mode) +static const struct tv_mode * +sun4i_tv_find_tv_by_mode(unsigned int mode) { int i; - /* First try to identify the mode by name */ for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { const struct tv_mode *tv_mode = &tv_modes[i]; - DRM_DEBUG_DRIVER("Comparing mode %s vs %s", - mode->name, tv_mode->name); - - if (!strcmp(mode->name, tv_mode->name)) - return tv_mode; - } - - /* Then by number of lines */ - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - const struct tv_mode *tv_mode = &tv_modes[i]; - - DRM_DEBUG_DRIVER("Comparing mode %s vs %s (X: %d vs %d)", - mode->name, tv_mode->name, - mode->vdisplay, tv_mode->vdisplay); - - if (mode->vdisplay == tv_mode->vdisplay) + if (tv_mode->tv_mode == mode) return tv_mode; } return NULL; } -static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode, - struct drm_display_mode *mode) -{ - DRM_DEBUG_DRIVER("Creating mode %s\n", mode->name); - - mode->type = DRM_MODE_TYPE_DRIVER; - mode->clock = 13500; - mode->flags = DRM_MODE_FLAG_INTERLACE; - - mode->hdisplay = tv_mode->hdisplay; - mode->hsync_start = mode->hdisplay + tv_mode->hfront_porch; - mode->hsync_end = mode->hsync_start + tv_mode->hsync_len; - mode->htotal = mode->hsync_end + tv_mode->hback_porch; - - mode->vdisplay = tv_mode->vdisplay; - mode->vsync_start = mode->vdisplay + tv_mode->vfront_porch; - mode->vsync_end = mode->vsync_start + tv_mode->vsync_len; - mode->vtotal = mode->vsync_end + tv_mode->vback_porch; -} - static void sun4i_tv_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { @@ -356,7 +283,11 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, encoder->crtc); struct drm_display_mode *mode = &crtc_state->mode; - const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode); + struct drm_connector *connector = &tv->connector; + struct drm_connector_state *conn_state = + drm_atomic_get_new_connector_state(state, connector); + const struct tv_mode *tv_mode = + sun4i_tv_find_tv_by_mode(conn_state->tv.mode); DRM_DEBUG_DRIVER("Enabling the TV Output\n"); @@ -404,7 +335,7 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, /* Set the lines setup */ regmap_write(tv->regs, SUN4I_TVE_LINE_REG, SUN4I_TVE_LINE_FIRST(22) | - SUN4I_TVE_LINE_NUMBER(tv_mode->line_number)); + SUN4I_TVE_LINE_NUMBER(mode->vtotal)); regmap_write(tv->regs, SUN4I_TVE_LEVEL_REG, SUN4I_TVE_LEVEL_BLANK(tv_mode->video_levels->blank) | @@ -465,37 +396,21 @@ static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { .atomic_enable = sun4i_tv_enable, }; -static int sun4i_tv_comp_get_modes(struct drm_connector *connector) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - struct drm_display_mode *mode; - const struct tv_mode *tv_mode = &tv_modes[i]; - - mode = drm_mode_create(connector->dev); - if (!mode) { - DRM_ERROR("Failed to create a new display mode\n"); - return 0; - } - - strcpy(mode->name, tv_mode->name); - - sun4i_tv_mode_to_drm_mode(tv_mode, mode); - drm_mode_probed_add(connector, mode); - } - - return i; -} - static const struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = { - .get_modes = sun4i_tv_comp_get_modes, + .atomic_check = drm_atomic_helper_connector_tv_check, + .get_modes = drm_connector_helper_tv_get_modes, }; +static void sun4i_tv_connector_reset(struct drm_connector *connector) +{ + drm_atomic_helper_connector_reset(connector); + drm_atomic_helper_connector_tv_reset(connector); +} + static const struct drm_connector_funcs sun4i_tv_comp_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, - .reset = drm_atomic_helper_connector_reset, + .reset = sun4i_tv_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; @@ -587,8 +502,20 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, drm_connector_attach_encoder(&tv->connector, &tv->encoder); + ret = drm_mode_create_tv_properties(drm, + BIT(DRM_MODE_TV_MODE_NTSC) | + BIT(DRM_MODE_TV_MODE_PAL)); + if (ret) + goto err_cleanup_connector; + + drm_object_attach_property(&tv->connector.base, + drm->mode_config.tv_mode_property, + DRM_MODE_TV_MODE_NTSC); + return 0; +err_cleanup_connector: + drm_connector_cleanup(&tv->connector); err_cleanup_encoder: drm_encoder_cleanup(&tv->encoder); err_disable_clk: -- 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 C6FB9C38A2D for ; Wed, 26 Oct 2022 15:36:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DA78310E583; Wed, 26 Oct 2022 15:34:48 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6335110E540; Wed, 26 Oct 2022 15:34:19 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id C1A06580418; Wed, 26 Oct 2022 11:34:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:18 -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=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=I OYKWkAUL4fqTm3eeMfQonDsDZMetnmKkktW61+SKYNJ83Z77yF20gInKjDkhWZ2V uMi6r6FN+d8AvfZdQTYgGB+zOKhWtCLpY17UZWdrp+U8C9fjH/fnEjFlnLehxChg OcAe7p3Ai77PKe5c+xR5d3eh8j1jHYzlsJX00U8QeHYP7ZNnJevv1b/NUSBkTc0b 0cYKwdbl/hlEVYkUVMeZrA+dsR6w0rBRqinIyLRFYy41qIH5G8A7AMw8tIk58m5l JqAHSUIyfqP+4HxsQISdKdl2D/jP9LYFIaNy/dH9ll9nrrZkrkkeNiEUfeV5JdIt 1JXCO1bUnaxliDUkNGjxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=c npehTTfRLM6AuBo/z4dD7NWSWDJYYAe56zDwrlBIYqDKxVmbaKEDJ9L5NReM4fuR Mk0o6mIOQ0s3qWULnVATn2MBUbeFAU86S0yaolGpnDc/HaReC1dTKTdegWNlUx/j D7M6ablNF5WJ2d4F99EkQsVYZPAJO296QWmkZiFIlrAEhQPrQYCrfjhvmGfI9biK TaABRxuV5B6ur7yDilYi+AfcC3Ib5zf3mJdE1E7iStHDuTSiOXYKvNE8izs59LVP X+CxTBStu4jVlpLd5dRRMa+jip6WFj3Q4l1xXHQwqh2+rX9B5LKvjpNU+t5acLqN Jmo4kWNltZtdoCciyG0Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:17 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:42 +0200 Subject: [PATCH v6 23/23] drm/sun4i: tv: Convert to the new TV mode property MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-23-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7620; i=maxime@cerno.tech; h=from:subject:message-id; bh=hsNs2n7C7f9hehl8S1tfoiQIMRx0LRBYDZVow6+rmgA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6WE6PeC8ZKJaksma3c8bTi4LZTeTmX1f5ZnN3uc+XS eg2ljlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAExkhwDD/wK+q7MebFApNXu0TnzCrC Py87/WW3Q3HVmhNW1RheOHH24Mv1mzNVUqev0y11QVMRtXMBcJ8b3R3/bSvbbw+OuZNkc3MAEA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Now that the core can deal fine with analog TV modes, let's convert the sun4i TV driver to leverage those new features. Acked-by: Noralf Trønnes Reviewed-by: Jernej Skrabec Signed-off-by: Maxime Ripard --- Changes in v6: - Convert to new get_modes helper Changes in v5: - Removed the count variable in get_modes - Removed spurious vc4 change --- drivers/gpu/drm/sun4i/sun4i_tv.c | 141 ++++++++++----------------------------- 1 file changed, 34 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index c65f0a89b6b0..9625a00a48ba 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -141,23 +141,14 @@ struct resync_parameters { struct tv_mode { char *name; + unsigned int tv_mode; + u32 mode; u32 chroma_freq; u16 back_porch; u16 front_porch; - u16 line_number; u16 vblank_level; - u32 hdisplay; - u16 hfront_porch; - u16 hsync_len; - u16 hback_porch; - - u32 vdisplay; - u16 vfront_porch; - u16 vsync_len; - u16 vback_porch; - bool yc_en; bool dac3_en; bool dac_bit25_en; @@ -213,7 +204,7 @@ static const struct resync_parameters pal_resync_parameters = { static const struct tv_mode tv_modes[] = { { - .name = "NTSC", + .tv_mode = DRM_MODE_TV_MODE_NTSC, .mode = SUN4I_TVE_CFG0_RES_480i, .chroma_freq = 0x21f07c1f, .yc_en = true, @@ -222,17 +213,6 @@ static const struct tv_mode tv_modes[] = { .back_porch = 118, .front_porch = 32, - .line_number = 525, - - .hdisplay = 720, - .hfront_porch = 18, - .hsync_len = 2, - .hback_porch = 118, - - .vdisplay = 480, - .vfront_porch = 26, - .vsync_len = 2, - .vback_porch = 17, .vblank_level = 240, @@ -242,23 +222,12 @@ static const struct tv_mode tv_modes[] = { .resync_params = &ntsc_resync_parameters, }, { - .name = "PAL", + .tv_mode = DRM_MODE_TV_MODE_PAL, .mode = SUN4I_TVE_CFG0_RES_576i, .chroma_freq = 0x2a098acb, .back_porch = 138, .front_porch = 24, - .line_number = 625, - - .hdisplay = 720, - .hfront_porch = 3, - .hsync_len = 2, - .hback_porch = 139, - - .vdisplay = 576, - .vfront_porch = 28, - .vsync_len = 2, - .vback_porch = 19, .vblank_level = 252, @@ -276,63 +245,21 @@ drm_encoder_to_sun4i_tv(struct drm_encoder *encoder) encoder); } -/* - * FIXME: If only the drm_display_mode private field was usable, this - * could go away... - * - * So far, it doesn't seem to be preserved when the mode is passed by - * to mode_set for some reason. - */ -static const struct tv_mode *sun4i_tv_find_tv_by_mode(const struct drm_display_mode *mode) +static const struct tv_mode * +sun4i_tv_find_tv_by_mode(unsigned int mode) { int i; - /* First try to identify the mode by name */ for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { const struct tv_mode *tv_mode = &tv_modes[i]; - DRM_DEBUG_DRIVER("Comparing mode %s vs %s", - mode->name, tv_mode->name); - - if (!strcmp(mode->name, tv_mode->name)) - return tv_mode; - } - - /* Then by number of lines */ - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - const struct tv_mode *tv_mode = &tv_modes[i]; - - DRM_DEBUG_DRIVER("Comparing mode %s vs %s (X: %d vs %d)", - mode->name, tv_mode->name, - mode->vdisplay, tv_mode->vdisplay); - - if (mode->vdisplay == tv_mode->vdisplay) + if (tv_mode->tv_mode == mode) return tv_mode; } return NULL; } -static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode, - struct drm_display_mode *mode) -{ - DRM_DEBUG_DRIVER("Creating mode %s\n", mode->name); - - mode->type = DRM_MODE_TYPE_DRIVER; - mode->clock = 13500; - mode->flags = DRM_MODE_FLAG_INTERLACE; - - mode->hdisplay = tv_mode->hdisplay; - mode->hsync_start = mode->hdisplay + tv_mode->hfront_porch; - mode->hsync_end = mode->hsync_start + tv_mode->hsync_len; - mode->htotal = mode->hsync_end + tv_mode->hback_porch; - - mode->vdisplay = tv_mode->vdisplay; - mode->vsync_start = mode->vdisplay + tv_mode->vfront_porch; - mode->vsync_end = mode->vsync_start + tv_mode->vsync_len; - mode->vtotal = mode->vsync_end + tv_mode->vback_porch; -} - static void sun4i_tv_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { @@ -356,7 +283,11 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, encoder->crtc); struct drm_display_mode *mode = &crtc_state->mode; - const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode); + struct drm_connector *connector = &tv->connector; + struct drm_connector_state *conn_state = + drm_atomic_get_new_connector_state(state, connector); + const struct tv_mode *tv_mode = + sun4i_tv_find_tv_by_mode(conn_state->tv.mode); DRM_DEBUG_DRIVER("Enabling the TV Output\n"); @@ -404,7 +335,7 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, /* Set the lines setup */ regmap_write(tv->regs, SUN4I_TVE_LINE_REG, SUN4I_TVE_LINE_FIRST(22) | - SUN4I_TVE_LINE_NUMBER(tv_mode->line_number)); + SUN4I_TVE_LINE_NUMBER(mode->vtotal)); regmap_write(tv->regs, SUN4I_TVE_LEVEL_REG, SUN4I_TVE_LEVEL_BLANK(tv_mode->video_levels->blank) | @@ -465,37 +396,21 @@ static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { .atomic_enable = sun4i_tv_enable, }; -static int sun4i_tv_comp_get_modes(struct drm_connector *connector) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - struct drm_display_mode *mode; - const struct tv_mode *tv_mode = &tv_modes[i]; - - mode = drm_mode_create(connector->dev); - if (!mode) { - DRM_ERROR("Failed to create a new display mode\n"); - return 0; - } - - strcpy(mode->name, tv_mode->name); - - sun4i_tv_mode_to_drm_mode(tv_mode, mode); - drm_mode_probed_add(connector, mode); - } - - return i; -} - static const struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = { - .get_modes = sun4i_tv_comp_get_modes, + .atomic_check = drm_atomic_helper_connector_tv_check, + .get_modes = drm_connector_helper_tv_get_modes, }; +static void sun4i_tv_connector_reset(struct drm_connector *connector) +{ + drm_atomic_helper_connector_reset(connector); + drm_atomic_helper_connector_tv_reset(connector); +} + static const struct drm_connector_funcs sun4i_tv_comp_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, - .reset = drm_atomic_helper_connector_reset, + .reset = sun4i_tv_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; @@ -587,8 +502,20 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, drm_connector_attach_encoder(&tv->connector, &tv->encoder); + ret = drm_mode_create_tv_properties(drm, + BIT(DRM_MODE_TV_MODE_NTSC) | + BIT(DRM_MODE_TV_MODE_PAL)); + if (ret) + goto err_cleanup_connector; + + drm_object_attach_property(&tv->connector.base, + drm->mode_config.tv_mode_property, + DRM_MODE_TV_MODE_NTSC); + return 0; +err_cleanup_connector: + drm_connector_cleanup(&tv->connector); err_cleanup_encoder: drm_encoder_cleanup(&tv->encoder); err_disable_clk: -- 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 7DD52C433FE for ; Wed, 26 Oct 2022 15:36:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8B9610E568; Wed, 26 Oct 2022 15:34:28 +0000 (UTC) Received: from new4-smtp.messagingengine.com (new4-smtp.messagingengine.com [66.111.4.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6335110E540; Wed, 26 Oct 2022 15:34:19 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id C1A06580418; Wed, 26 Oct 2022 11:34:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:18 -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=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=I OYKWkAUL4fqTm3eeMfQonDsDZMetnmKkktW61+SKYNJ83Z77yF20gInKjDkhWZ2V uMi6r6FN+d8AvfZdQTYgGB+zOKhWtCLpY17UZWdrp+U8C9fjH/fnEjFlnLehxChg OcAe7p3Ai77PKe5c+xR5d3eh8j1jHYzlsJX00U8QeHYP7ZNnJevv1b/NUSBkTc0b 0cYKwdbl/hlEVYkUVMeZrA+dsR6w0rBRqinIyLRFYy41qIH5G8A7AMw8tIk58m5l JqAHSUIyfqP+4HxsQISdKdl2D/jP9LYFIaNy/dH9ll9nrrZkrkkeNiEUfeV5JdIt 1JXCO1bUnaxliDUkNGjxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=c npehTTfRLM6AuBo/z4dD7NWSWDJYYAe56zDwrlBIYqDKxVmbaKEDJ9L5NReM4fuR Mk0o6mIOQ0s3qWULnVATn2MBUbeFAU86S0yaolGpnDc/HaReC1dTKTdegWNlUx/j D7M6ablNF5WJ2d4F99EkQsVYZPAJO296QWmkZiFIlrAEhQPrQYCrfjhvmGfI9biK TaABRxuV5B6ur7yDilYi+AfcC3Ib5zf3mJdE1E7iStHDuTSiOXYKvNE8izs59LVP X+CxTBStu4jVlpLd5dRRMa+jip6WFj3Q4l1xXHQwqh2+rX9B5LKvjpNU+t5acLqN Jmo4kWNltZtdoCciyG0Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:17 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:42 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" Message-Id: <20220728-rpi-analog-tv-properties-v6-23-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7620; i=maxime@cerno.tech; h=from:subject:message-id; bh=hsNs2n7C7f9hehl8S1tfoiQIMRx0LRBYDZVow6+rmgA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6WE6PeC8ZKJaksma3c8bTi4LZTeTmX1f5ZnN3uc+XS eg2ljlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAExkhwDD/wK+q7MebFApNXu0TnzCrC Py87/WW3Q3HVmhNW1RheOHH24Mv1mzNVUqev0y11QVMRtXMBcJ8b3R3/bSvbbw+OuZNkc3MAEA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D Subject: [Intel-gfx] [PATCH v6 23/23] drm/sun4i: tv: Convert to the new TV mode property X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dom Cobley , Dave Stevenson , nouveau@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@lists.linux.dev, Hans de Goede , Noralf Trønnes , Geert Uytterhoeven , Maxime Ripard , Mateusz Kwiatkowski , Phil Elwell , linux-arm-kernel@lists.infradead.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Now that the core can deal fine with analog TV modes, let's convert the sun4i TV driver to leverage those new features. Acked-by: Noralf Trønnes Reviewed-by: Jernej Skrabec Signed-off-by: Maxime Ripard --- Changes in v6: - Convert to new get_modes helper Changes in v5: - Removed the count variable in get_modes - Removed spurious vc4 change --- drivers/gpu/drm/sun4i/sun4i_tv.c | 141 ++++++++++----------------------------- 1 file changed, 34 insertions(+), 107 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c index c65f0a89b6b0..9625a00a48ba 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tv.c +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c @@ -141,23 +141,14 @@ struct resync_parameters { struct tv_mode { char *name; + unsigned int tv_mode; + u32 mode; u32 chroma_freq; u16 back_porch; u16 front_porch; - u16 line_number; u16 vblank_level; - u32 hdisplay; - u16 hfront_porch; - u16 hsync_len; - u16 hback_porch; - - u32 vdisplay; - u16 vfront_porch; - u16 vsync_len; - u16 vback_porch; - bool yc_en; bool dac3_en; bool dac_bit25_en; @@ -213,7 +204,7 @@ static const struct resync_parameters pal_resync_parameters = { static const struct tv_mode tv_modes[] = { { - .name = "NTSC", + .tv_mode = DRM_MODE_TV_MODE_NTSC, .mode = SUN4I_TVE_CFG0_RES_480i, .chroma_freq = 0x21f07c1f, .yc_en = true, @@ -222,17 +213,6 @@ static const struct tv_mode tv_modes[] = { .back_porch = 118, .front_porch = 32, - .line_number = 525, - - .hdisplay = 720, - .hfront_porch = 18, - .hsync_len = 2, - .hback_porch = 118, - - .vdisplay = 480, - .vfront_porch = 26, - .vsync_len = 2, - .vback_porch = 17, .vblank_level = 240, @@ -242,23 +222,12 @@ static const struct tv_mode tv_modes[] = { .resync_params = &ntsc_resync_parameters, }, { - .name = "PAL", + .tv_mode = DRM_MODE_TV_MODE_PAL, .mode = SUN4I_TVE_CFG0_RES_576i, .chroma_freq = 0x2a098acb, .back_porch = 138, .front_porch = 24, - .line_number = 625, - - .hdisplay = 720, - .hfront_porch = 3, - .hsync_len = 2, - .hback_porch = 139, - - .vdisplay = 576, - .vfront_porch = 28, - .vsync_len = 2, - .vback_porch = 19, .vblank_level = 252, @@ -276,63 +245,21 @@ drm_encoder_to_sun4i_tv(struct drm_encoder *encoder) encoder); } -/* - * FIXME: If only the drm_display_mode private field was usable, this - * could go away... - * - * So far, it doesn't seem to be preserved when the mode is passed by - * to mode_set for some reason. - */ -static const struct tv_mode *sun4i_tv_find_tv_by_mode(const struct drm_display_mode *mode) +static const struct tv_mode * +sun4i_tv_find_tv_by_mode(unsigned int mode) { int i; - /* First try to identify the mode by name */ for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { const struct tv_mode *tv_mode = &tv_modes[i]; - DRM_DEBUG_DRIVER("Comparing mode %s vs %s", - mode->name, tv_mode->name); - - if (!strcmp(mode->name, tv_mode->name)) - return tv_mode; - } - - /* Then by number of lines */ - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - const struct tv_mode *tv_mode = &tv_modes[i]; - - DRM_DEBUG_DRIVER("Comparing mode %s vs %s (X: %d vs %d)", - mode->name, tv_mode->name, - mode->vdisplay, tv_mode->vdisplay); - - if (mode->vdisplay == tv_mode->vdisplay) + if (tv_mode->tv_mode == mode) return tv_mode; } return NULL; } -static void sun4i_tv_mode_to_drm_mode(const struct tv_mode *tv_mode, - struct drm_display_mode *mode) -{ - DRM_DEBUG_DRIVER("Creating mode %s\n", mode->name); - - mode->type = DRM_MODE_TYPE_DRIVER; - mode->clock = 13500; - mode->flags = DRM_MODE_FLAG_INTERLACE; - - mode->hdisplay = tv_mode->hdisplay; - mode->hsync_start = mode->hdisplay + tv_mode->hfront_porch; - mode->hsync_end = mode->hsync_start + tv_mode->hsync_len; - mode->htotal = mode->hsync_end + tv_mode->hback_porch; - - mode->vdisplay = tv_mode->vdisplay; - mode->vsync_start = mode->vdisplay + tv_mode->vfront_porch; - mode->vsync_end = mode->vsync_start + tv_mode->vsync_len; - mode->vtotal = mode->vsync_end + tv_mode->vback_porch; -} - static void sun4i_tv_disable(struct drm_encoder *encoder, struct drm_atomic_state *state) { @@ -356,7 +283,11 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, encoder->crtc); struct drm_display_mode *mode = &crtc_state->mode; - const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode); + struct drm_connector *connector = &tv->connector; + struct drm_connector_state *conn_state = + drm_atomic_get_new_connector_state(state, connector); + const struct tv_mode *tv_mode = + sun4i_tv_find_tv_by_mode(conn_state->tv.mode); DRM_DEBUG_DRIVER("Enabling the TV Output\n"); @@ -404,7 +335,7 @@ static void sun4i_tv_enable(struct drm_encoder *encoder, /* Set the lines setup */ regmap_write(tv->regs, SUN4I_TVE_LINE_REG, SUN4I_TVE_LINE_FIRST(22) | - SUN4I_TVE_LINE_NUMBER(tv_mode->line_number)); + SUN4I_TVE_LINE_NUMBER(mode->vtotal)); regmap_write(tv->regs, SUN4I_TVE_LEVEL_REG, SUN4I_TVE_LEVEL_BLANK(tv_mode->video_levels->blank) | @@ -465,37 +396,21 @@ static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = { .atomic_enable = sun4i_tv_enable, }; -static int sun4i_tv_comp_get_modes(struct drm_connector *connector) -{ - int i; - - for (i = 0; i < ARRAY_SIZE(tv_modes); i++) { - struct drm_display_mode *mode; - const struct tv_mode *tv_mode = &tv_modes[i]; - - mode = drm_mode_create(connector->dev); - if (!mode) { - DRM_ERROR("Failed to create a new display mode\n"); - return 0; - } - - strcpy(mode->name, tv_mode->name); - - sun4i_tv_mode_to_drm_mode(tv_mode, mode); - drm_mode_probed_add(connector, mode); - } - - return i; -} - static const struct drm_connector_helper_funcs sun4i_tv_comp_connector_helper_funcs = { - .get_modes = sun4i_tv_comp_get_modes, + .atomic_check = drm_atomic_helper_connector_tv_check, + .get_modes = drm_connector_helper_tv_get_modes, }; +static void sun4i_tv_connector_reset(struct drm_connector *connector) +{ + drm_atomic_helper_connector_reset(connector); + drm_atomic_helper_connector_tv_reset(connector); +} + static const struct drm_connector_funcs sun4i_tv_comp_connector_funcs = { .fill_modes = drm_helper_probe_single_connector_modes, .destroy = drm_connector_cleanup, - .reset = drm_atomic_helper_connector_reset, + .reset = sun4i_tv_connector_reset, .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; @@ -587,8 +502,20 @@ static int sun4i_tv_bind(struct device *dev, struct device *master, drm_connector_attach_encoder(&tv->connector, &tv->encoder); + ret = drm_mode_create_tv_properties(drm, + BIT(DRM_MODE_TV_MODE_NTSC) | + BIT(DRM_MODE_TV_MODE_PAL)); + if (ret) + goto err_cleanup_connector; + + drm_object_attach_property(&tv->connector.base, + drm->mode_config.tv_mode_property, + DRM_MODE_TV_MODE_NTSC); + return 0; +err_cleanup_connector: + drm_connector_cleanup(&tv->connector); err_cleanup_encoder: drm_encoder_cleanup(&tv->encoder); err_disable_clk: -- 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 64857C433FE for ; Wed, 26 Oct 2022 15:53:14 +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=dkVD/9iSZBljHQwXaHPKPUn6VQODqD4RsQLpKiowFOU=; b=vKyAidEr2ZarBH sioZDhXcN0vw9tBeifGfbuR5lkOL0W5ndbawma72i+UBcNprqNMZl0xZuqPYnp9OJGwDvRCMGzmmd JaIhLPZreNiScpBVyPaYkoizxjnjl6RHjjx59+ayzqpI6t8aIQhzN0SRDoeHyFq9gNQWLZvUgSyNK l/Hf5AL4Zelj4nKk+oqom9Jpx7ldwOT9hMmc03ROKqOyhL0I7r43jjG8p2R+IguVGJyQINLT4zNd/ I+62AgZKUo/0DK9n2QiJ+cwxAkCb1MnIUC1dplzKErfOPxhMXJjLEjnaSxW3RxEVlF0fVszjQc6He C19nQ9Gmc7tcxUmHZ/Ig==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1onigl-00A0Oj-9L; Wed, 26 Oct 2022 15:51:35 +0000 Received: from new4-smtp.messagingengine.com ([66.111.4.230]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oniQ7-009uFG-Db for linux-arm-kernel@lists.infradead.org; Wed, 26 Oct 2022 15:34:21 +0000 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id C1A06580418; Wed, 26 Oct 2022 11:34:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 26 Oct 2022 11:34:18 -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=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=I OYKWkAUL4fqTm3eeMfQonDsDZMetnmKkktW61+SKYNJ83Z77yF20gInKjDkhWZ2V uMi6r6FN+d8AvfZdQTYgGB+zOKhWtCLpY17UZWdrp+U8C9fjH/fnEjFlnLehxChg OcAe7p3Ai77PKe5c+xR5d3eh8j1jHYzlsJX00U8QeHYP7ZNnJevv1b/NUSBkTc0b 0cYKwdbl/hlEVYkUVMeZrA+dsR6w0rBRqinIyLRFYy41qIH5G8A7AMw8tIk58m5l JqAHSUIyfqP+4HxsQISdKdl2D/jP9LYFIaNy/dH9ll9nrrZkrkkeNiEUfeV5JdIt 1JXCO1bUnaxliDUkNGjxQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1666798458; x= 1666805658; bh=s0oohZSryHTvS6AqnbyD508bkpJln3+0v4TZJ9DnLl4=; b=c npehTTfRLM6AuBo/z4dD7NWSWDJYYAe56zDwrlBIYqDKxVmbaKEDJ9L5NReM4fuR Mk0o6mIOQ0s3qWULnVATn2MBUbeFAU86S0yaolGpnDc/HaReC1dTKTdegWNlUx/j D7M6ablNF5WJ2d4F99EkQsVYZPAJO296QWmkZiFIlrAEhQPrQYCrfjhvmGfI9biK TaABRxuV5B6ur7yDilYi+AfcC3Ib5zf3mJdE1E7iStHDuTSiOXYKvNE8izs59LVP X+CxTBStu4jVlpLd5dRRMa+jip6WFj3Q4l1xXHQwqh2+rX9B5LKvjpNU+t5acLqN Jmo4kWNltZtdoCciyG0Dw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvgedrtddvgdeltdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhfffuggfgtgfkfhgjvfevofesthekredtredtjeenucfhrhhomhepmhgrgihi mhgvsegtvghrnhhordhtvggthhenucggtffrrghtthgvrhhnpeeltdekveelgfelveelfe duheelvdegudffgefhudehgeevjefhhefhhefgvdeuvdenucevlhhushhtvghrufhiiigv peefnecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrgigihhmvgestggvrhhnohdrthgvtg hh X-ME-Proxy: Feedback-ID: i8771445c:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 26 Oct 2022 11:34:17 -0400 (EDT) From: maxime@cerno.tech Date: Wed, 26 Oct 2022 17:33:42 +0200 Subject: [PATCH v6 23/23] drm/sun4i: tv: Convert to the new TV mode property MIME-Version: 1.0 Message-Id: <20220728-rpi-analog-tv-properties-v6-23-e7792734108f@cerno.tech> References: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> In-Reply-To: <20220728-rpi-analog-tv-properties-v6-0-e7792734108f@cerno.tech> To: Karol Herbst , Emma Anholt , Ben Skeggs , Chen-Yu Tsai , Rodrigo Vivi , Maarten Lankhorst , Jani Nikula , Daniel Vetter , Thomas Zimmermann , Tvrtko Ursulin , Samuel Holland , Jernej Skrabec , David Airlie , Maxime Ripard , Joonas Lahtinen , Lyude Paul Cc: linux-sunxi@lists.linux.dev, Maxime Ripard , intel-gfx@lists.freedesktop.org, Phil Elwell , linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, Hans de Goede , Dom Cobley , Mateusz Kwiatkowski , dri-devel@lists.freedesktop.org, Dave Stevenson , linux-kernel@vger.kernel.org, Noralf Trønnes , Geert Uytterhoeven X-Mailer: b4 0.11.0-dev-99e3a X-Developer-Signature: v=1; a=openpgp-sha256; l=7620; i=maxime@cerno.tech; h=from:subject:message-id; bh=hsNs2n7C7f9hehl8S1tfoiQIMRx0LRBYDZVow6+rmgA=; b=owGbwMvMwCX2+D1vfrpE4FHG02pJDMmRwe6WE6PeC8ZKJaksma3c8bTi4LZTeTmX1f5ZnN3uc+XS eg2ljlIWBjEuBlkxRZYYYfMlcadmve5k45sHM4eVCWQIAxenAExkhwDD/wK+q7MebFApNXu0TnzCrC Py87/WW3Q3HVmhNW1RheOHH24Mv1mzNVUqev0y11QVMRtXMBcJ8b3R3/bSvbbw+OuZNkc3MAEA X-Developer-Key: i=maxime@cerno.tech; a=openpgp; fpr=BE5675C37E818C8B5764241C254BCFC56BF6CE8D X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221026_083419_660345_06DA0708 X-CRM114-Status: GOOD ( 21.76 ) 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 Tm93IHRoYXQgdGhlIGNvcmUgY2FuIGRlYWwgZmluZSB3aXRoIGFuYWxvZyBUViBtb2RlcywgbGV0 J3MgY29udmVydCB0aGUKc3VuNGkgVFYgZHJpdmVyIHRvIGxldmVyYWdlIHRob3NlIG5ldyBmZWF0 dXJlcy4KCkFja2VkLWJ5OiBOb3JhbGYgVHLDuG5uZXMgPG5vcmFsZkB0cm9ubmVzLm9yZz4KUmV2 aWV3ZWQtYnk6IEplcm5laiBTa3JhYmVjIDxqZXJuZWouc2tyYWJlY0BnbWFpbC5jb20+ClNpZ25l ZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZUBjZXJuby50ZWNoPgoKLS0tCkNoYW5nZXMg aW4gdjY6Ci0gQ29udmVydCB0byBuZXcgZ2V0X21vZGVzIGhlbHBlcgoKQ2hhbmdlcyBpbiB2NToK LSBSZW1vdmVkIHRoZSBjb3VudCB2YXJpYWJsZSBpbiBnZXRfbW9kZXMKLSBSZW1vdmVkIHNwdXJp b3VzIHZjNCBjaGFuZ2UKLS0tCiBkcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlfdHYuYyB8IDE0 MSArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAzNCBpbnNlcnRpb25zKCspLCAxMDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL3N1bjRpL3N1bjRpX3R2LmMgYi9kcml2ZXJzL2dwdS9kcm0vc3VuNGkvc3VuNGlf dHYuYwppbmRleCBjNjVmMGE4OWI2YjAuLjk2MjVhMDBhNDhiYSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3N1bjRpL3N1bjRpX3R2LmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3N1bjRpL3N1 bjRpX3R2LmMKQEAgLTE0MSwyMyArMTQxLDE0IEBAIHN0cnVjdCByZXN5bmNfcGFyYW1ldGVycyB7 CiBzdHJ1Y3QgdHZfbW9kZSB7CiAJY2hhcgkJKm5hbWU7CiAKKwl1bnNpZ25lZCBpbnQJdHZfbW9k ZTsKKwogCXUzMgkJbW9kZTsKIAl1MzIJCWNocm9tYV9mcmVxOwogCXUxNgkJYmFja19wb3JjaDsK IAl1MTYJCWZyb250X3BvcmNoOwotCXUxNgkJbGluZV9udW1iZXI7CiAJdTE2CQl2YmxhbmtfbGV2 ZWw7CiAKLQl1MzIJCWhkaXNwbGF5OwotCXUxNgkJaGZyb250X3BvcmNoOwotCXUxNgkJaHN5bmNf bGVuOwotCXUxNgkJaGJhY2tfcG9yY2g7Ci0KLQl1MzIJCXZkaXNwbGF5OwotCXUxNgkJdmZyb250 X3BvcmNoOwotCXUxNgkJdnN5bmNfbGVuOwotCXUxNgkJdmJhY2tfcG9yY2g7Ci0KIAlib29sCQl5 Y19lbjsKIAlib29sCQlkYWMzX2VuOwogCWJvb2wJCWRhY19iaXQyNV9lbjsKQEAgLTIxMyw3ICsy MDQsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IHJlc3luY19wYXJhbWV0ZXJzIHBhbF9yZXN5bmNf cGFyYW1ldGVycyA9IHsKIAogc3RhdGljIGNvbnN0IHN0cnVjdCB0dl9tb2RlIHR2X21vZGVzW10g PSB7CiAJewotCQkubmFtZQkJPSAiTlRTQyIsCisJCS50dl9tb2RlCT0gRFJNX01PREVfVFZfTU9E RV9OVFNDLAogCQkubW9kZQkJPSBTVU40SV9UVkVfQ0ZHMF9SRVNfNDgwaSwKIAkJLmNocm9tYV9m cmVxCT0gMHgyMWYwN2MxZiwKIAkJLnljX2VuCQk9IHRydWUsCkBAIC0yMjIsMTcgKzIxMyw2IEBA IHN0YXRpYyBjb25zdCBzdHJ1Y3QgdHZfbW9kZSB0dl9tb2Rlc1tdID0gewogCiAJCS5iYWNrX3Bv cmNoCT0gMTE4LAogCQkuZnJvbnRfcG9yY2gJPSAzMiwKLQkJLmxpbmVfbnVtYmVyCT0gNTI1LAot Ci0JCS5oZGlzcGxheQk9IDcyMCwKLQkJLmhmcm9udF9wb3JjaAk9IDE4LAotCQkuaHN5bmNfbGVu CT0gMiwKLQkJLmhiYWNrX3BvcmNoCT0gMTE4LAotCi0JCS52ZGlzcGxheQk9IDQ4MCwKLQkJLnZm cm9udF9wb3JjaAk9IDI2LAotCQkudnN5bmNfbGVuCT0gMiwKLQkJLnZiYWNrX3BvcmNoCT0gMTcs CiAKIAkJLnZibGFua19sZXZlbAk9IDI0MCwKIApAQCAtMjQyLDIzICsyMjIsMTIgQEAgc3RhdGlj IGNvbnN0IHN0cnVjdCB0dl9tb2RlIHR2X21vZGVzW10gPSB7CiAJCS5yZXN5bmNfcGFyYW1zCT0g Jm50c2NfcmVzeW5jX3BhcmFtZXRlcnMsCiAJfSwKIAl7Ci0JCS5uYW1lCQk9ICJQQUwiLAorCQku dHZfbW9kZQk9IERSTV9NT0RFX1RWX01PREVfUEFMLAogCQkubW9kZQkJPSBTVU40SV9UVkVfQ0ZH MF9SRVNfNTc2aSwKIAkJLmNocm9tYV9mcmVxCT0gMHgyYTA5OGFjYiwKIAogCQkuYmFja19wb3Jj aAk9IDEzOCwKIAkJLmZyb250X3BvcmNoCT0gMjQsCi0JCS5saW5lX251bWJlcgk9IDYyNSwKLQot CQkuaGRpc3BsYXkJPSA3MjAsCi0JCS5oZnJvbnRfcG9yY2gJPSAzLAotCQkuaHN5bmNfbGVuCT0g MiwKLQkJLmhiYWNrX3BvcmNoCT0gMTM5LAotCi0JCS52ZGlzcGxheQk9IDU3NiwKLQkJLnZmcm9u dF9wb3JjaAk9IDI4LAotCQkudnN5bmNfbGVuCT0gMiwKLQkJLnZiYWNrX3BvcmNoCT0gMTksCiAK IAkJLnZibGFua19sZXZlbAk9IDI1MiwKIApAQCAtMjc2LDYzICsyNDUsMjEgQEAgZHJtX2VuY29k ZXJfdG9fc3VuNGlfdHYoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyKQogCQkJICAgIGVuY29k ZXIpOwogfQogCi0vKgotICogRklYTUU6IElmIG9ubHkgdGhlIGRybV9kaXNwbGF5X21vZGUgcHJp dmF0ZSBmaWVsZCB3YXMgdXNhYmxlLCB0aGlzCi0gKiBjb3VsZCBnbyBhd2F5Li4uCi0gKgotICog U28gZmFyLCBpdCBkb2Vzbid0IHNlZW0gdG8gYmUgcHJlc2VydmVkIHdoZW4gdGhlIG1vZGUgaXMg cGFzc2VkIGJ5Ci0gKiB0byBtb2RlX3NldCBmb3Igc29tZSByZWFzb24uCi0gKi8KLXN0YXRpYyBj b25zdCBzdHJ1Y3QgdHZfbW9kZSAqc3VuNGlfdHZfZmluZF90dl9ieV9tb2RlKGNvbnN0IHN0cnVj dCBkcm1fZGlzcGxheV9tb2RlICptb2RlKQorc3RhdGljIGNvbnN0IHN0cnVjdCB0dl9tb2RlICoK K3N1bjRpX3R2X2ZpbmRfdHZfYnlfbW9kZSh1bnNpZ25lZCBpbnQgbW9kZSkKIHsKIAlpbnQgaTsK IAotCS8qIEZpcnN0IHRyeSB0byBpZGVudGlmeSB0aGUgbW9kZSBieSBuYW1lICovCiAJZm9yIChp ID0gMDsgaSA8IEFSUkFZX1NJWkUodHZfbW9kZXMpOyBpKyspIHsKIAkJY29uc3Qgc3RydWN0IHR2 X21vZGUgKnR2X21vZGUgPSAmdHZfbW9kZXNbaV07CiAKLQkJRFJNX0RFQlVHX0RSSVZFUigiQ29t cGFyaW5nIG1vZGUgJXMgdnMgJXMiLAotCQkJCSBtb2RlLT5uYW1lLCB0dl9tb2RlLT5uYW1lKTsK LQotCQlpZiAoIXN0cmNtcChtb2RlLT5uYW1lLCB0dl9tb2RlLT5uYW1lKSkKLQkJCXJldHVybiB0 dl9tb2RlOwotCX0KLQotCS8qIFRoZW4gYnkgbnVtYmVyIG9mIGxpbmVzICovCi0JZm9yIChpID0g MDsgaSA8IEFSUkFZX1NJWkUodHZfbW9kZXMpOyBpKyspIHsKLQkJY29uc3Qgc3RydWN0IHR2X21v ZGUgKnR2X21vZGUgPSAmdHZfbW9kZXNbaV07Ci0KLQkJRFJNX0RFQlVHX0RSSVZFUigiQ29tcGFy aW5nIG1vZGUgJXMgdnMgJXMgKFg6ICVkIHZzICVkKSIsCi0JCQkJIG1vZGUtPm5hbWUsIHR2X21v ZGUtPm5hbWUsCi0JCQkJIG1vZGUtPnZkaXNwbGF5LCB0dl9tb2RlLT52ZGlzcGxheSk7Ci0KLQkJ aWYgKG1vZGUtPnZkaXNwbGF5ID09IHR2X21vZGUtPnZkaXNwbGF5KQorCQlpZiAodHZfbW9kZS0+ dHZfbW9kZSA9PSBtb2RlKQogCQkJcmV0dXJuIHR2X21vZGU7CiAJfQogCiAJcmV0dXJuIE5VTEw7 CiB9CiAKLXN0YXRpYyB2b2lkIHN1bjRpX3R2X21vZGVfdG9fZHJtX21vZGUoY29uc3Qgc3RydWN0 IHR2X21vZGUgKnR2X21vZGUsCi0JCQkJICAgICAgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUpCi17Ci0JRFJNX0RFQlVHX0RSSVZFUigiQ3JlYXRpbmcgbW9kZSAlc1xuIiwgbW9kZS0+bmFt ZSk7Ci0KLQltb2RlLT50eXBlID0gRFJNX01PREVfVFlQRV9EUklWRVI7Ci0JbW9kZS0+Y2xvY2sg PSAxMzUwMDsKLQltb2RlLT5mbGFncyA9IERSTV9NT0RFX0ZMQUdfSU5URVJMQUNFOwotCi0JbW9k ZS0+aGRpc3BsYXkgPSB0dl9tb2RlLT5oZGlzcGxheTsKLQltb2RlLT5oc3luY19zdGFydCA9IG1v ZGUtPmhkaXNwbGF5ICsgdHZfbW9kZS0+aGZyb250X3BvcmNoOwotCW1vZGUtPmhzeW5jX2VuZCA9 IG1vZGUtPmhzeW5jX3N0YXJ0ICsgdHZfbW9kZS0+aHN5bmNfbGVuOwotCW1vZGUtPmh0b3RhbCA9 IG1vZGUtPmhzeW5jX2VuZCAgKyB0dl9tb2RlLT5oYmFja19wb3JjaDsKLQotCW1vZGUtPnZkaXNw bGF5ID0gdHZfbW9kZS0+dmRpc3BsYXk7Ci0JbW9kZS0+dnN5bmNfc3RhcnQgPSBtb2RlLT52ZGlz cGxheSArIHR2X21vZGUtPnZmcm9udF9wb3JjaDsKLQltb2RlLT52c3luY19lbmQgPSBtb2RlLT52 c3luY19zdGFydCArIHR2X21vZGUtPnZzeW5jX2xlbjsKLQltb2RlLT52dG90YWwgPSBtb2RlLT52 c3luY19lbmQgICsgdHZfbW9kZS0+dmJhY2tfcG9yY2g7Ci19Ci0KIHN0YXRpYyB2b2lkIHN1bjRp X3R2X2Rpc2FibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAogCQkJICAgIHN0cnVjdCBk cm1fYXRvbWljX3N0YXRlICpzdGF0ZSkKIHsKQEAgLTM1Niw3ICsyODMsMTEgQEAgc3RhdGljIHZv aWQgc3VuNGlfdHZfZW5hYmxlKHN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciwKIAlzdHJ1Y3Qg ZHJtX2NydGNfc3RhdGUgKmNydGNfc3RhdGUgPQogCQlkcm1fYXRvbWljX2dldF9uZXdfY3J0Y19z dGF0ZShzdGF0ZSwgZW5jb2Rlci0+Y3J0Yyk7CiAJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1v ZGUgPSAmY3J0Y19zdGF0ZS0+bW9kZTsKLQljb25zdCBzdHJ1Y3QgdHZfbW9kZSAqdHZfbW9kZSA9 IHN1bjRpX3R2X2ZpbmRfdHZfYnlfbW9kZShtb2RlKTsKKwlzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAq Y29ubmVjdG9yID0gJnR2LT5jb25uZWN0b3I7CisJc3RydWN0IGRybV9jb25uZWN0b3Jfc3RhdGUg KmNvbm5fc3RhdGUgPQorCQlkcm1fYXRvbWljX2dldF9uZXdfY29ubmVjdG9yX3N0YXRlKHN0YXRl LCBjb25uZWN0b3IpOworCWNvbnN0IHN0cnVjdCB0dl9tb2RlICp0dl9tb2RlID0KKwkJc3VuNGlf dHZfZmluZF90dl9ieV9tb2RlKGNvbm5fc3RhdGUtPnR2Lm1vZGUpOwogCiAJRFJNX0RFQlVHX0RS SVZFUigiRW5hYmxpbmcgdGhlIFRWIE91dHB1dFxuIik7CiAKQEAgLTQwNCw3ICszMzUsNyBAQCBz dGF0aWMgdm9pZCBzdW40aV90dl9lbmFibGUoc3RydWN0IGRybV9lbmNvZGVyICplbmNvZGVyLAog CS8qIFNldCB0aGUgbGluZXMgc2V0dXAgKi8KIAlyZWdtYXBfd3JpdGUodHYtPnJlZ3MsIFNVTjRJ X1RWRV9MSU5FX1JFRywKIAkJICAgICBTVU40SV9UVkVfTElORV9GSVJTVCgyMikgfAotCQkgICAg IFNVTjRJX1RWRV9MSU5FX05VTUJFUih0dl9tb2RlLT5saW5lX251bWJlcikpOworCQkgICAgIFNV TjRJX1RWRV9MSU5FX05VTUJFUihtb2RlLT52dG90YWwpKTsKIAogCXJlZ21hcF93cml0ZSh0di0+ cmVncywgU1VONElfVFZFX0xFVkVMX1JFRywKIAkJICAgICBTVU40SV9UVkVfTEVWRUxfQkxBTkso dHZfbW9kZS0+dmlkZW9fbGV2ZWxzLT5ibGFuaykgfApAQCAtNDY1LDM3ICszOTYsMjEgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBkcm1fZW5jb2Rlcl9oZWxwZXJfZnVuY3Mgc3VuNGlfdHZfaGVscGVy X2Z1bmNzID0gewogCS5hdG9taWNfZW5hYmxlCT0gc3VuNGlfdHZfZW5hYmxlLAogfTsKIAotc3Rh dGljIGludCBzdW40aV90dl9jb21wX2dldF9tb2RlcyhzdHJ1Y3QgZHJtX2Nvbm5lY3RvciAqY29u bmVjdG9yKQotewotCWludCBpOwotCi0JZm9yIChpID0gMDsgaSA8IEFSUkFZX1NJWkUodHZfbW9k ZXMpOyBpKyspIHsKLQkJc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGU7Ci0JCWNvbnN0IHN0 cnVjdCB0dl9tb2RlICp0dl9tb2RlID0gJnR2X21vZGVzW2ldOwotCi0JCW1vZGUgPSBkcm1fbW9k ZV9jcmVhdGUoY29ubmVjdG9yLT5kZXYpOwotCQlpZiAoIW1vZGUpIHsKLQkJCURSTV9FUlJPUigi RmFpbGVkIHRvIGNyZWF0ZSBhIG5ldyBkaXNwbGF5IG1vZGVcbiIpOwotCQkJcmV0dXJuIDA7Ci0J CX0KLQotCQlzdHJjcHkobW9kZS0+bmFtZSwgdHZfbW9kZS0+bmFtZSk7Ci0KLQkJc3VuNGlfdHZf bW9kZV90b19kcm1fbW9kZSh0dl9tb2RlLCBtb2RlKTsKLQkJZHJtX21vZGVfcHJvYmVkX2FkZChj b25uZWN0b3IsIG1vZGUpOwotCX0KLQotCXJldHVybiBpOwotfQotCiBzdGF0aWMgY29uc3Qgc3Ry dWN0IGRybV9jb25uZWN0b3JfaGVscGVyX2Z1bmNzIHN1bjRpX3R2X2NvbXBfY29ubmVjdG9yX2hl bHBlcl9mdW5jcyA9IHsKLQkuZ2V0X21vZGVzCT0gc3VuNGlfdHZfY29tcF9nZXRfbW9kZXMsCisJ LmF0b21pY19jaGVjawk9IGRybV9hdG9taWNfaGVscGVyX2Nvbm5lY3Rvcl90dl9jaGVjaywKKwku Z2V0X21vZGVzCT0gZHJtX2Nvbm5lY3Rvcl9oZWxwZXJfdHZfZ2V0X21vZGVzLAogfTsKIAorc3Rh dGljIHZvaWQgc3VuNGlfdHZfY29ubmVjdG9yX3Jlc2V0KHN0cnVjdCBkcm1fY29ubmVjdG9yICpj b25uZWN0b3IpCit7CisJZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3Jlc2V0KGNvbm5lY3Rv cik7CisJZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3R2X3Jlc2V0KGNvbm5lY3Rvcik7Cit9 CisKIHN0YXRpYyBjb25zdCBzdHJ1Y3QgZHJtX2Nvbm5lY3Rvcl9mdW5jcyBzdW40aV90dl9jb21w X2Nvbm5lY3Rvcl9mdW5jcyA9IHsKIAkuZmlsbF9tb2RlcwkJPSBkcm1faGVscGVyX3Byb2JlX3Np bmdsZV9jb25uZWN0b3JfbW9kZXMsCiAJLmRlc3Ryb3kJCT0gZHJtX2Nvbm5lY3Rvcl9jbGVhbnVw LAotCS5yZXNldAkJCT0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX3Jlc2V0LAorCS5yZXNl dAkJCT0gc3VuNGlfdHZfY29ubmVjdG9yX3Jlc2V0LAogCS5hdG9taWNfZHVwbGljYXRlX3N0YXRl CT0gZHJtX2F0b21pY19oZWxwZXJfY29ubmVjdG9yX2R1cGxpY2F0ZV9zdGF0ZSwKIAkuYXRvbWlj X2Rlc3Ryb3lfc3RhdGUJPSBkcm1fYXRvbWljX2hlbHBlcl9jb25uZWN0b3JfZGVzdHJveV9zdGF0 ZSwKIH07CkBAIC01ODcsOCArNTAyLDIwIEBAIHN0YXRpYyBpbnQgc3VuNGlfdHZfYmluZChzdHJ1 Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBkZXZpY2UgKm1hc3RlciwKIAogCWRybV9jb25uZWN0b3Jf YXR0YWNoX2VuY29kZXIoJnR2LT5jb25uZWN0b3IsICZ0di0+ZW5jb2Rlcik7CiAKKwlyZXQgPSBk cm1fbW9kZV9jcmVhdGVfdHZfcHJvcGVydGllcyhkcm0sCisJCQkJCSAgICBCSVQoRFJNX01PREVf VFZfTU9ERV9OVFNDKSB8CisJCQkJCSAgICBCSVQoRFJNX01PREVfVFZfTU9ERV9QQUwpKTsKKwlp ZiAocmV0KQorCQlnb3RvIGVycl9jbGVhbnVwX2Nvbm5lY3RvcjsKKworCWRybV9vYmplY3RfYXR0 YWNoX3Byb3BlcnR5KCZ0di0+Y29ubmVjdG9yLmJhc2UsCisJCQkJICAgZHJtLT5tb2RlX2NvbmZp Zy50dl9tb2RlX3Byb3BlcnR5LAorCQkJCSAgIERSTV9NT0RFX1RWX01PREVfTlRTQyk7CisKIAly ZXR1cm4gMDsKIAorZXJyX2NsZWFudXBfY29ubmVjdG9yOgorCWRybV9jb25uZWN0b3JfY2xlYW51 cCgmdHYtPmNvbm5lY3Rvcik7CiBlcnJfY2xlYW51cF9lbmNvZGVyOgogCWRybV9lbmNvZGVyX2Ns ZWFudXAoJnR2LT5lbmNvZGVyKTsKIGVycl9kaXNhYmxlX2NsazoKCi0tIApiNCAwLjExLjAtZGV2 LTk5ZTNhCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwps aW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJh ZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51 eC1hcm0ta2VybmVsCg==