From patchwork Tue Mar 4 10:36:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 870308 Received: from AS8PR04CU009.outbound.protection.outlook.com (mail-westeuropeazon11011010.outbound.protection.outlook.com [52.101.70.10]) (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 38E401FE479; Tue, 4 Mar 2025 10:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.70.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084678; cv=fail; b=J/bS1pr7IXN7W8033dBdG1Zm+LIggU/wlNkJT45tGLpbN5i2Y2940xdnEyfFZgKxwizGvuGh7JyTzPn9GJFI2pVkRv/dZc0lO6//A0JixJwBL9EGYFuV6EoNnmMwm6X0n9MbrTZmSv88BrVFM+6EWsf0d+jwriqTeiWY0P5YCBo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084678; c=relaxed/simple; bh=JDyjTuUtmBrknHl67BapgfVeza/o7HEhSsMyml9s780=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=LjkR6f8j8KNg/XKWTKG10HHSnvEWixYUW1dZFZAcO8WooJ9Sbk1HVOLA+0VtsZNq0z3QEglhNkYMfN0UUrb08GehsK2nhlYh6+AVEcPRgD8U18KpNkXrHZopjyAxOH7NSco3C8QdScZYGTXadxt5t2o8ImMU8xE1df7MQgo/Ou0= 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=qBkaOxmO; arc=fail smtp.client-ip=52.101.70.10 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="qBkaOxmO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pc051Xi2sr95imNnAwFZBA5AfgvabfyZPipxWBVvzydWcCvzigv99LGdP802wh+0WyFvp3RbkOZHjtqlVGWbzNTMszX0IA/rTJ51klykWAhhCMdvbjqK5pfUv3/gvLmMCiIVhi8/sg3eOnTscu2pAGfIV2io+90J2HBiLyW6GX2QopL97crBV/weqVwc5PJLlJBbGC3BwsUgRh3kyDJkkqA1InpuTrRoy3IfsMn3+x66D7FsYLH4qLzFaBOXSfuDAYC1VdGElzu8K9EJnEzWEYVvbdF0pX/BQhKYGh2xgDZkWnqgCNk7Ka00bvvNhWmN73X4xXr9gNkjB8Z+zqWEAw== 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=s1IXGsz+W3YQlgdefjKpJElb9gHzoOTFEwPIJflJ51Y=; b=HhLBjT1JgqBh4YYHJYHT0MWnm0fCFX2oj7NAL+gP8/81MVI76BzQu6uzGSPxs7KHC5Msh0tvQGf6NZgm/BbEioFb+mq058Nm9TH/6H3REn572dNQpe1N0iexWV+17h0J1dqPpJPznLAEA/4Ne1z56XXsDIMeu4U3Mkkt8MtH3l+4sr8tCNHPENQKouk7LDC/hK+uUAXdURdO+sh34+wMc70O6lXbo1K58CC3dUc7+v1s9Ibv5OGcJ89Li7U5Bxp/MDw6f4cYSSfNMtpu6f1dpUjeRL4/Cqs7ib0kfal2StqittZER+4I7lUsuTOY08yty2E0IizQ8Lsdfz0v7kKk0A== 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=s1IXGsz+W3YQlgdefjKpJElb9gHzoOTFEwPIJflJ51Y=; b=qBkaOxmOpAJYUhwExC5RVRlqNCujwtzq8HcD/KbCGuKj7NE1Sls1e+AseVFp44d86+QOyVOX/BcmhJH+HQr/OKcNzqHIO/2bEY536CiM4Px7dUY08m65ZL5xLQbl40UkQ5EC+GM8gyM5Ht9tz4IHcCztT9Z7iZguTJP8J9WHyh6UNahMToj/bjyslKiU9vD13o2CScv1iOGXPVPy4xVJm4uHq/Aeh/dLqVsB6+4EOIFdUBb8n92xdkmROa/QeGquhfqAtDwtWIvQLcsMJomrTAAavVduJBIiEKCu5o7WlSepTmdUR8M61Exr/rG2NTq3lF2+wkaWNZ9ANTNSl+qSlg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) by GV1PR03MB10575.eurprd03.prod.outlook.com (2603:10a6:150:16e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Tue, 4 Mar 2025 10:37:53 +0000 Received: from VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd]) by VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd%6]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 10:37: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 v2 2/7] media: mt9m114: Add get_mbus_config Date: Tue, 4 Mar 2025 11:36:42 +0100 Message-Id: <20250304103647.34235-3-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304103647.34235-1-mathis.foerst@mt.com> References: <20250304103647.34235-1-mathis.foerst@mt.com> X-ClientProxiedBy: ZR0P278CA0076.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::9) To VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) 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: VI0PR03MB10400:EE_|GV1PR03MB10575:EE_ X-MS-Office365-Filtering-Correlation-Id: 09439845-908a-4d4e-2d42-08dd5b089e31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|7416014|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: VctVUFkzDNNLI0ES72IIa1fX0q2a1qyFaBnmZ9SLM42zXwGlJW1+WiCIlpdUrxR8vRIewJadRHZkf9ecDt8D1eHc9gD5m3xNwXfNrnYq5uslnHOhwCdIKPuk0MSFgCsBKaY8EtkXiqCZg2MNcyx2u2bqGq0zT9e7sYdcNZhmaXB+u07//ur973yO5wkCNMCDhalyTr8EOMGaPjFeXt1tdyG/PhXXj7wJy8bZiSTsZOw2tlzdL5aPs5VytoWQGBL1165LBfMvzLdpkr9jJnaIaOKWvdQWEFCq3p0acu9ESFfZqWeUrRbhW+IXdiXHeO3nzRBtkCeGCqelDrMecY1TUFm/K6zco3zqi/sI0CQctO+nDovO83hn4nIz/6OxevPDfGZQQytcYXf+9Hsx5ymHHc0riCZEjO2nXUR623RkbVCHMbTatEDhyBPvvxsYrzpgLx8FNzX5/PmbbsvN+Zc7dpFdk5zByU7V5kvEtXJhtFH3skiOIg1qlvoyA9Sd8QPmmq5wE3Pa7VbgGTCXH/5f/Vts2B/7TiK0vK4o7xSNly6Ex2nVA7w0TduJZAe8gVQoChViQU3J37MH1QMRCBVrEAQgJPtb5z+pKkC76iDzINEG2scXrNJL3bMPmtILg/nXmldhAAlurTBU81nkNyrXDLLIRV+DQoFtMWKkvnSnkjxSSKEhSUSMgAA/JFbymAby8nXQGY6BFZUWGOtmRDJMrd+JxDPkv4s3OHDWdjkRNyRMFN7VhlejlQSUNEeBUR+tMaCeBTnsL3w/Lkw5Cn/i1o57Xem7wtU3GrbcDxSKkK0F9TXpAIxi86LtXG/sKqSTucV7W9zK/hjM7Pp9YAUciuqAiJIP6rK97IP/1pkFIIUBDrenrotKUXBhm8FUChu/u4Y1qESVeze4tKnD+8cnn9QvRs09yjfacmBqPY7j80IEo8j05QtWW+GI7y8iQzzdIjFvPs8dxMDlaT/M0p+YBbfu2YApm2hn6qAYvGZAo31MQSxyUXTVpLqJTwOKgZ2cZqjQ2Y+G7c9RKIq/R4oN3vUwVxgT0q2VBmqH16qdIOPfqQmTkapUaDx988hZQ/higAMgTbQOaHwm1ZA7IEtzE9zvCo0VYWQyne/R/t+6UGYcUpKwHH4JBxbqqr+9ENxtHf1cibwHobbvQrXP9Xz43oK7X3BIeJXY90r4uDkxrhwbowPYvwSEVRYt9AE7UMWsIn2xLZQjv1QSOz1eT1nXq0HsqpMJuj1Vkc+mSNy3c+h2mpftsveMHDDzExYztRTQB2k63x7NXtE5sFR5QuLDn286Hh371r1hFKhHJYaW7P1VnWEJWxxOMv8quxJ1IA50cXQ0smR0h3IBwwddvvdQiocquTwd38fpiUsilLpqWqDVFeI8UF2hPkn+tnGQhgDfwGcwd4AY4mL5I/erv8WuSg7o7ZvzJdQM0nyb6SPpGqcFM3NOaF8bnZ5IFGXCgAOO X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI0PR03MB10400.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 06msJfY22O4ATIn9Bnqb3UcpQmKvj3Q9vpy/kCOEK8wGogTVXsjNvzoDoAJsQJJXArwlSw+XQ0dKRCIOHM/pR+V5L3oMZsDilCvtx6vTHW9wB5VZncFfmAN5QF+gdoXGxzYc4lEbV6oipeqrkyHjaHauM7nt/D9dT91almlAiE2C70Wcjjw1QzFJOb/EQxdAzBOV49z4BFrtsev7xRZ63VBaSk1fK2V/wlu5bvDq7l0I23k/qYWH2sNFCGswudEw+hIN1ViIyhGzTsS+9y9UIWimDZDgKGaddxenjQTKqp6cNBE86yivz8aFOcKLv5oU3t77BtjvQqO4T4LVivN/U756odSjufFwiDDsR4R+72vwZxLPkL1A3q0EU6XWMhkvdI0rR4JQHhiOYRcOwvBjdlRU4NCleGOfTbMIIpcSCjk6+hT3nFwJ4Rl68YDcqh/9dqPDAraH3QmukqzsM5takrP+u4eR1JlrigaU3BzM7WbCDYahWIMHjUESJClKUyGOHPVKSBpGRUOMsianc9xLn8XOQALXTDCTHFwBZjQFSYXSjIIOUgTz8YI72PEbkLQi3QDJOKB7OsWTeSKuUMAGnqaQXwZLg03dKvtJ8dGMIYixTjNLxTCZ3PgLHnGfzL5M27fiRF3bd0xbiF6i4wYytkpan1XK47k1+QRyZzbJ2J4wwnjM2vKWsM3YzZ1O4XbSbqcuMc9Rb1mQOiMOY1BNQQ0gsmwxjZG0btgBuMqGoQhQqxiSGs/a1wZUTr7o4S16SI7lpfv6Dq6hKY7lPJ23Nap7rAWARRxLc8N8QJ1cuxgquspZQcL12C3x/5rTJ2PuGnaqEC8YfBiizSUrlE0YCaHS/cizehsx3xpioCc5R4ktGpKlUu1nD7TsemSp/WDsu+7R3K6wOmcii5+X/OXk4XP50llv9U/DzNcKdDC41gfDUfkz98W5F6BFsIjaByY5a2ms7CjD/iTmV3+41B0yvCzqaRHeqrmYwAPYBDGm4tm83OjFtARisIiRpL5PmFH1znNLYJqInIfhb9GnLVHt8WcKx03Kx9lf6QOo9J3yvuucZxiWeOhWmU0RlLUUitKWRE4pY6WOCgRA58lrHPV8povAL8CVy5b4kS+1fIk1DWK2yUL5YZBCCk/l96JNtijMd6nkAhRnJ4e2PGlVg2baR8lAhYrrg9yZI/Q7c2PjKzPrTyfe2fSCL4Jf1YcXhy++dqvIR/ARDkkkZ20yUyNhd38jXtTHYFR6h0hMBJxOtdT+cIOZfWSYS3Qwb0DqezZyE/5kLagOgHbV9WGp9oW9ktLI6WM9DgKLnBMXLvP//dlDSpNN8Und1w8cPmd7RZSoVZ8891hXtSAjlU9+xkGtYoRzb0hy3xZ78fetRsOr3Hr9GUxRoB01KBxMO6/Nq4dmmjaJyOHHcdUjKmrn9CiEGrkPBKwO9SWOVTzXJZWkqIVAWJnOTnXF3CfsrubuDQwlEiMBZNKML4B71m7cxhGAQ4upwlqZdxsOcT03Fv83Y0R2FcMEQ3BFPkBZT7mBwAL0rLTPqffAoO8IeJqRzBbPAKB3YUVaBK8cMlVz5LTEK+XjEr0UfQVfvAapdglBW0ee X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09439845-908a-4d4e-2d42-08dd5b089e31 X-MS-Exchange-CrossTenant-AuthSource: VI0PR03MB10400.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 10:37:53.0048 (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: 3QweVA5SUDmr7ZDsf+Dma18zSb8thlysRs4bY0Ye8mk/DWRbusEd2h4/uGbI7MiX8Wgkx/3irqNV/QuODDi71Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR03MB10575 The i.MX6 camera frameworks requires get_mbus_config to be implemented. See [0]. [0] drivers/staging/media/imx/imx-media-csi.c - line 211..216 Signed-off-by: Mathis Foerst --- drivers/media/i2c/mt9m114.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/media/i2c/mt9m114.c b/drivers/media/i2c/mt9m114.c index 5f0b0ad8f885..fa64d6d315a1 100644 --- a/drivers/media/i2c/mt9m114.c +++ b/drivers/media/i2c/mt9m114.c @@ -1977,6 +1977,24 @@ static int mt9m114_ifp_registered(struct v4l2_subdev *sd) v4l2_device_unregister_subdev(&sensor->pa.sd); return ret; } + return 0; +} + +static int mt9m114_ifp_get_mbus_config(struct v4l2_subdev *sd, + unsigned int pad, + struct v4l2_mbus_config *cfg) +{ + struct mt9m114 *sensor = ifp_to_mt9m114(sd); + + if (sensor->bus_cfg.bus_type == V4L2_MBUS_CSI2_DPHY) { + cfg->type = V4L2_MBUS_CSI2_DPHY; + } else { + cfg->type = V4L2_MBUS_PARALLEL; + cfg->bus.parallel.flags = V4L2_MBUS_MASTER | + V4L2_MBUS_PCLK_SAMPLE_RISING | + V4L2_MBUS_DATA_ACTIVE_HIGH; + cfg->bus.parallel.bus_width = 8; + } return 0; } @@ -1993,6 +2011,7 @@ static const struct v4l2_subdev_pad_ops mt9m114_ifp_pad_ops = { .set_fmt = mt9m114_ifp_set_fmt, .get_selection = mt9m114_ifp_get_selection, .set_selection = mt9m114_ifp_set_selection, + .get_mbus_config = mt9m114_ifp_get_mbus_config, .get_frame_interval = mt9m114_ifp_get_frame_interval, .set_frame_interval = mt9m114_ifp_set_frame_interval, }; From patchwork Tue Mar 4 10:36:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 870307 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013021.outbound.protection.outlook.com [52.101.67.21]) (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 C4DFB20102E; Tue, 4 Mar 2025 10:38:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.21 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084693; cv=fail; b=VUkKYtTFUS+kxfo/fKSBIzEQatVOw+MU5xGVS+8khQ2iVI7idH1Z8MzX/rhPJO/tF0aYBV97SPtF6SbgHtbXwLRcf+Sg58wmh0uDwFpRBGdKSnSx0yvbtaZBlWGClGhkJjXuyAwa9sZY78uj1FJMpkfXXom7vkiQLELQ3CCbDvU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084693; c=relaxed/simple; bh=fB7jbikXKvlKXP1lZS4MLMC1BeFNPmxltxFyxeyg+7s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BL03futuStiuu1Nqq+kHpUEVdEcNqxGux9clVocr4RWCP+onG9uNVcQra73NjkSCGaYG6ePLQxI0RJXW+sSWaVdoZUpCmZcTv2c8yBj16hijqbiN4M+FeCAaeZ172QVfZ0XaV55CMEqhbBLvUWeNmGLw5jLJVRPMVQRM6eDJoxE= 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=a89cdEMT; arc=fail smtp.client-ip=52.101.67.21 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="a89cdEMT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hSsWDbBpQVQjHc6cXkKy6EKe3UBd1k/1OhVNN/VSfZg5mvTEHQu1bUNs5Wpv98GPzAq4VcqGaXfu28txSZqBvdRmTZuy5/1qkDMn4aYfEli6I5g5hG2KxQ1/Ivx5aF7XR9mnkOd43AgmAbgLeGIH9axrZlKCYS4aXmIlI156wsd2E9ijKdthXKMITVnbZicBlaAFfy66eBdIDPpQNmZMG182x0huTqd8pP+CZrcW+VKOXvq9PJtPDVztXcYg5ZUmIAz9Z38PJXri0Y9c2e9WZKu2zSxEOgu8XH2SPziQKhVD5B1zsaN577f6FMbzKWYm4A5UhQ8yuWVu+rlg1Fqsiw== 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=AAPzIh+tX8QixsO1ryJVyTIVujEp14CYaWDrqCwjD94=; b=VBpeS2KcnPcRp96IVJwIOz79nWYWtLZwOUsCzTMpuUI3QaleAf3+J6pJqZUxvxL3uNHT3fGlsjxKN6+McXjKA3GBkUwr7InL9tW2+DU9O5ArD3NktEPLNjyAO+OqTeE43fWgqX7M/MgUHKP84zRHx6o5YKmX8rhccsfVKpCjnt8tW1OQEixbIuJlEWRidtkeBf65k2oR8R3ycO/NY7K5sDqvk4D4WIq6uJzGXa0bRk0E0ey5jkIM6dYp8ywqeS+qO+ELXqZGNPIFCCNX6oSD7q5KM7eL7SUKxhXOM+Ny+L+7m8yoz2NXMBceg229eEE/21EcH3q8z5hpjlj8sm9wVQ== 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=AAPzIh+tX8QixsO1ryJVyTIVujEp14CYaWDrqCwjD94=; b=a89cdEMTk6AAo/Fg98tUjTo+F5T2ZA9VxGKB728Cf2Z2WrsgZO6uE/dEg78UP7BUaAQtomld0gdltdA88Acq6kKo9ZzEGTphfFSnmMtKGIuBN2Be8w6lXbY8k6yOAzgfPeKu3q4wOky5CRvCGNYCA1wTBwZLZeoUynasr0IpBDhQAf9zbUZoi1QA8XHL/6SUdOGv92qE7o42jZkd7i8jBWO6Q5Nh0zB7mixNtv9Ok/D/i/ak5BqcReEtbNx+KkRejsyfBLBI0q6+PCtz7d0hhyM42ZX+h5w5xM9RWhj2sUVnmPUD/c/iFszf3qsz8O/G4HyPpfyUxjr8U2VSmZWwvA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) by GV1PR03MB10575.eurprd03.prod.outlook.com (2603:10a6:150:16e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Tue, 4 Mar 2025 10:38:09 +0000 Received: from VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd]) by VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd%6]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 10:38:09 +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 v2 4/7] media: mt9m114: Factor out mt9m114_configure_pa Date: Tue, 4 Mar 2025 11:36:44 +0100 Message-Id: <20250304103647.34235-5-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304103647.34235-1-mathis.foerst@mt.com> References: <20250304103647.34235-1-mathis.foerst@mt.com> X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) 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: VI0PR03MB10400:EE_|GV1PR03MB10575:EE_ X-MS-Office365-Filtering-Correlation-Id: 4552886f-1794-41a0-0c23-08dd5b08a7b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|1800799024|7416014|376014|52116014|38350700014; X-Microsoft-Antispam-Message-Info: mXEvvQbFc65wfoFQgMiV3SK0FS/7ZBzJzLh5hniDsJkV7A3pBeSyzGjSgt5U/OvTt1pSaTNFBuo6Fo3uljnFF5pVhizBkoxHaGXMXH2YV/DWuOvnE8vM6DPdCRgeawYf1o4hS8okeOpv6hsh8KtNG32031pngGqpl51KNIMGpLo/7T+ZwqYqyVkfkOhtX8JfVVpF8on48HtsGJSpMcKWXtHrJBnfnuT/SCfoAY8nXFRdTWhX4K9WGZAU3G9as3sd449c9dkU8JBF3HQZQRpWP53u/JlyeeeSJSA9c++kWMFe5kqbqsM1uqujN1ij3ghZRT3wynHxmtssOx6AAcotXzQXyoa/fKy3S8UY2DgsFxYNgdbFPTvpTFGSLu6lLVeCleki8KZSB94ZnNMbo9UjmmNysDhk9hDeCY3SVydwsGp6fYUoAd3/tpOKvrXsjnrNbBYDK/drAYR0NrCzfeqjKjh9s4HK6UfKRQYeCljCeOzvy6puggwFZlp/LTGgTH5JwHC9PqNOqPPSBVVJmfefyLdqbPLw4UMmcGT1rfQS3P2PiJrBYdxeb51eZUziG8MPxSvH+XvEzOR+jTC4Fk33vsy1V37LhhZgJTHmymNX0oh5x4xCFevVMahAXI9sBvNz92Pv+JkIMxoIyNjTJC7cth9zSwZrmMPKc0xytpDIBLFrqqO/SWFqQqm8lG5mw4jiiGH7HXM5POHDGWpaWvb4vHv1mx3zkCf8hSyzrPnZJyji2UAcfgHsBNpH7JlLjowoWgNCIJhnKFWwJAlSqQkwUfrNbliysVwxsPa4RuvxdeoLhVgYF8Vxx97iqcLPLPmbaVsVoedDimkJCd1J7hzZJozzoK4g+1spQdkCZEmFp5VHIo7k05sT3XXgKOfthbsmLHh02pnqX2iIseFAaeRVgk0opa/f/GALOXIPojaPsrVd0UTqGnuqON8OGi6Q0ixk6pnoj5GRH5GDFK9FmcJKNBTHriIly2pS3J1Mt31kaJLZ4nZvGjX+yIjZBBW9Hq63tWP/pdbGq49C+pVJ3gsRLt10XBmnPZR0idyU+VMkU5C2MMZJ+K2xDPbouikz+XnLaPOaDATn61r3m/rcQNwHTXEPXnrkVrj42APMNmO71EErk/dV6mmANN6AEbylxiJjZhwHrg3jtVid2ovWaGmLGp+OOEzY8nIXEvDNUURkdfqlU6qupk05x3LP57yf7Mml1o9oxztMJSmtntTl10chfon8Zsbl+CGUNrR1YSXI6h7x3hZBkL4EZYfeZdfWVMX4qLHOMZQlhZ0tvzooMBkP7X0/PVANsTO/cps9IiNtSfp9KW1uewmidAohMvxQc+37sgyXXih9BpCPnsDmkK5J0RrLbKcm4uxyq+w3a79gbQM4x8z+nSxXG5kLEB5AdDnnZL+LUjZMvOm59q96RAHRc8OdeKNKXKn+oOKWUVZOFcB65TwolzH97nWr51LXu/S4 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI0PR03MB10400.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(7416014)(376014)(52116014)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XG73EYC1o2avynTz7b2kKXYooyP/RSQ8GPnsq1fJVCyHAugA9xaTYCUyH0yiERUQ7aAZumbhd55gvelSCwaz9ou3gHPiC4RIfJYi3oFPCjCyP6+k2WVftSdfXPoPySUvPrn4aNo770o32/PlQe4UZlQa623Y1YVlKZmXArnIElWQF5mUrIkkFlcYMHXSnxoD9RutFuALFVVxXQA7KT+VCWApMt/dI+jKCCM/jWj6GczUy8AnJ4+vAruhMVf8RWe+Cglf3FsalrfR7xdfHSJ6Bc7I9KE2YrOh4b/GrPojwSRX9VhdR7wowOXgLg5vOa0pG+5SIOHFW+hN7vkgtS8tI4Mp4+fMpZfDUYX3hPK7ET3KfnVUfRauHbiFzlH1l3jnZp9JsmLncplK/qXn81XWvE+JGWNXb5IM9489qYEkxu9vIspPISahu9gjx/RT0+NT/o/R9NLlQFIBs2VGCj6NOoSucflz09ZCD0FwtqBbbKFUG2pe2/pU5GA8Bf53oVyHFAhptSmpddEXbSWDq+2Nu3quSQ7whVF+JDIGj5NH+dwCyka6G6zC8BeUW7V3QVh6nut6f2cRFEy4bL/X6J9Pk9PcC2xCakHOwY3mzI+V65gmOjhHlijMvuieOuX0PurnZX9+d0t+FyeWJgaUBvYjq67ouFNtJLNB8rUeR18023fXAJQC5y+fHP2ZzXfzvdKGV40OeT++qq8ROVi0gyhD8Allt+IfjEY3B1S5MScRzOc+GSEtXJlPpynQRX7M4IlwaR2Lw2AuvF4cEnpWpqwalH44Stx3yZpYGbO/f61cK5wi2NOo7xWRI+Ql26yjOyONOqp4p+pwNToC4c+hH7VDQGhzCCZQ19GHb66f/goS8oh3GHnVyy4OtVtWEBI1gpLQf1whZNka0pHQEnhJvl56y7n+FGm2eauqqcFPhqvzHRKYwTb5GgSiw1xryD9VExdvgb5A7xnvIcgpxb/bpFhfqFOHXfe0+t+NrOEjOWNql08+DC3ZsqA177bj0vieGBDdtCYtss0dbCrYyu7KlnwNOwyWEsKOM0Kr432j1B1XrXkdIkNJKFqM6GwjQm1cFnFNLBPHNnPMT6a8tPgEtTzWUKHHA+E2Bh3GS1cj5XSungyvnJitMef7HFunJbgOOEMimrl5iShKuGKq0lEpMLV8OnbTV+CiswIGdyFRT4cUQc8QApLB+YFS7GCL24iCjW+dxeZnYMVbIyqI49/pDBB4SjRoNKHyo4u6wZw5hFnW0RGtT8WGC4GD0Xqj7BEWjmZ3EY9xDz9j3551ae40gQVUd0DbrHtGmTymMXI2FDYIRfcf6Qx1y1/AwVsKz36+B0gvRltcXClKF3uh4onD3DMp/pgWla+3JAd/FEZUlG2IsYKOnj+94W5ULoOiXsyHKgq/TUdnXwcZYp/7Kon8FDp2T2W1XFWL5J0Owy2mMYf6Vee5qekkWvjL2mZSt5U4h4VE0PBq6ehB5HhIUcw2vm8QZianklijf0EoIpsHzA5tWGjPzONzgQSnphAN9i7uQAocogsLitm1tPkVnw7kp44j8ybiCIcIw73rfz39f5kgBFH0QBjeOyL6uP4atzdo9l1V X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4552886f-1794-41a0-0c23-08dd5b08a7b3 X-MS-Exchange-CrossTenant-AuthSource: VI0PR03MB10400.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 10:38:08.9548 (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: INRwd8POLDveLvdWiLpvww/H6A15Dzlq0q3vULnP6FHZnaiKFGR96ZuGTbwpGuXcA7RD+0YOnLKyIPHS4QfgSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR03MB10575 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 104b146a5d11..a91bacc1421f 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 Tue Mar 4 10:36:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathis Foerst X-Patchwork-Id: 870306 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) (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 BC2DF205ADD; Tue, 4 Mar 2025 10:38:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084708; cv=fail; b=m80zjaepwF+k8Um3Sj5G2QMM3kotThLULIYhjye82KbA8Bwpkz6gyDuLBBHcS88QY+3N6br/gPs9dDxktX+Crhrnsp8AwHqxVWx8TC1cGPlR7L/fTj7yCIaTLEOk6OIgqqu7x2mU77X26BEWUKhoJhglLJ2SMAB/L2/qZWXvE4E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741084708; c=relaxed/simple; bh=0PmGEovzkYFCfBS/08bKiQicvLg1DAoPH3g9wPyFo9M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=h3MZoez26iHM3dCDpAN1jFBXHec8AP3SgKc4asvigQxxsVjSX7NPogsi8zSihiCyZGpfHPyTmsMqRBDLAf7QeLhd8cwYiDyGOaLy518r9/7RM82bzDhnWQid5g8nY3RbWFbLr57CDhlgPPLcNhUaZYsJ+t68htoIsi2P74lGB5Y= 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=bbZlLERk; arc=fail smtp.client-ip=40.107.20.80 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="bbZlLERk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QJ1z0zeAfPo9pKuV9cNiuNHVO4zWq1N6i/SGuklpSE+FCNJR+33Prww60Ps0QNl+Ix9mdYemjzrFQoffgW2QCUDmopt8dXpjW8ThBb7ZE4J8dm3bYZRU9HHwwwCB2D/jzN1LunrazfpmIC83qNMORhKBVJRzqoWrffCtMNwATl6xB0KlV5EUIaybfYjM4is8bWmkEvaIlXbnCQHKthDFtmP7DrGET7OiRfN3Y3Jay1Vo55xI6LsVTj/Pt+j1Wu8WdnseDscgHruuAop3ZaTvqJoyqDNHpUFjErjFoyzeeoajhoy7PrdwvIBVtMhjm7QnxipfdtWRoXtLGYZLz92uJg== 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=LPp3Ku4wLLs6Rb7NgpetZ7DFq8Wv/Thv2pmbDvWCLWg=; b=kNpZMxvyKZBGsOLfhXwoN0w+PE44GZ4ing0Lrv4PyBnBs0QSx1QCtnnI/W+knY2vn3R4WprnkMUYl17kjTCOXfJC9dalkkjoMLhGZURRrTgxXnT8LeeoUoFDQjYnlUbdDV0waun8zEi9OB/GIgsesFBAh0h/H+NUJn2B9bQW2kuKrUInf8QXGy4QfipsoaZ4FM28QjiMqYmgEPe6CAz1Xgnfa6lYYlK7UcQf8uocprkCXRgVf6k165iHs9Xwat6wloJA7Jev6yKI4HDmUmu09QKjzONOatbsE+U+qMIM70ZIapi2DneHiZFGEUu1UdDZxzj5yWfI2A9C1xDuLzkWZQ== 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=LPp3Ku4wLLs6Rb7NgpetZ7DFq8Wv/Thv2pmbDvWCLWg=; b=bbZlLERkkNHR/q1OKLtNoV5uUDMsYLnEmxEHnN+HjQ2WkK68GgQLw+gZRIE/W8n3wDLbX/SpjNP+zx7shzQV7M7GxDb8uju4WyXCV0krBlmDdpl98SFfuUZz25yCVt7EgNl52JeIxRjh+IWq+jEcrUqlf4xOAihB7JeojjLGazKZhjorHGw/44RSeqxtrS1sj5suBHO1Oe+UdOSlRKZs6v6Nvhc/5Ay3m/3paRZ33B5jmi327P4evRh5GNe7WxeBCvhfcVAgZDEGd/iBOjf0M3woKbdXsqvl8tEHiH8Z4hTNzvvnhhL7QG/5515MzpHeojx4yiJF3Jw3wo9exkYpxA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=mt.com; Received: from VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) by AS8PR03MB7383.eurprd03.prod.outlook.com (2603:10a6:20b:2ef::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Tue, 4 Mar 2025 10:38:24 +0000 Received: from VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd]) by VI0PR03MB10400.eurprd03.prod.outlook.com ([fe80::48f6:ae9a:fcdf:b5bd%6]) with mapi id 15.20.8489.025; Tue, 4 Mar 2025 10:38:24 +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 v2 6/7] media: mt9m114: Fix deadlock in get_frame_interval/set_frame_interval Date: Tue, 4 Mar 2025 11:36:46 +0100 Message-Id: <20250304103647.34235-7-mathis.foerst@mt.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250304103647.34235-1-mathis.foerst@mt.com> References: <20250304103647.34235-1-mathis.foerst@mt.com> X-ClientProxiedBy: ZRAP278CA0017.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::27) To VI0PR03MB10400.eurprd03.prod.outlook.com (2603:10a6:800:203::15) 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: VI0PR03MB10400:EE_|AS8PR03MB7383:EE_ X-MS-Office365-Filtering-Correlation-Id: f6e76e75-fa1e-4b7f-3409-08dd5b08b0d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|7416014|52116014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: Xx5PhBadahZN/1pYynIS3Yq57CmORWCQuN26eH5Hb2VP5FF0SSNM6+DoYQqiV2WfE+SIGiC1ALGFqR6D23a7EErDw/mvE6Z1LUm66JTwjtZxGWP58ceXhBbyLQxYeura/7lcolnIA3OtaJBNBcyRN3ekYaHgKi2LH68Ym1ITW3FA5TaI28NyWhbK208ziSF587wBH54DmuveUEcwSjQZAaYbmK4Fe0BRG3WV7wVMZfG+jorRrIBfPkVUT7C6EMrzeccdl1YOag0dAiPDxjBOdWugyPmnQqjNg1lGekSvNBuR28rEf55xiUSeIZTk/6tLsjXOS2fe1D+Pgfx/gykt57NH+noaNwlO3/STJk2UbNLhk57gVh6Mjy2JY7jvaWqnimjF5wOjp79Cln/RwbgfHMHqPSr976y1G0jU4srv3PGwZKgggKcXWjg5bQY/ZSYafh2J8NLxr44VmqbRgEYCGmN8ruVepq4UQOSpe7pZyoEfOHZ0/2kouwxbZVFODLmGTRWFqE3UlVWLCtJMo3bbYIyHDMeVBDj5dLVhZU50rlcTk21f4GvjkgbelS935NbWMbNdPjIcGPem9TwDofyc81XhEAb9Jflu+vX0mr51LVf5hPE5eoWBn6NmTrWbCBFV8i/cOWzWoM2I4HPw6ktZj+PhlRlh4cP47GFAr6X2Hz7/0akmmgNB1hv3M74TYlc8O3KAZdaIWuQXo0PVXpeTAOnNX/L25qMjtd9yti/WdvCRhKBkmhh8xejgbSpVHGPaCZwQ4E7TNI6veD2OaZ5rH4Nj/81Co6SSfSa6NH6SnK22P9T8j+6THn6l+QqvdtJm9qPm36c8FDml6qCTKjLrXmCCz1gUjveThABy68T7PH7etgq5kL7aKdVK0Z6d5C5r26HuIFhTKA2huUlr9EktFroYvURN2hv1w+u08YaIHXjzgALl3Pt9MDmRBSHdwY1Y1oFw1WrFsjZJK4hD5m4to85QUprXeh1xZ96qXffC0kzFPeuBlp76MLL//93w6ORqvPmC3qW7IPn+Vk/ha1CkOVJpMRSICSbjJtTI5CnyYJkFvSJ2OpPnZh0KlxjSGsjonu9d/Nc6STlTaGdAL25kX6uDJFZaLf0Saqv/ncVglsT3QK95sQBNpOf+hrVpmiLC0ek5A85lZk4Er5mNR11orNTyF4yz3CSqlDww8w4kvLuV9jB1w02mzAQ3QHzGyHfjIhg5tLcC0XZNbB3nEvss+NeGh45iOl3yvIb3FMps10IPi2Zar3340MKgsORLoOf/6VmtrgqPh79E0c98XwJnxUbH6VON9vKCaIWyIOPDr+3SuHELivR7v1aLVf8bqFenI1DR7JlYqmQqPgpGDsam2alLSyJ7VKZkQmmWyGH+IrpxZw+PwMbjyWS4moTDT9PNDTQ24GqTS9NPb82409j0TAZR1cP3GSJGaqKdr6BU14qUnRDNmAdiKUsUZgkuxmIm X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI0PR03MB10400.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(7416014)(52116014)(366016)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k7WT5nZM9PadXctMtbKwVfpTtlWagJKb2M1Y4dRDyLveYDypsPMAcVKtssir0dJjfD9v3bPcTKPpioyiF8mJFTKpV9PSNdziBxPu0LXViXLkH6XiQZDJ4sY95vmVBrLk0lJzjZdohsB5Da4nztTIQDSL+c1d2L3lYUKYIsCezb3Dut4exjDS6+7qJDOMTZ2ctIOaP0X5ZpbJ4pGtV94pYfCHuel4dj82FReHnjSOIU/Ao1P+fXI45GJYDbU7nNqNYd6yOSlSQpoDt0VkORtgI/ir4rfQKzGpSoCfZttqKZX97p1/25QY4gnzGwtAub97oPEXRRmTXNPKCTymICrzvDUjgnYsf8jdbIVbJ9lZzy6ouBGfNpRZB+SjH4BYabHtFbYbpiE00taMEIdrFwdG4ZLanMZRoTIlHeBbjh+5NJuuGECJld1EITtI5dJDREFgWC8Xh224sgvUNIL3fAECuEDzXca7cEfOi9suL9IOcZo4nBMiNgD2qhvrFONesjbtPkV9G2psQK3dUwsFx8GK/eXked2nN9P6/gjD1D30RIgmA5FT8prPUJJdVrWZ9rpbKM21ZmDKD2UF/ILeudx+DkUGcOg5tiDnZf0lKcRwgTYR9pVJI+bDVVBA3s0hEALa11pp5RIkoKtp6Dt3+x4l98l0mpURjQmuAFPpHHNUp9MbnfVe7aEJ0OYw0vSCZvy8LEA+g+D10vQ6aUsE0W+csHRsa5iHuRNCJ12MNs+k9DwogCBARjSXB2jYal4Vwpon9PleFitALMVioPKl3sD2e0O4N4oACeD/9wkEFUWNBzo//axC4AFa+mwhF1GzMX4GyHanDYx7xQBxsss4KOLZJ0HFwpYCQwv+nltegSIRucfbLAvOQDQEEwErQB0DdrllgA12wqNT+ypr0f7u9AJwaqciMdfc+XhfFkw7tFvbXJqFc/ygI/LOiIYVk0fe9SUXN/5327kee0f+yDP9uPv0qYe98wMzvAgPPYFKhJPB7OxIBXuTtoCQ8O5bFwKIeDGQ78Vw5jY7ngehsf8GvAaYkSy8wbivAGHbyzZiM5o0ML04szmBQz9uPGWp3hr+hPmj+9P/wAwUfbb2GDmzlSYZiHl1J6ccpvgWBAt4ZEQhCco2f/W4+YJ/9ealXhNvfVCFqQ/xbvVg8445VGeVNZxRCedA/DAKs9xG410nTwDen7f3+IfhxuZUeK0f2RHa+z0FmEFC2H0bUieOqQ2N+9tQI4kdUw4HVaEhczszq6YJbqJI8dNSCVfhx6Ll+RgwzL5bHChAKcTCG34NKga8xOhfisCNHxM6Yqc+K2HKE+FdW5zelF7BbVc5Hxz6uF7jp4Q9W2kWHZI40anAWvKRyE4eWM6nNsFJpW4bqI5nX5v0MHUoiwu1A0Baw2CpvThge+8nOEEEqVZYyYAInJlLGCBy+FgVYXu7ZUrD/epZixsP0TupoiYZHRUiuE3xuY1jQt4bJi2shEVwuTR7Re1/6mG1HR1RmtyRWTx1TaYigeniWvnc8gZ97VR1Os9qDmFYHxCQXckqPnpXrj21XmZhX83McfNN2zbxmaxbip6DdNSt02+yinSAqr3LasTYNR3U7907 X-OriginatorOrg: mt.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6e76e75-fa1e-4b7f-3409-08dd5b08b0d5 X-MS-Exchange-CrossTenant-AuthSource: VI0PR03MB10400.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2025 10:38:24.2668 (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: MrvawWm3h0R+6fChdENQqxajbDA2+jg2c0lOM9Llbw/me0/xbIibv3KRpK1hzXFEbib3xOB8pnbAec1UlRnmDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB7383 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 18419de6491d..9ab1147a9aaf 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; }