From patchwork Fri Mar 7 09:31:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 871420 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013008.outbound.protection.outlook.com [40.107.159.8]) (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 575E320E717; Fri, 7 Mar 2025 09:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339924; cv=fail; b=Q0+3dBUD17fLINvCvesVmPG+WZq1L9iNtbU86JqQzcBulP3g0rOk0WQwX4fTToF72sD8Zrs2j3fXH/gD7A+iJbjBEodx9FNb8z12ebuw8kqQoJvDftY+gjZYssUMDrfDySvck1Tet3xNueINtzyr3dIqFAeYLvfqrsgE9tLfxSI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339924; c=relaxed/simple; bh=eq7Q4aJV05QZeGiCA9lw2R3WcUgK+6v+jlAXbR9Sqok=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=m2CFpFaebwjspi7ZPNyMp7mMBalA5/AbeOE39K72FD1I4QMTUozpfnOEqVo5tGdohYLEFuLfvjkNIvuYJfsBQPomtModVvBnsqyCdHYthSx7927MahCAFIc34GGEvckwwddHXoWrazP6JC7ZAZR1fi+sEp6g/MDQHfRGP9bIS1Q= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com; spf=pass smtp.mailfrom=mt.com; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b=IzqjwS5B; arc=fail smtp.client-ip=40.107.159.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mt.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b="IzqjwS5B" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xF1oa09Xz9xr7qleVJV0qic8Gk5xIrQV0QkeodD9nXRw9lE2CuOcOP33jaDAVwTGT5CxGynNaGS5veWDT1Mpxz8eQlmz2elZn0iSCcaeg8EVFZoWB0l0HWaLe7esTbQcDv7gikXsZcV6EN1aQjghG7rUh5t8npBnojWW7eAcoBOvhNbH7GpqlEkjXgROixHZkkoS+Jc8JDnVBkcK3LfbPtGCm++rhOfE2wcApElThAOzQvTnKUKtCiEJ7qGuYyotyuA2zp1hdy4T5+DH5hV82yKNy1V/+G6kB9+xQOZGguC2/8st/aRkRA7HjU0dwvgXsEKJvyqYsPdENYjn6h3irQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HGBvNUWZ91E0pic82G7UQENf0CY9D0CMSPsW7JiWduo=; b=JvMEvCmbfKUv9f32kS46CQJMG6ufnn8QY83r68E7xaI8YNqt6R42aMaJDK626rvIF70GMG5CIz5bOWuyTWFt7qeaaxOEuOvnouohD18imTSRqGdsPUKvjYaC7aDn9Q5/V3Yivn0wtPRSCBVK3mx58QMkszb0gA6j0fv7zIOXhAIRurePxh6F7WZvUSVhqEkFOOu63yJFPQbBmS+jl7/ZLjHS8LNAenOvhJs3lqgndA3+8TC8xLYLPuW8/41uCmXJ9s+APzbl15E+kvgKaDNczL80oqePsmZP0lJ6L63Bi5RzZPgVPt+fpBLIr1IoKxZEDRHpEMnqzT5f4ggqVIaiPQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HGBvNUWZ91E0pic82G7UQENf0CY9D0CMSPsW7JiWduo=; b=IzqjwS5BZSjgkkLJRJLujkLZl855m96T7x+ylCLI6Wzfscp575bs3bgFdvwgOVLMvKcZCcboMwSJffr2wkGjNbHa/elTebZO3XokvDGp4gdHinZBxyrDPmi8Mc3EcsceLyLshBBZ7G+Rj7/v1xhcv9P9weEQnGKLhqIMWPq5eXLxoU6LqmXleh2APBnD+Y4Uedg5q8M/uNuys3B5Tk8OWF4Z7K/1LMkUz/gs5z7W5Og0Hm3BMDCBOFLPo9bRfhIa0oOzv/aIW/tPYQomJMd9r0jgX7Hi5Ytw6GtymwU2ZVKQODmNk2diTtt4YmXrzf2FMHFbaHXIMHTB2E7LkTHvmw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) by DU5PR03MB10443.eurprd03.prod.outlook.com (2603:10a6:10:529::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 09:31:53 +0000 Received: from DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf]) by DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf%7]) with mapi id 15.20.8511.017; Fri, 7 Mar 2025 09:31:53 +0000 From: Mathis Foerst To: linux-kernel@vger.kernel.org Cc: Mathis Foerst , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , linux-media@vger.kernel.org, devicetree@vger.kernel.org, manuel.traut@mt.com, mathis.foerst@zuehlke.com Subject: [PATCH v4 2/6] media: mt9m114: Bypass PLL if required Date: Fri, 7 Mar 2025 10:31:36 +0100 Message-Id: <20250307093140.370061-3-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307093140.370061-1-mathis.foerst@mt.com> References: <20250307093140.370061-1-mathis.foerst@mt.com> X-ClientProxiedBy: MI1P293CA0008.ITAP293.PROD.OUTLOOK.COM (2603:10a6:290:2::11) To DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR03MB10396:EE_|DU5PR03MB10443:EE_ X-MS-Office365-Filtering-Correlation-Id: 1678130b-b2b4-4d40-9f2e-08dd5d5ae57e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: JozVpN8xrOa/fBuz2eGNNRPNyivtXCTRhSy68MKdTzKii1JtWouIT4MiJqd4B8gsECerz3yTm+ON8QS9majGeX4wDvGGVyi7fGawSd9FVM5hwnIJ2tPK4pLZbDe0J+wOJV68EsbLwJur6eHpmoC0vzsDaMDp9656Mu3nPaLKYD5QXKDzyenT8Scy6Oy+8fB1oY90dYM0EniLi8oN7LDWs2gcLPCnWWDvL//mIK/hFAWTHzkJ61nOunHM9Nm7+/AE+Dxs2tP7LmQ2IZxVjDSaRjkZ95FQgf06DsMsg6ksQ7ADLCzsgY16xMLB2Lyz7IZDYkCjilIlzXpItEYfp9o38p1N24F5h07/Hft1MH8eOnIUgIUvNw27XsR7GIJGXbH0j5L1t6cGAe5nsLul3Dyik7QY1bZVs+jv6BRSeuvlUlLlGGbeFVPzoIQFoawtArOg+ZjNXC2ViRn3fk9ppqZU76saNxEvkbgf0oykqRyGMWhWDMBWmR0trmY1hIibz5SSm472I+HylY6+x39fLon+WdO1dAhi1aMdfN4zyF4/OHwnZq8s7gK6H0csVbx5TPy0VtoWPJlr4sBohJs5rfWxCTtZUcpbFNjXvml28mExSGKaScIItd/v0Q0f0aUqDPT04NULPIygwVGPCdiFd7dSNvCLcfNxmz50s8Cf+jefJHYmL/yzmr26vFDGOVDWJI7DV7IXXUW+vp6+T8Gee0e92OPJU6jI0BEhemdRXV9NjrrMkPsalCM7lbBfggUdb8o5ysnEhHkoqN+pybZvzhXFSYOdxi5rg1MZXtBB+uP2c5fx9qj2U3v3pdaOcaAQ8HBKdeisJ4k04F7c4WJwtuhqmmNN/mpkTZiSLqsNCSlYSWgKmZPI3xQVMNYja/zbdt+IZ3vK2xN5nTpqPd1kY//HBfc25ACpLLzBLdwHiWtbg/OmPhxi21AJ9n6VM3DWEmvZYifBi9zF9euRu/2b9XeEKE5ie9BDva6HSO9um12zwhN1FPMMs5DrTD2rmeZc0SMLvnHpIjQI2IXZIS7y7HOVEFO15ayWvsJVZhvsZGUWXESdRhl1GSFHtlNDXuZx1SJZ5Al9iXr8BqcC+LGNbviWx74jq3yP1xem4+zeF6+GetsJtKaFK9l6v/KBH9etYminkklRT7bd2og13kkyVDU1WwlmWAcBQKFIGPwbZ+bnRMFDN/F1ob1NArvhCI9pDY2RJhtXasGmR54MKyqi55TjfNbxTcZt9xJjqebieTb8U0sHFUC9khBN7i/AZuaUFyBT8UeBAk6JI/WSvwx5hOD+Ls63rfEYnGqgo1BzueWCTvfC3ILttDDvVSzfwNssqSN5oIrqKdZDh3j4sEQXQuIinNazzWDHbj0768tyV8mZsxFFsCKColK9+1p1TZSE0aC6XwtA1+aSm0badtP7VGgZifdZGsCUwK1BAvRQsVEB1txYIQNpclFc1+sJ//mkWeJ5 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR03MB10396.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(7416014)(376014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ogtef/vKbz7lqF26uTmvbJG5YJlJ4kGlKd1kLWZNbrX+wfQnFrNQDEPCH+DebEdnviev0WZB80frACu2x0QDz843+7TvONlsj28OraDZV5dYiSTdq4c8eO4Em/uC+NSFxLjdu6ATweQ1CxfitYLfUt5GmHoRCLtC43o9PrU3ldhmkltjfxqBOAb+ewm7gDqw/77i6cJaaxYwKexOulix+CaG5oU23kep2v60Q5boxcZBTROkFglZrrPqMu1J9ZLBPRRUEGTTVlMBU7WFvDg0aURFfneRGYzdpCuz+HhwoEeB4TDmZky9+qhfnUgS5I4x4RbLSnkypNwMvtNC5PAHz2g8Kvpt7P6TJVD8/vOwIWB89Jn84ZZZxViaSouBYAFYRNd8AGVo42ozG1uLE0FEZAPkaLtkvqmWSaun1DW8plkLwmKm1ANHzwpP8owDj4tqwGOXfhsiC3Isx4p75WFnKHs/HHhfZj9DsVcHC33sVafPm0fx7gS9QnfnzWitKi/zpUlloxKdcweVnqy/BgdwBQV+He5w16HOvhfsep6zVceVXU6mSrO/RaEVQc5FTn2QJhjDmP4g8xPX0CQNXrpWPk0CWPnSXox3rLKptDu9NXOzwou9sOwJR+LlVi57U3RBcxPAXVtsUzNvIVWY5raOZjPaz0c/yAmJSYEjd16aPbwL3YHqWjAo8bqVs5rM9FK7L2mkeab8hrCfQxwkIdkPs5U8t6pViO9wDq51RgY5wFetyIKxI2et7hzgFPHl3dXtS0c9EX7tTUlvl/8WINnl7glk8HCN1p/Hzfqg+DdZuwA0/rlszV1s8a9oerADqBXnZFNDGgPrYslG02+0KUIZR4tFcegrpb0b1VOh7ebZ/AdLXb2zIj8FwF/YZhIDOFQamzqMDfsw887Rry6DSxIZ/PLaYAqhmT9psHOy/SVEentogArveghpPDVVDB9W0eRq09Z3hL3rkizZ7dZQDJfYnmj3Dyl9hgQRJ8i6rEgDtEQXFTXuVUC9RmvjMBlw0m8Rv5Hi3N9T503VyUEp7biTEv+G8VeMlTZdNy5j0KsFk6rzKE/yrMik5ArVjYz5k+1d1wnfv4E+lB/RfV6cTwFNtJ2TxrsvsTMLyIaiVdr51VYhELZ4SKaLmlWyRk+UfMzvSJOBp66kT6iqBJAlp0h5d0G+0z3nyvzRA7+idm0dQaBQWuYZBcqtrs6XkBTySpDHFGkFLxjBZO7Z5BBIIH5hMTH4VqS4YivRTu9oJaC5FixxBwMwivWUEQucS0abruVi5kOUJwaajc9NQej7YoGC2WjGdMZ7GHntraANRmKsR70P0EKYY60Kf3+piNCqekFg8L9vEKRKcjbcWqkxwEYj1qpuzW2t70XsW1h3hNjLhNBgDqjeKbmdTKeJ6My9JgY0/+p4It4jUKH9VRXb0VERUoAHXd9WOXg56w0go+ay+SR9rnxpe+B+u6t+V6OZH29w4eKT8GbjtoZ2aqpgzqLjt04r6w8gtJ7Ez3whWtRRRagIoxztM5Nz2h+28s4zYcp1Q6l/zccX3tvPsy9qSTtKSv4RzY0XrWS11gSKJ7+LV2ejHQ8mn/gpSpyvRLimUqgx X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1678130b-b2b4-4d40-9f2e-08dd5d5ae57e X-MS-Exchange-CrossTenant-AuthSource: DBBPR03MB10396.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 09:31:53.7565 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CR6Nc7Kh6Vcb1REkeZENA3CRYfjPlhXW9f8vnjHZV3H9k09nED9Jk1NXvDhRfUg1XDHCbpCIr2McRD/nmxsCxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU5PR03MB10443 The MT9M114 sensor has an internal PLL that generates the required SYSCLK from EXTCLK. It also has the option to bypass the PLL and use EXTCLK directly as SYSCLK. The current driver implementation uses a hardcoded PLL configuration that requires a specific EXTCLK frequency. Depending on the available clocks, it can be desirable to use a different PLL configuration or to bypass it. The link-frequency of the output bus (Parallel or MIPI-CSI) is configured in the device tree. Check if EXTCLK can be used as SYSCLK to achieve this link-frequency. If yes, bypass the PLL. Otherwise, (as before) check if EXTCLK and the default PLL configuration provide the required SYSCLK to achieve the link-frequency. If yes, use the PLL. If no, throw an error. Signed-off-by: Mathis Foerst --- drivers/media/i2c/mt9m114.c | 62 ++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 5f0b0ad8f885..b06003b69f6f 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -261,6 +261,7 @@ #define MT9M114_CAM_PGA_PGA_CONTROL CCI_REG16(0xc95e) #define MT9M114_CAM_SYSCTL_PLL_ENABLE CCI_REG8(0xc97e) #define MT9M114_CAM_SYSCTL_PLL_ENABLE_VALUE BIT(0) +#define MT9M114_CAM_SYSCTL_PLL_DISABLE_VALUE 0x00 #define MT9M114_CAM_SYSCTL_PLL_DIVIDER_M_N CCI_REG16(0xc980) #define MT9M114_CAM_SYSCTL_PLL_DIVIDER_VALUE(m, n) (((n) << 8) | (m)) #define MT9M114_CAM_SYSCTL_PLL_DIVIDER_P CCI_REG16(0xc982) @@ -377,6 +378,7 @@ struct mt9m114 { struct gpio_desc *reset; struct regulator_bulk_data supplies[3]; struct v4l2_fwnode_endpoint bus_cfg; + bool bypass_pll; struct { unsigned int m; @@ -743,14 +745,20 @@ static int mt9m114_initialize(struct mt9m114 *sensor) } /* Configure the PLL. */ - cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_ENABLE, - MT9M114_CAM_SYSCTL_PLL_ENABLE_VALUE, &ret); - cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_DIVIDER_M_N, - MT9M114_CAM_SYSCTL_PLL_DIVIDER_VALUE(sensor->pll.m, - sensor->pll.n), - &ret); - cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_DIVIDER_P, - MT9M114_CAM_SYSCTL_PLL_DIVIDER_P_VALUE(sensor->pll.p), &ret); + if (sensor->bypass_pll) { + cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_ENABLE, + MT9M114_CAM_SYSCTL_PLL_DISABLE_VALUE, &ret); + } else { + cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_ENABLE, + MT9M114_CAM_SYSCTL_PLL_ENABLE_VALUE, &ret); + cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_DIVIDER_M_N, + MT9M114_CAM_SYSCTL_PLL_DIVIDER_VALUE(sensor->pll.m, + sensor->pll.n), + &ret); + cci_write(sensor->regmap, MT9M114_CAM_SYSCTL_PLL_DIVIDER_P, + MT9M114_CAM_SYSCTL_PLL_DIVIDER_P_VALUE(sensor->pll.p), + &ret); + } cci_write(sensor->regmap, MT9M114_CAM_SENSOR_CFG_PIXCLK, sensor->pixrate, &ret); @@ -2235,9 +2243,19 @@ static const struct dev_pm_ops mt9m114_pm_ops = { * Probe & Remove */ +static int mt9m114_verify_link_frequency(struct mt9m114 *sensor) +{ + unsigned int link_freq = sensor->bus_cfg.bus_type == V4L2_MBUS_CSI2_DPHY + ? sensor->pixrate * 8 : sensor->pixrate * 2; + if (sensor->bus_cfg.nr_of_link_frequencies != 1 || + sensor->bus_cfg.link_frequencies[0] != link_freq) + return -EINVAL; + + return 0; +} + static int mt9m114_clk_init(struct mt9m114 *sensor) { - unsigned int link_freq; /* Hardcode the PLL multiplier and dividers to default settings. */ sensor->pll.m = 32; @@ -2249,19 +2267,27 @@ static int mt9m114_clk_init(struct mt9m114 *sensor) * for 16-bit per pixel, transmitted in DDR over a single lane. For * parallel mode, the sensor ouputs one pixel in two PIXCLK cycles. */ - sensor->pixrate = clk_get_rate(sensor->clk) * sensor->pll.m - / ((sensor->pll.n + 1) * (sensor->pll.p + 1)); - link_freq = sensor->bus_cfg.bus_type == V4L2_MBUS_CSI2_DPHY - ? sensor->pixrate * 8 : sensor->pixrate * 2; + /* + * Check if EXTCLK fits the configured link frequency. Bypass the PLL + * in this case. + */ + sensor->pixrate = clk_get_rate(sensor->clk) / 2; + if (mt9m114_verify_link_frequency(sensor) == 0) { + sensor->bypass_pll = true; + return 0; + } - if (sensor->bus_cfg.nr_of_link_frequencies != 1 || - sensor->bus_cfg.link_frequencies[0] != link_freq) { - dev_err(&sensor->client->dev, "Unsupported DT link-frequencies\n"); - return -EINVAL; + /* Check if the PLL configuration fits the configured link frequency */ + sensor->pixrate = clk_get_rate(sensor->clk) * sensor->pll.m + / ((sensor->pll.n + 1) * (sensor->pll.p + 1)); + if (mt9m114_verify_link_frequency(sensor) == 0) { + sensor->bypass_pll = false; + return 0; } - return 0; + dev_err(&sensor->client->dev, "Unsupported DT link-frequencies\n"); + return -EINVAL; } static int mt9m114_identify(struct mt9m114 *sensor) From patchwork Fri Mar 7 09:31:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 871419 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013008.outbound.protection.outlook.com [40.107.159.8]) (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 74152211486; Fri, 7 Mar 2025 09:32:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339926; cv=fail; b=ZOvOb60b49zjHFIzjLIigzUZcUzD8dYe9OjfV+8ESgXwctNzkSQNHkhA0Dl20oRrW1DQ20ZT4jvuNN2IybS5ltpaGED5z9T9ckYLyhyCQuVFga2ToQvnUnYPMBO+sVDTv2RjtxxPSDlItdWINUpteTW+OPayYGb3Xy2UKjcRPEA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339926; c=relaxed/simple; bh=HYwjPouo5PqXlBaVkKr2PMe8LuxOydElL1w+AICaYqM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=qoTWaCfMDDs/6Zjsc1PePrMWwcmBibsUV/Z2P+jXMcjt7XcNBo/FwW38f/oyOKJszHYyxCvaZpFgQyvz1cAVdEbNlMca86gdvt60laMuSSXyZ0GMSyrxBJjf4Hzh7FqtWb5Td/W5wnc1rnRxeAI+dEcqCPf4lmvuScD8Zvsf15w= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com; spf=pass smtp.mailfrom=mt.com; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b=U79hTK6C; arc=fail smtp.client-ip=40.107.159.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mt.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b="U79hTK6C" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KrknYAghu0fVbw3pWLc2u/P8DHelGDev/Zlh7QbVmai/xK79D+FFzTCfI/S0x34k1clVS0s1ZEfunwgcUlygW8xcfbO8x09WDsuYmtaVsHHoZxnYz9zmAKo5iuYRlA8nzuecVVaf5DgcANR+511izoDGeRefn3ig2yzXxQqxWoK5rX1YrxNmjxO3ptEsPBJK9URtfYbJeYJdP2NdfI74i1imCPBl2aBeKKt0rV1aRgrCh90Cu4JipKtZldS77HJQs693uANspK5weVvjmlLaDkhxVegloIyph2Uk/ww1rbyEzriEMs5aMXKF+eCLGGa+uj67A3WpfMi4M4dvw/zoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Kor3lTNIKR1gra6DwDrdViuy7QPKz38qsXiT/yG3VRQ=; b=qIgyQ24/0/Y1+kjsCa0mENGqXOZxPaI+6XlmbXVBjgs0FLV9X+3s7qXESMT0lqn+bG/81yvObtJ3bMOqXShEMeuqD2hfzfhlpiBiuEUU2Dp6qaqqd5XTuxIncmfjkrwIG87h0VGr2nlwO7qUnnzOSVUhKN0IXbHtdga0hIvMOfUOAduM6eTo4S3vEjCa/X3Q21f7Y5cjySBXb0Zl4CrCBaidcw4xUKnKKMU0IqeIr4mxqXJziBqa1zcPPiBsyqSOeKnbaH37tYrY6r6YhuxF6wTyPWio5nuC4pZEJKR2/PpNIZqasOGwfEn4UTbeEErUS8oNZdk9Gye6jugbrp0Y5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Kor3lTNIKR1gra6DwDrdViuy7QPKz38qsXiT/yG3VRQ=; b=U79hTK6CuEmeuuJvF18q16hGZ9gXD42Cl4tOyYSkdiLtY5cxGS83BMjO6P/BIkGCBRlfVORV4C3cAvwEPGL668qGW+sEGoJDnoOXIpu+Ro8kMv4saMknSmBMGORLuZKtuWGLJtrlywa8qvF5ZdKvEa1rtxltjZm1+BxtV0rcD6AZ4WAKRg7gV0/hIOWMbsPBzj/SuqNuBXRTACPv3EYrJ6VcaY+Z9U7WxqlmO+blrCfU+odMxluBbV71nj4pMhEq2HviJQBaAabRr+Tje3ltPuk1MMsPGuFeYWA0LjzIetqoKChrf9iNzPGi9HMgRHdac66PQJFocv03+h7061Ctwg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) by DU5PR03MB10443.eurprd03.prod.outlook.com (2603:10a6:10:529::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 09:31:55 +0000 Received: from DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf]) by DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf%7]) with mapi id 15.20.8511.017; Fri, 7 Mar 2025 09:31:55 +0000 From: Mathis Foerst To: linux-kernel@vger.kernel.org Cc: Mathis Foerst , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , linux-media@vger.kernel.org, devicetree@vger.kernel.org, manuel.traut@mt.com, mathis.foerst@zuehlke.com Subject: [PATCH v4 3/6] media: mt9m114: Factor out mt9m114_configure_pa Date: Fri, 7 Mar 2025 10:31:37 +0100 Message-Id: <20250307093140.370061-4-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307093140.370061-1-mathis.foerst@mt.com> References: <20250307093140.370061-1-mathis.foerst@mt.com> X-ClientProxiedBy: MI1P293CA0006.ITAP293.PROD.OUTLOOK.COM (2603:10a6:290:2::16) To DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR03MB10396:EE_|DU5PR03MB10443:EE_ X-MS-Office365-Filtering-Correlation-Id: daffb774-e839-47bc-25b0-08dd5d5ae643 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: T0WH0XSinExlIH8EZMCoFXXxLAA7ejqrDzkCtcJUN9R4idlFzIN6M4fvSuAZc1Y1o3Hnw05pQMH7HEQnvoHmKOuqyPX6yr3z8WRZr+/9qzut7zrATH0mjiwVPnBaTqblt4y9eFtwLQOQufV7ANu3sWzMIQXWuxNQYEY2o3/fpubW4nUJP7CoUaGEMcZdBUb3H5SCnf/muMHiRI4r29DwKduMPAMKUeyDKYxhY1alc0q6jkfCb+AgIhn3u6e6SrO5nO5oepk+3HNXaUIgaWTOJUv9s8Htd4266yc3ld5Z4sNegFi8kY3bc5JiwBd1lc3L8uY9nXKbDUnqaC0HXbszl1BRP3ZstjE1R0gDDswVsLg5WwrAzqXI9CZk8V8B3Yd7u3cpW9uEYjWZR5RUcawDogoKZPp1UPoSUhp01A976dzgoTOyE82YzrE1ksKvFYVLzj2eYQdxoSgBB9wLUj/eknY1M1knhKTgwiMyowtIksryH/D5TnoeSWZiiZ2fXeQVIZj+uMw8qTj2SfZ1V+4GMrojmgd2DDOx0TIsCFSrYSzS76/lOPI51bd8dZdtwYmanZjo3mKXIws32KHm+r3/5nrgaGoLcQq+11B9m9UnE3Sx7CZ5QMK2Q3005FxbQkAxNjSo/p/9Fucl3fNBA6INWPJJtFQgH97Y7V2QlwPtJPyDky7CZIE6756eXyFNB6TPySsfM83KJOFOJBjWSTBDNLzU6pt3+gzkRUgRK72qRV4jsRM2ThM8hRy3oJaSz1J/Y7OECWnJANViFiw0UDroscWuCqWVey88jUy0g6ysOAeTd7FvhtNreu7ekK7RUBp0CryoSiORcIMhwuEf0XVoxd3OyiY24VpsvrYFMs9lBw5tQUUqTdq9G665qxQuwhVgBRKCaO7hk5bxE83O/wbZ3mq3n1vW34vSgLSzdVAYm0ejySEdWsqI4H10fqqy0PQhG4ys0+aKGnqELpNij+7KSwLkaGMfDvlR5RMaOIh3/gtGUfo8+IrBLzgrK8dBR++AJzum9MKVI9QcMXmaj3fxj2xTN5t2SW02OwnVHhbX4gf/wz5Zl8QfaMChlxx9I10CNEP9Um5kKHC8VNKgNJxbznAJMAUexgAZpqnr5jHN5nrA5Vs85bxf5XIRPSRrFq6q7Gu28KttBknzeDYeYc4TrElZtssJOFkuYOxZ9xetdSTXzHMyaNvG5NS2dWVbtxK2iVLQd64aSxHRoytyaBW/bx1IL8icIziilJDY9wuUulQG1kQh5rbeI/FDU/g7On2bxtEkTFQr9pKmC786tIYcyOxCrlD3O265HXmcPXgnHb65TxEZg8SUdkzp6u1dUNafy10f3LAtygyzSsnXqURNa/U0TsaGditzJVmEv3syVf6k37b635wOZDp4ubm2vMIWqwQPsxx1q13oRpIuUIHJ1NcyppPR/Dsh3qRyLQiVIyOB7hcb6zMimdzwT9KveOD1 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR03MB10396.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(7416014)(376014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: njA2+kZTcGI3/w5mlnPZ2HkFimejS2BryaA3mQv0LKIZKFp0auuMMYeRZz39dh08s/QHhI+OZeQSbaBtU7nfA+3RuI3Cc61c1CvzMR+YBP69ITN8/J/9C6be/HLQMnjIG40ep73pf7+yKItOIMzX+lfHX0ommMOxXf1hI8WZLk7QnnTn+vYh+P8+JywCYkD09hgA518fe6XjyhUoEuXejh2p0daiGa87z1VvlecAFEfRFafhFQT6WEm7zAsvlc50GHt190WeAtKRbuZ+k+40W6uKJrZlk8NyLsQdWoHcvWPYHaTe64yKnKQHMbqvT0TC+O7ivqJkEShxbcg/wqZ5ksDNtWPc0rdzqCgBjjbHQoKJ2J6pOn4sC2C1SplYJ/aymH3QbrWWU16t+vNkVrIn8s6CuDw2vLGUvKN00G1azjq8YNbFUBadQTNxrJzKLB9T2e7f5AF/c0ouNQsV6hvFPDhZWE+8qia5dIfD0WgfBr26MJHZFCnWsvtKbxPT79scNryWQJdDpY2HH7+dPZbl48VO0FoILXWn6F0tcqwIWYGHRQou3P60QtgZKFroiwcZpuxltwiN/EJUAlE03WYNhDHMTN2R4Eb509dkffbigfeTrLqrp41oTyJLuxmyoAS9AtYU4N7DsCxactJa+tGWhKuB+VsB4KrIGAi7QHh0+GKPoUU4ieD0TL7wJO8iMJsi3nMggOjSz5mV3w4a036lcFuDTKJ/zlVJ8sbKKyPpnR5rbjQNTwzp8wJsFKm+9uRNfU/Eh4LMlgK6+XKuHhY+EihIlSqFX0aYW3iPh6TsQvX/HuP7W6IY26AUuGECI5dkAv7ukM1EXOw5S6LpLP6GIHO/uQ4q1jBFRaAn8f5mUlWAeg65HUAASaPuU5S5A+f4KBYDhtrkIAcUVnDHdU+Y70HqdJiR+YqN1obzn93FfeyZ+A6YI/35QlFDpV6GPr1SvASOJxrfnou3Za/b0u5PiTYpMRWZX0ws2RfsHA91X9XS44WFYtapByTvWxnYGTEvkM91ajPyN27reCXR3Yj76wSq381n31GWmYLmtjxaZ9oj9km3tTC2AyC7It4gDym6id1lhFD/LwEcFdGvWEzafUmg4W7LXflYaeHiio1VyKds8X7ed9XWd1CDxP5mhe/ZhDed0uPVnupq5R+Ljs79pmpESZlgbNB+y0/5MCACs9yfyC9+V80jiupQLdCcZr0uDnAEy9WBzRo7r2MaRbSCRDbvw4zGcaHv02jK0j+psA09LqGTN7/pDJuZT4qAztn6R2lKteQoWYCtkV9+UmDFJ9YQEAsyEKzLH97iyXlqcSgF+In0sVCUKOInYtkn+Fb5iwNG0UX5xP8ZzzahPsnNOjj2Y6txywU/2FmeEkNvZR+Uz7DKRZdxg4yhnhbrlfKVOgwOaSE0G3rqnR2+EyvSan7zIWqt9QFDXqKZf+UuQiA/NO1lpMP9FU0u6V8PG+kX5oQwQsqXZ8KtNYQnjLCTGsPz7fN5C0VUw2+1FkKB9W+LiFTIqOPkuw5ycJtUtmMqFils3y/Svonr3C2rJe5Or+2BUi4GgQFn+0ztTSdasuv797EsoMqZ/sRHeFIDFcYE X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: daffb774-e839-47bc-25b0-08dd5d5ae643 X-MS-Exchange-CrossTenant-AuthSource: DBBPR03MB10396.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 09:31:54.9886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: G6c5Os+fpIWsG45jHFjBiET9rv20Rjb2joWAcswJ+SXDdXlEXzJKYy2L69C2MT4gtbRnaP9IfoAuQ3EnUVSJyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU5PR03MB10443 The function mt9m114_configure writes the configuration registers of both, the pixel array (pa) and the image flow processor (ifp). This is undesirable if only the config of the pa should be changed without affecting the ifp. Factor out the function mt9m114_configure_pa() that just writes the pa-configuration. Signed-off-by: Mathis Foerst --- drivers/media/i2c/mt9m114.c | 49 +++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index b06003b69f6f..9a49dab65180 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -789,39 +789,22 @@ static int mt9m114_initialize(struct mt9m114 *sensor) return 0; } -static int mt9m114_configure(struct mt9m114 *sensor, - struct v4l2_subdev_state *pa_state, - struct v4l2_subdev_state *ifp_state) +static int mt9m114_configure_pa(struct mt9m114 *sensor, struct v4l2_subdev_state *pa_state) { const struct v4l2_mbus_framefmt *pa_format; const struct v4l2_rect *pa_crop; - const struct mt9m114_format_info *ifp_info; - const struct v4l2_mbus_framefmt *ifp_format; - const struct v4l2_rect *ifp_crop; - const struct v4l2_rect *ifp_compose; - unsigned int hratio, vratio; - u64 output_format; u64 read_mode; + unsigned int hratio, vratio; int ret = 0; pa_format = v4l2_subdev_state_get_format(pa_state, 0); pa_crop = v4l2_subdev_state_get_crop(pa_state, 0); - ifp_format = v4l2_subdev_state_get_format(ifp_state, 1); - ifp_info = mt9m114_format_info(sensor, 1, ifp_format->code); - ifp_crop = v4l2_subdev_state_get_crop(ifp_state, 0); - ifp_compose = v4l2_subdev_state_get_compose(ifp_state, 0); - ret = cci_read(sensor->regmap, MT9M114_CAM_SENSOR_CONTROL_READ_MODE, &read_mode, NULL); if (ret < 0) return ret; - ret = cci_read(sensor->regmap, MT9M114_CAM_OUTPUT_FORMAT, - &output_format, NULL); - if (ret < 0) - return ret; - hratio = pa_crop->width / pa_format->width; vratio = pa_crop->height / pa_format->height; @@ -853,6 +836,34 @@ static int mt9m114_configure(struct mt9m114 *sensor, cci_write(sensor->regmap, MT9M114_CAM_SENSOR_CONTROL_READ_MODE, read_mode, &ret); + return ret; +} + +static int mt9m114_configure(struct mt9m114 *sensor, + struct v4l2_subdev_state *pa_state, + struct v4l2_subdev_state *ifp_state) +{ + const struct mt9m114_format_info *ifp_info; + const struct v4l2_mbus_framefmt *ifp_format; + const struct v4l2_rect *ifp_crop; + const struct v4l2_rect *ifp_compose; + u64 output_format; + int ret = 0; + + ifp_format = v4l2_subdev_state_get_format(ifp_state, 1); + ifp_info = mt9m114_format_info(sensor, 1, ifp_format->code); + ifp_crop = v4l2_subdev_state_get_crop(ifp_state, 0); + ifp_compose = v4l2_subdev_state_get_compose(ifp_state, 0); + + ret = cci_read(sensor->regmap, MT9M114_CAM_OUTPUT_FORMAT, + &output_format, NULL); + if (ret < 0) + return ret; + + ret = mt9m114_configure_pa(sensor, pa_state); + if (ret < 0) + return ret; + /* * Color pipeline (IFP) cropping and scaling. Subtract 4 from the left * and top coordinates to compensate for the lines and columns removed From patchwork Fri Mar 7 09:31:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 871421 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013056.outbound.protection.outlook.com [52.101.67.56]) (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 2DF4120C009; Fri, 7 Mar 2025 09:31:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339921; cv=fail; b=UZ2slsfuXiv7kkzPZ+vkbvOqAMcrzYw4LgSb0jn8oqsWrVqGATyiQQPYRsFH9JtvL09o326n8WhUD1dlik3jNsFWAuBy/UQSmCXxvHfGzZmiG2mxThoXnhhXTn18zi7yWivDZF7PujUjj/S5dJY2089EcZcdWJT2Ve6C/Jh1geo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339921; c=relaxed/simple; bh=pVMNGUV1PB/mobzQMPLtPz/ep7urQ9B8qlXQsWqrHRQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=MYIkvh7Yl4xM7Y7/x9OeruIrv2bqXn1ia0RHj0kztwfe/THigcCS/6VCHEqvTvSJxKVItJFmwhNRRYEsgSc4Y93Kj+gss+2n/GipozlgloaNUyw9MhoQ/hCR2uTGh7wWzZKxV/XX5zweR+pz6pDXNwI+OdJDcWnBP8PgYm+VcLo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com; spf=pass smtp.mailfrom=mt.com; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b=Hy4q4LjD; arc=fail smtp.client-ip=52.101.67.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mt.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b="Hy4q4LjD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w3DLd9KlQ4bLKTwnyb5zIB5i5FTnI/vsDSP3FnYWIrP3+pulSfPxNd3AFTr5+wFN9lSBIkEMjscUSY2ymZXXaGsqyxS7cB6Zcf3VIQwojSb/9N1DWu2mMjYMGTFV9ld71MGgmX/D6gC50vROhpSsmTceKq8lwPVOkIi/dBwecKEeoF1Xdp1p0A9UuCNo4xlEkoBy+zAJbwFig70/XXOVP1vnApnHk2cS2RGYH3aNaj8SwOPnYI1cRreEDSs4fcfz81awIGcpHkbRmXCInccLzjxp1syyJnmMmu++w7gS0CG1ECBKpcJDuN5FZQiY3UFBolf3yUq1+IyeSi7YjhNcnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Jxq85QUHaK1HU0Nbdgh9OedAClT/R2aPCyYfhzt6uiI=; b=lConTycO1qPhZZLJtD6fNby3bIuzTiSlCD7UdzgLd673STAgc0C6f0IIUyVI25QXAB1aRBZTSlTtbhGuilXe8qwO7ybSbsiHe625Ll0D1tB4rJM/WZD70sJi29W9OuXc0X9GLGqew9bg333xpicz0H/BogfnUhG2PxdBjiVAYCsj+kzr3RhbeqXUkBbJttVnx58fVcc8b/5D2C/m0K9kFq/+dtGxWicmvL8Ipsa8HnhVXHjj/JOPmNanCHoNNMFfhbBw74GGzR5RBW+EiuTmwnpMncnnORCXZiH3ceNl3D2dgny0Bgl/y0cXw0QpfF5WqNqKIeNVhpEgUD0M3DiAdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Jxq85QUHaK1HU0Nbdgh9OedAClT/R2aPCyYfhzt6uiI=; b=Hy4q4LjDe3PDyyDqQgYvnBFTJ7PW9QD9nmFq0vMkrQ3muppQUgOgcHpd2dt+3rywkIpphnP9fCD5TJsMGhnKw9AGEfaVK+7E1Z5czhgIO5yBs2wdLIiTnAKGL/A3pzPOAXit7+7pe0sGXgqPQJl+hopQELpQINm596UucJmDmDJiBvWdJQZjChbNfBUEqqbWntEu5/gl19zjWZiptHsKiEmkcbBGzyVB3FUMsr5yfHyts4LhaUcV63DBj5sNnxK/uFaefMZ2p49HNhZ7H98GQIrFjSRLBBHsCPS5gVQ7fcS/xsQVI+rQOh+8qlqbYMh7XIl9+qFNsc0L+uaQQGNoAg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) by DBAPR03MB6630.eurprd03.prod.outlook.com (2603:10a6:10:194::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.20; Fri, 7 Mar 2025 09:31:56 +0000 Received: from DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf]) by DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf%7]) with mapi id 15.20.8511.017; Fri, 7 Mar 2025 09:31:56 +0000 From: Mathis Foerst To: linux-kernel@vger.kernel.org Cc: Mathis Foerst , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , linux-media@vger.kernel.org, devicetree@vger.kernel.org, manuel.traut@mt.com, mathis.foerst@zuehlke.com Subject: [PATCH v4 4/6] media: mt9m114: Allow set_selection while streaming Date: Fri, 7 Mar 2025 10:31:38 +0100 Message-Id: <20250307093140.370061-5-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307093140.370061-1-mathis.foerst@mt.com> References: <20250307093140.370061-1-mathis.foerst@mt.com> X-ClientProxiedBy: ZR0P278CA0213.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::19) To DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR03MB10396:EE_|DBAPR03MB6630:EE_ X-MS-Office365-Filtering-Correlation-Id: 985c2ecd-c3a2-4f27-625f-08dd5d5ae6e8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|52116014|376014|7416014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 1rGd/jizslG/8n3N9V2SmncFz/iZMMHEo6t551qaMxzFi8Du5cdwquYn7dRkRpIHpW5+3jjctdhv8lLy3dBPoE16ds2mKHxokCseP3JRqNCGhdZnn8uX1EJSTvVa8uKWrS/yMd8M+RPk1mK5r5gFEwT8/d6lWUUunTJAhB43NQK+GEuXAbS1dSJre8PzZuvxS6N0qbs1XTcnrA8sXfS+xOHjLAP4Wplc++3nq9TcXTLNyWv8gzkOawtxaJI4ES3LMNVIT2TZgSysbHxQvpWxXssimkw+e/0tLEVC7PA5Aq1fgNqIPciVXN85x3X1zBd0a0JeUNUpwyfr9ZbVggmyY6V6N33lJOHj16tOb5rMIRkv86rAWBC+LhLca1gE7EBqA+C8bGmQSF4GcbCo5vvN12/k9oM8YTHXjUWYzK00dvOSYuRkfTFbsgX7+BI+oSWzYW7DOkCzJUt2QL9l+RblPsN4DjYKbkpWXg0e02sNURL7v2EbOV39OU9A6JrFQzkOfkWJv0QgqkkrfYcZerUayDoSesjrRqJVPb7FTPNwuSDZmcZTcMJ6uwhK10I/vKgkl0IpQ9AzCA1GzIdhOiZnP81aRDAm2zZsZiWHHsYJevAMYkCsmhxmHj037WmUbJG1T29+agVpGVdxdja/wFu86koZ+IuBD2WJi/Z1ur9pETmlaVHyPSkBjlVDgqk9zdL8zBHBSbRPflyDRhhlHVdkhfeBe8AqB2csDxVrpZGM7WrAnCOsC8EU3Hua+erjt0Me+qZjKCBnT3cOmn4nxLrP6g2H2YvnYrLbxJGDzZCiJyQ66nYnqalstkg6tUW/neKMpPb9h5DHIPvbE+k77egwiqB9ox/dFdYI7cKS49VMrSLwLMeA+kcd0TjxzHkp8LjTuH+rdYBd/Bi2ZB/yeJiEmnsaFB8qVRVaobU32Vucpkroe4/nP14k7ID/ycBdriNQo5mVChKyJRbrtCQI2D75tUrDsjl09T7U4BDszhIoz5qkwH8MwzwLr+Zg/mX3NvcU4/XvybmWi6pw3KuEReLsBM7W8sMjkwUYlLmaja8Wvyxhu7s8JlqUX8lb/JBVvOENZ6VjSpzbKXCkh4VSRHUj7QXLJrjkJz8bazItVrXbyKkWLNZM4pcaA/G00wIg/CzEo1Ln3bfhRlmowNT4XXDU1+Wub4CmCy5VKVdFBfxe9ch3uhBtBpPWKN5bhvUkTlXhtSCw4vLYcdN7R5f8EsG3fsdpxjjhVbv9taWiI2I3FnkEZIgE2JWhfDkiUoFWXEFwrvj6b9R/yqraA0uhU7SXIlvm4UvPDrdvyIQCU3OQGs7TLd6ei4RKIGytnrObFogbsdU7x7SOIzmZr9CiwaJ15xTKy4QKbPavgGwyeO0ZdNOGP8qHBl9xu8t4V1FnPMSBKadSljzZt7Hvvp1PMtNl7V8qbJdQcxyyvxzLTvgYv1fZBaWWUwtor/SFGFR7ZZ85 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR03MB10396.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(52116014)(376014)(7416014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1cuX9DFOeHb+42E+OI9nthzCRv6RBE/wF3pfTSkGVE/5otj+bitQRKm43WaBWnwz4sZ4vxziY0J+gbtE9aoxVOPWbpDS+NSJ0w0ijhjHh1Evu4KlaCe9hGznYelcfZg0YsWSdhACvC64mvQ7Nt+hTYCFpVmg/PX1jAUO2Mxky0r5ZGUeDFfdFtO+16mjLVeVNNRzFJoWdc8/gQxmASlVTQ20kwVwrkZF92gYOx4Jresmv75txjXzHojcm6WMbfIuc6sFzrN/OV751OYZV18pJLyG6byOgG/HrUr3McVilt5g1q1g4mIV+xBfJKh4SqUUPDnE/oPPZt9SeUIDstgKKCyNZL/jv9/uNeJ7GL39H47tstrJbxtZJmUAqBaFxC9aLHbfRNMDfK/dllhwuu5UopS5sOjQZEU0xQDf4qyxmvXaOU+W9OMjsMlnI1c/nXctemysClysPZxaPdFN2UHJCgcBPCf36lCxsaRC9MHB+hYgMxyyKepG4HogfcRbXhWW4aRuHqwbYfUHA69MlXZnyej7bkGWz6HHK/nD9NjB9emeNON+r4BDRyGq2M1svdjtnDl1I9MVA8x8EEyPvUSh9u9NWy9J0905yqNh/o65COSgd+hVQMQROwG8Ai+o8R1DHmO7pCqVEvc6WCw7kIWGQz/pt06EVp9rNrACxCSYIGfuCs4AGihTlN1j8+f45Ycnpzby/e/4SGUFRdh9fo4nhZMOVGjVOBXnrkxIajGA/kY19bgLJbGJyD+OMQvfGIy1rs/6jFjV9x5YpAXSgFSAHNtLI7ypljaW+8nDYe6dDEGapj5fT2qju1O8B2FQcTpDISgghvwPteICEUAKRBEfcb11DK9ucwZ4pOHYdsJYGceJ2O77f7T68JDmKGUigXvuIQkJ9Iw70C6WJIEOh3QBWnmR0ttidE6juLSMl3dhayS/c2UrQWm5Ai2/qq4xK5Jvr7luzExd+5OwMdDRHf718snzB/XZH3t42OEyrbzbAL4HS7BEK7sWH2QSv+/4rp06hJbbbuxaCyW8XE+YAjHVFXJaRFQQy3PhHACZW3ULXggoD0B92KauL3dk3dDHlnjteG/ajsfczn89zXEPrTWLZuFzGp4W5FFGCv2jjcmGOVONb4oklw+bU4IJ1e/rvVWwSIO3XkEWSBrMRD+xLhaiHpVBqh7pgb9XipMBQBpJkdTRS3QFdyk3+/mX/Kee9m3TP/w8ATVlOaauUIdSKPo8sGx62aE4OK3elmg4OYQKmnJ8IUhC//0+Yh1HVRYPXSLxN9bq0kyf523RkpMAz1jLKaJMDY4NM125MnIWoN9P0j2Puwjhr7/DgM5Z/l8bs+enQMJCqySqLgBrycN6vBB0Kam03U/xp5BQkfCdWFg3SvMUiprzWgkFQMzgocKD+1LSvyQxtl1LCjPDpJgWtejW4HXgOXXd+kqPFEDrqO/HU8qR9dgrzJNV5Vsy348yqRUupbAFtjZC5e+4tZPASUVFM6n3suKXMNUmW62xr8B9+tBLv0Q/0dhpZaU8sXbvYxcLQfthAiQ8RLM85HBeaO1WjOmHrGLlK/i+yAWj9+SS19cfITKg8P6AWga2WvzYxeGe X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 985c2ecd-c3a2-4f27-625f-08dd5d5ae6e8 X-MS-Exchange-CrossTenant-AuthSource: DBBPR03MB10396.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 09:31:56.1041 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8G7r3HNAELx2tq/CEJ9Px+54eN8C813bXbiSGMir0UL8kBMLstEHb91gtISX7DIlY3uwQUa8669UiQKKOtFi7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR03MB6630 The current implementation does not apply changes to the crop- configuration of the sensor immediately if the sensor is in streaming state. The user has to stop and restart the stream for the changes to be applied. The same holds for changes to the V4L2 controls HFLIP & VFLIP. This can be undesirable e.g. in a calibration usecase where the user wants to see the impact of his changes in a live video stream. Call mt9m114_configure_pa() in mt9m114_pa_set_selection() if the sensor is in streaming state and issue a CONFIG_CHANGE to apply the changes immediately. Issue a CONFIG_CHANGE when the V4L2 controls HFLIP or VFLIP are set if the sensor is in streaming state to apply the change immediately. Signed-off-by: Mathis Foerst --- drivers/media/i2c/mt9m114.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 9a49dab65180..65b9124e464f 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -1098,6 +1098,13 @@ static int mt9m114_pa_s_ctrl(struct v4l2_ctrl *ctrl) ret = cci_update_bits(sensor->regmap, MT9M114_CAM_SENSOR_CONTROL_READ_MODE, mask, ctrl->val ? mask : 0, NULL); + if (ret) + return ret; + if (sensor->streaming) { + // Changing the flip config while streaming requires a CONFIG_CHANGE + ret = mt9m114_set_state(sensor, + MT9M114_SYS_STATE_ENTER_CONFIG_CHANGE); + } break; case V4L2_CID_VFLIP: @@ -1105,6 +1112,13 @@ static int mt9m114_pa_s_ctrl(struct v4l2_ctrl *ctrl) ret = cci_update_bits(sensor->regmap, MT9M114_CAM_SENSOR_CONTROL_READ_MODE, mask, ctrl->val ? mask : 0, NULL); + if (ret) + return ret; + if (sensor->streaming) { + // Changing the flip config while streaming requires a CONFIG_CHANGE + ret = mt9m114_set_state(sensor, + MT9M114_SYS_STATE_ENTER_CONFIG_CHANGE); + } break; default: @@ -1286,6 +1300,7 @@ static int mt9m114_pa_set_selection(struct v4l2_subdev *sd, struct mt9m114 *sensor = pa_to_mt9m114(sd); struct v4l2_mbus_framefmt *format; struct v4l2_rect *crop; + int ret = 0; if (sel->target != V4L2_SEL_TGT_CROP) return -EINVAL; @@ -1316,10 +1331,21 @@ static int mt9m114_pa_set_selection(struct v4l2_subdev *sd, format->width = crop->width; format->height = crop->height; - if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE) - mt9m114_pa_ctrl_update_blanking(sensor, format); + if (sel->which != V4L2_SUBDEV_FORMAT_ACTIVE) + return ret; - return 0; + mt9m114_pa_ctrl_update_blanking(sensor, format); + + /* Apply values immediately if streaming */ + if (sensor->streaming) { + ret = mt9m114_configure_pa(sensor, state); + if (ret) + return ret; + // Changing the cropping config requires a CONFIG_CHANGE + ret = mt9m114_set_state(sensor, MT9M114_SYS_STATE_ENTER_CONFIG_CHANGE); + } + + return ret; } static const struct v4l2_subdev_pad_ops mt9m114_pa_pad_ops = { From patchwork Fri Mar 7 09:31:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 871418 Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013008.outbound.protection.outlook.com [40.107.159.8]) (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 BE22F212FB1; Fri, 7 Mar 2025 09:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.159.8 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339928; cv=fail; b=PyDuTJoza+Gucbsgpi/Ck8+1zNJdLlYlOBXGq+gFioy0IjJ9MC+Tsu4FN+GdwgYzBWdb3vaTEAxz9NN1d2Hccx41vdc0Zj+l6MphwvX1shSehbmyWpJMrEdoqDYMo1h6mMG5eiiy6dt44jtabsYz4dDxw4Pw6UvnQrmZKvn12sU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741339928; c=relaxed/simple; bh=Dkr+pAnHom+1qnjfXIntxIyeinqj6BxatODxq71cc6A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Gcvhj7kkEqLaNnOBmC1YVa0OdNxWdd1FJ009jcq0wN9Nxu/3ACnNQ4wrIfiyo/r2+yUXxUGJTJAajCCPu0ZpPApKyCifCTExc2lZeOsiCu+uX9GB52Mj/nGG4uEn1jdVazVTcXVHmaNsJwLYXAOJV7BREWeRls/glYIfGKx7oWs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com; spf=pass smtp.mailfrom=mt.com; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b=rSxH4JQD; arc=fail smtp.client-ip=40.107.159.8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=mt.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=mt.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mt.com header.i=@mt.com header.b="rSxH4JQD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MH9nlUtzdj5w115g53DrrorSh0WdT3hgAwylmZVMtEUWQWiJTB32xuGtllC/sbkVFZGwXJzIyMArSinfK0+oZRsSuhdSk60TkrrChciF/LQ/2utk23FWp8VB5Gw1G0TUnP7nnkK86M6LHbQJuIdWGZKRQMTDRQtzUcUeN9AczjdQemDK+4VoCRvpBKjaGBiVZTmtYtA4SH8pZ/PKdwJ+sphLa7aY6EZxliPujZzAgIoavtjXWhTOdG3TtJ1eLnqRWIHHmxVtLxNKKPsfMwDcBGGGTSgfPFy91La7/su6ehITk9v7h4f8EyF0rAi0aWXMQfuiFtuXrU/R4suCjAUHuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xBj7Rt7rd2WVhxT4Ohiz7RBupOnBbZRC2Aazq7L+16E=; b=aluEgguhz031vorSVrkiZfqrzFCPLGg+DlGHIKXEWYcd9iCAQTZeQjk9YIH/VK2y+Ec67ZGx1rZX7exTQTGEXTo/xwqvbecl6M3gnXh4a3OeCTRjm5el0IBB9LilEouB4T+C698AMVRttMfioCvw+6zsXA3a66otOP6E/CwDz3E1FRTHP/xaKtkGKFyCGJLjPKiHGlbsPJttObSp2a6eYMFPiKw7CAx4+fcDls2A/Ukx2a2AH+9RR89eCbpgWkZFdLXQBHNUy2kVXqVwg+KiD/isXUm4L3VK/xQphHwNJTRAfpUznqILp/w7FCEVj5AeVWYneFsKpK5xIdXgNwRLGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mt.com; dmarc=pass action=none header.from=mt.com; dkim=pass header.d=mt.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mt.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xBj7Rt7rd2WVhxT4Ohiz7RBupOnBbZRC2Aazq7L+16E=; b=rSxH4JQDzvLDMeowKk15QBYf6JqJsxDmK0h44D/ehI6xZWd0ocITE7Ievk7V7rq9Uo6P/4JBAbynp53FcvKlXZtSUQY7RVm21D0lXjhKor6AQTYqEOR9QMzgOvxaxMEJuGQ6VqX1hsEuF28+e/5yePDQIDeQ3aJIOccoaHG82Kv7Xu+pwB8HuBxMNuW6SBFMhWkAa5U8Qg/Wt7JwKR4GgPaeZTLZyIwtGlvHfBImJ8mCmvM7jYH5mw8Y91JI1cVEmXiLn/P2bvIxCqJdcshu2YAoeKLuhV4jGoC7oNbdLTmCPdhKI137pt0SIyqwMmneCtrCR+gJTTKpU/yxh6MFvg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) by DU5PR03MB10443.eurprd03.prod.outlook.com (2603:10a6:10:529::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.17; Fri, 7 Mar 2025 09:31:57 +0000 Received: from DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf]) by DBBPR03MB10396.eurprd03.prod.outlook.com ([fe80::ee3c:c9be:681:c0bf%7]) with mapi id 15.20.8511.017; Fri, 7 Mar 2025 09:31:57 +0000 From: Mathis Foerst To: linux-kernel@vger.kernel.org Cc: Mathis Foerst , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sakari Ailus , linux-media@vger.kernel.org, devicetree@vger.kernel.org, manuel.traut@mt.com, mathis.foerst@zuehlke.com, stable@vger.kernel.org Subject: [PATCH v4 5/6] media: mt9m114: Fix deadlock in get_frame_interval/set_frame_interval Date: Fri, 7 Mar 2025 10:31:39 +0100 Message-Id: <20250307093140.370061-6-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250307093140.370061-1-mathis.foerst@mt.com> References: <20250307093140.370061-1-mathis.foerst@mt.com> X-ClientProxiedBy: ZR2P278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::16) To DBBPR03MB10396.eurprd03.prod.outlook.com (2603:10a6:10:53a::11) Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR03MB10396:EE_|DU5PR03MB10443:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cb0f31b-05e8-453a-a09d-08dd5d5ae788 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|7416014|376014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: 4oE+z+33tHvWMU2Fyc3YPw3FLIGOgMk6/u6agwbY1MI11xguRd5jQRP3yszg8kFkZhZTEyTq51YHiumuHfRNN8mG0oszvyiwlGWHfR6Sfm5VFAadbQ57Ej57bHDS4rHjCyortE/DN8MAveaPT0eVfLWA4uRfCae/FXQuhSERE92qpdWSpqHBKMTJohVTJZjbIEM4zdAEShBoqjc1O/h8SJJb6ZTgMZUvW7tZF0a7wQLOWgwlpgmKLsn0jMc4+QZngxsDG/s+cYHY28pgiVkTxh9t9gC3Yp0YrDwhU9EEyidncPrqABiViRva4Ed98t2H8d5waiVmGwfyckMtW6lfZjB2RU/B8h7x38jjGUTf2sC7qmrZf7qzfg3vGeyh/jOyfOrMg6TEkM+PvLuL6cypiV4bDYO62sGLj8XP7KvikDtWQpWa51AGkDPsFH+Hb+eQElj9MVDklSxYscSf58H8iqLjWcMQ6X9uv5m3d2uiqSaldWAL4LpzoOnT0BJX9AEH7nYpkgHgkzhterquJx01iCe+uiGkQR0zRqCIXO/sonzXc3GQ1flPIZWD+ZWI9nZXaayokj4OvKoXACKuFXFQW7zuYzZjfySySs3+XRZwR2Wf62m+r/rMNPS9vzPjwD/cp7TGFljGEVqwP0hs+ZBtOMg/AFFfe6O8n8igV6GJdZk+Dr7TKALP+pXRK37OgoJ+aEKtuz4KGDvTxWx2O80RSUMBTfUnMg+LhkitpX1xu7ywYxl+uzbABkazpvO+JBR1l8wjHwCJ9AIparO8vfgPP7raPq9sFU2bI6yG3wtYmUU7hsSMLicSRQUFFTBXqSGid/tcBRVdDc2PvqGKf8X8kDzBOEhW3m/4jL8P5tQD/HZyBpxI1N6BjU1rA2qi0wtgM0HBZDrcPm73OlWy0JZoFdOnRJxyCX1EWAnDjz+ugcRtd1F0/79YAvKlcM1pHYOqt+5KEZWLgHKM4Q5FZSM1rsRJZazj/E3XwVJvdDd0WZsb+Yyk2KEB+NLOkiUqgG0fLTIysGZBcrYvWR/g4UAhoQqz0bIGX0IyBGXMkt7drg+xxa3+baZ93VRL6G+XEfaQ1NK0b0iSv3ZkoEQNpCyoKtNxfDzqkbD8twH6kKv3fc2uxsQviUFsD3+Gx36afspwr4xHFEs2d1j2km8MGs3cdpfxQHv0HojdnnkzD2MdzsDb+GKndlsGA1LwTAojlTy1TclVyH/fIHJ6IQyDIrUirNFtXL8VqYfBpISlvH68+JKjAWQeHF/el4BD6Z4byj5D1m4zXZ4O3Ljr2DcA1WCz21J7ZyMhzO+CjX7blCW8EPVipeV1ECSWAaaEQg4rnQZ2lqbesINxpAEPgj1mTFRY5TwOv3ptH1L0Ow1a/ljIClOhzXbWN9DJFuKReR2dVQp6RjxR/6c/wBh2VcMah906q/pspO3sgIEkmRrkPz9+6YZkLUQiYNOcbs2Ynyw0O4Z6 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR03MB10396.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(7416014)(376014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: h5Ks7aL+poQa5/JSMt3sNwX818/3FSIFc4oAaskNsdj39vyfQVCWstE5JR6tNKS2+fX/1UV8UBYgYqYMAf5YNXzHnWh95nx/cgbWLN8Kx/KKc0TLjhnpzGU9bBSHgCGvWcFQS4ZYmPuoGKmtuLcvYui/KOVDZf58VmevuHyQBz2axwmNT/RYI2fsjPKPhWb5dhefEP1TrQtiEyYqGfBX2ALU1Lt2Gaqkg9X6WI0US3ASgt7AYzbCzo2gCGh5hD+9eJLToMxyiplwZMPd2IZsrckVNU5GTQJGd2aUvxaycK/q7cYVn6wVGlIPEFr+6a4zHJ0RCcWLoxFzVRQjmJK/38HIoxqlWdbCzNP/t6pbqZpj7SFy2PFUMuu6w5cmjKvsJUA40wM8aiPmDFBQ5KeFbBQB1rOGYlUh5w11RqeMl9pC0bYr5GjrBl99mBlUjGErkx1DfqoAJt2augmgyKDGFYRrWsG3HeFZ3frBx3jR62SCUJqOQT32Ssbe/A+hd+37NiX2SMRQVvPagNHNYdoLQTt0NIE1689qtGsZBBj5HwX4HSZoRk+foeEfcqTekOC3bH0JNbGowcqK5HAVnfi8FPk97HyWgJbC+wYrGOLjnN8SfyoscfkTx/1m5DOOyRtffZjf+H/0H33lZ8Vbalwe5yKXp6ZyacjQvHECvKMpRfhUrWMhD7OQP8h1cikpVSDojZRNmt0QXLYeNmKWHdjTkVBvFpZ1rhNpDowU22u6K9zZxantr3bxSw9tubWeJX4FmahJwhWA15BpJh0OWzv/a26siHuXEuWocZ2FMnBPYPzqfeTgzPqNMj60+YLGdUMKVjn3ctcSQJxtNZkrMkBMeXWiOiHEInLLY8NJzjGpFCOSXtY7iVkP0S7hyx0EfTivsRxQ+O10Yl1HGapVdNUlzcDYyl63OJz793EmD0P/SlegmdHnmbFLZPeBICpZtVoVuLArJvpj8mA+hzPhO9xF3D22AvtZh20jn8H7peeZofyivlo1MQNo2gZOWypz6kRUnfRfVL78KlyNrpzoKOs8xI5FcuIuVRPC9huK/blB9/kARs23ZeoqNE0JNUIIHcZDrEPaQ/RouoIENnOPSMDKsu/RGJMVE+j9VBxoPqhGvum+gv4X8sm/BucU1CaK82M6KIDaWWqAQJq6Y65mzUYMc7xm9a7zQaqN8DhxdhY2M04vavPrskqTSxadHpA1SAq37t8nMGTwhGXslONfgmGh3L2/6afZet2Al14Y3tADUTeRnI+UpvpLdAcTptZOHP7otPX6v/DtTZU1+VHkK7f/686fAtB+viqJ5/eGscUZYg0TpWhT35ImTaOJt/gWwmjk2/W67PuD6tD8t9cj4uXh23YgspTu8o+X93ezwX+eRjScuVtSVK3+vZ1IXkVwfwwIbxbAnT6EZLgtLOZgwp+iazJpVi4r77kfUpFI/GfMbJzzD6u1FR9noP7F9EWQkv+A7onHVWqRteYKv2k2M4QYOAbvPZI9aCUD7Thfr5tV2zpXJN+yhyFAuxxeh+uSg6BnNz7b5saTzSQ7uck+rvUoencwBIwztSHkrZbDW1bDlUatdHLllFJuHfQf/J6oMH1g X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3cb0f31b-05e8-453a-a09d-08dd5d5ae788 X-MS-Exchange-CrossTenant-AuthSource: DBBPR03MB10396.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2025 09:31:57.0709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fb4c0aee-6cd2-482f-a1a5-717e7c02496b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vMHDvOnYCNlk0LV5CAgfTBh5v7TcYPWhKTteypSHH2U4xP5GZCqkx/6JX6QY8mRI2aK5AdwSbzf/pBVyKVi9IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU5PR03MB10443 Getting / Setting the frame interval using the V4L2 subdev pad ops get_frame_interval/set_frame_interval causes a deadlock, as the subdev state is locked in the [1] but also in the driver itself. In [2] it's described that the caller is responsible to acquire and release the lock in this case. Therefore, acquiring the lock in the driver is wrong. Remove the lock acquisitions/releases from mt9m114_ifp_get_frame_interval() and mt9m114_ifp_set_frame_interval(). [1] drivers/media/v4l2-core/v4l2-subdev.c - line 1129 [2] Documentation/driver-api/media/v4l2-subdev.rst Fixes: 24d756e914fc ("media: i2c: Add driver for onsemi MT9M114 camera sensor") Cc: stable@vger.kernel.org Signed-off-by: Mathis Foerst --- drivers/media/i2c/mt9m114.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 65b9124e464f..79c97ab19be9 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -1644,13 +1644,9 @@ static int mt9m114_ifp_get_frame_interval(struct v4l2_subdev *sd, if (interval->which != V4L2_SUBDEV_FORMAT_ACTIVE) return -EINVAL; - mutex_lock(sensor->ifp.hdl.lock); - ival->numerator = 1; ival->denominator = sensor->ifp.frame_rate; - mutex_unlock(sensor->ifp.hdl.lock); - return 0; } @@ -1669,8 +1665,6 @@ static int mt9m114_ifp_set_frame_interval(struct v4l2_subdev *sd, if (interval->which != V4L2_SUBDEV_FORMAT_ACTIVE) return -EINVAL; - mutex_lock(sensor->ifp.hdl.lock); - if (ival->numerator != 0 && ival->denominator != 0) sensor->ifp.frame_rate = min_t(unsigned int, ival->denominator / ival->numerator, @@ -1684,8 +1678,6 @@ static int mt9m114_ifp_set_frame_interval(struct v4l2_subdev *sd, if (sensor->streaming) ret = mt9m114_set_frame_rate(sensor); - mutex_unlock(sensor->ifp.hdl.lock); - return ret; }