From patchwork Thu May 16 07:05:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 797423 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 C56301EEE4 for ; Thu, 16 May 2024 07:05:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843116; cv=none; b=e5UW4JFXkjHemHQQ+SrQvMXWB5uXekwaitOwLqpa2Tun2Gon/+S7gFlm0q1DxuWv++RciCpznOMTf4tRIJ48091ei+HcihDqSBRXzwGUuU4N2H4jTa7+Ec4ehQJ3EhMZpQ4RLUZAn5X1JBQxbiXS52a50CFWKHz9mxe1WuQXx54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843116; c=relaxed/simple; bh=W0XGiz1c0tLAo+pGxy/ebYTSLuQuIx50nx7Jek8QKhg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Op3+NaQ5AFzXUbzZ2zjyIOA8F+KrUqx5G4DXzbknqMAG94xZ22M7aVlaMfrtA1/QQKrDwW0byJu/OpD6ZdlrU+IH8+HLS/CZhXx5uRYUPUR2oogAhU82/sCb0ZcSI3K5/IMJxgNoTe3XEbwe2QNO7trU+Kk4XA1y0xeA81wCMnE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=JTP4Xg8y; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="JTP4Xg8y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715843114; x=1747379114; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W0XGiz1c0tLAo+pGxy/ebYTSLuQuIx50nx7Jek8QKhg=; b=JTP4Xg8yGgGG50WTSXMqo5ZJ3lNu19Duf9JM+sh/lmxDmySqU1yZTyML Cx4H9jgEN38l5KzDFSKmu1LsDBO/3HYlygEtCcgb/Q0XFpFKARsrajeEW pE3y+pAUUVyhpYf0J40Ujdx8VACV6hpkHX4h0xXAv7U84wfaktUa7on6a 8vp784PAr+YvKKdf1TcIssJoqeWp02Bcc49O/ajFuzF3M3ALTiJTILfpH tKZD2KVDSQDyvMLgsJolIkdm41ysTLh6GKZyyTgY9LTOQpdJziqDWY1NI 0fqc0/H0rpkkXNPC+JGThfLpP0L3GuPAjojRqoDVfCxyY3VrT/6Hb3YRP g==; X-CSE-ConnectionGUID: WihJcuHvSMWyV3wfceTPHQ== X-CSE-MsgGUID: /27vhu3+SV6RxVqppQgrpw== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="12113626" X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="12113626" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:13 -0700 X-CSE-ConnectionGUID: 9SONwIGESzutcQ+/zf0Fkg== X-CSE-MsgGUID: jJIPl8kET4ugviZ51f+8AQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="31894932" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:12 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 8E0AE12027E; Thu, 16 May 2024 10:05:08 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Jacopo Mondi , hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, Wentong Wu Subject: [PATCH v5 1/4] media: v4l: Support passing media pad argument to v4l2_get_link_freq() Date: Thu, 16 May 2024 10:05:04 +0300 Message-Id: <20240516070507.21735-2-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516070507.21735-1-sakari.ailus@linux.intel.com> References: <20240516070507.21735-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 v4l2_get_link_freq() accepts a V4L2 control handler for now, but it needs to take struct media_pad argument in order to obtain the link frequency using get_mbus_config() pad op. Prepare for this by allowing struct media_pad as well. Signed-off-by: Sakari Ailus --- drivers/media/v4l2-core/v4l2-common.c | 19 ++++++++++++++++--- include/media/v4l2-common.h | 14 +++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 4165c815faef..7f69b5a025fa 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -464,8 +464,8 @@ int v4l2_fill_pixfmt(struct v4l2_pix_format *pixfmt, u32 pixelformat, } EXPORT_SYMBOL_GPL(v4l2_fill_pixfmt); -s64 v4l2_get_link_freq(struct v4l2_ctrl_handler *handler, unsigned int mul, - unsigned int div) +s64 __v4l2_get_link_freq_ctrl(struct v4l2_ctrl_handler *handler, + unsigned int mul, unsigned int div) { struct v4l2_ctrl *ctrl; s64 freq; @@ -500,7 +500,20 @@ s64 v4l2_get_link_freq(struct v4l2_ctrl_handler *handler, unsigned int mul, return freq > 0 ? freq : -EINVAL; } -EXPORT_SYMBOL_GPL(v4l2_get_link_freq); +EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_ctrl); + +s64 __v4l2_get_link_freq_pad(struct media_pad *pad, unsigned int mul, + unsigned int div) +{ + struct v4l2_subdev *sd; + + sd = media_entity_to_v4l2_subdev(pad->entity); + if (!sd) + return -ENODEV; + + return __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div); +} +EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_pad); /* * Simplify a fraction using a simple continued fraction decomposition. The diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 63ad36f04f72..d7115cd61a38 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h @@ -525,7 +525,8 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, u32 pixelformat, /** * v4l2_get_link_freq - Get link rate from transmitter * - * @handler: The transmitter's control handler + * @pad: The transmitter's media pad (or control handler for compatibility + * reasons, don't use in new code) * @mul: The multiplier between pixel rate and link frequency. Bits per pixel on * D-PHY, samples per clock on parallel. 0 otherwise. * @div: The divisor between pixel rate and link frequency. Number of data lanes @@ -541,8 +542,15 @@ int v4l2_fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, u32 pixelformat, * * %-ENOENT: Link frequency or pixel rate control not found * * %-EINVAL: Invalid link frequency value */ -s64 v4l2_get_link_freq(struct v4l2_ctrl_handler *handler, unsigned int mul, - unsigned int div); +#define v4l2_get_link_freq(pad, mul, div) \ + _Generic(pad, \ + struct media_pad *: __v4l2_get_link_freq_pad, \ + struct v4l2_ctrl_handler *: __v4l2_get_link_freq_ctrl) \ + (pad, mul, div) +s64 __v4l2_get_link_freq_pad(struct media_pad *pad, unsigned int mul, + unsigned int div); +s64 __v4l2_get_link_freq_ctrl(struct v4l2_ctrl_handler *handler, + unsigned int mul, unsigned int div); void v4l2_simplify_fraction(u32 *numerator, u32 *denominator, unsigned int n_terms, unsigned int threshold); From patchwork Thu May 16 07:05:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 797615 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 7A9282744D for ; Thu, 16 May 2024 07:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843116; cv=none; b=XltMKG/ac21Wdbo5/Gyt/v/nM0Chk+R9mv0Fa/pF8mOVHi/ZYbhY+jRBCdq6fCzgujgiBCwH7BhbG1F2BI3V5bFzfrJyfrzGTh9ixp3LhUtb38P/ghuvDPORi8l9Pi+zGHUQOWKpmfOBYK4AHJHdz2ayr8Mg/pUaKazs3UHCCgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843116; c=relaxed/simple; bh=BqH16ScMRMp5QwVlD5CnmByrmX68VJ6U9ftQMkIKvMY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DxoAIxHyQqwa5GO2rS8bEoo/LodOxrE9YmiT6CN0xSUnNom2ZzaZwIwiRUjvb7zjVMAw2BGHhCyrqaXVVvbVcQ07DGsjWlshbMnlBAzA3+9569NkqbREJTyzSpHANHzkPRx2L8BWBngMZ6JJVYa2LNJtjyawCabOPG+Ej3nMUWs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Vz5k0/AM; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Vz5k0/AM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715843115; x=1747379115; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BqH16ScMRMp5QwVlD5CnmByrmX68VJ6U9ftQMkIKvMY=; b=Vz5k0/AMwzcwsi3z5+//ePiifJgQf1fBiURHIkmtznIWJNVeIZGYZVWF 5m2bRoiUDiWJ+Ru0hBBLaUxoGux9hcnxfBVsXXh4cy3SUG5vrTCGYYUJ6 +bXxI6Xd7sJzVxfSOvl5edwIRrGqFTDCV3aebr/52mGEBG5kX63lxlqhg snf1AMxvA9u7QlzZPPTu0ayzIFyKK8Fn40bJmQ9t/NUF9pw2/GJfgs5Vo yib2bGCGeUQmhI561r2IkQptGHTquWhITuKQodFYKJ0ZppOzxqXo/f+9G HtzV0Ua0i3q6wqVAiLWLUmweBkGYic8Eu0s33VuT6gZjLtJGQ53PbsrSO w==; X-CSE-ConnectionGUID: CHqltZReR5m7PSuC2Ep1Gg== X-CSE-MsgGUID: tNCISi5FTlifCJHjTu9W4A== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="12113631" X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="12113631" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:13 -0700 X-CSE-ConnectionGUID: WNVDeG3RTv2jlb6k722C/Q== X-CSE-MsgGUID: pvjdaVOTTPiE7YBZTpyc2Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="31894936" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:13 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 698E7120358; Thu, 16 May 2024 10:05:09 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Jacopo Mondi , hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, Wentong Wu Subject: [PATCH v5 2/4] media: v4l: Support obtaining link frequency via get_mbus_config Date: Thu, 16 May 2024 10:05:05 +0300 Message-Id: <20240516070507.21735-3-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516070507.21735-1-sakari.ailus@linux.intel.com> References: <20240516070507.21735-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add link_freq field to struct v4l2_mbus_config in order to pass the link frequency to the receiving sub-device. Signed-off-by: Sakari Ailus --- drivers/media/v4l2-core/v4l2-common.c | 11 ++++++++--- include/media/v4l2-mediabus.h | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c index 7f69b5a025fa..76848cf2c260 100644 --- a/drivers/media/v4l2-core/v4l2-common.c +++ b/drivers/media/v4l2-core/v4l2-common.c @@ -505,13 +505,18 @@ EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_ctrl); s64 __v4l2_get_link_freq_pad(struct media_pad *pad, unsigned int mul, unsigned int div) { + struct v4l2_mbus_config mbus_config = {}; struct v4l2_subdev *sd; + int ret; sd = media_entity_to_v4l2_subdev(pad->entity); - if (!sd) - return -ENODEV; + ret = v4l2_subdev_call(sd, pad, get_mbus_config, pad->index, + &mbus_config); + if (ret < 0 && ret != -ENOIOCTLCMD) + return ret; - return __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div); + return mbus_config.link_freq ?: + __v4l2_get_link_freq_ctrl(sd->ctrl_handler, mul, div); } EXPORT_SYMBOL_GPL(__v4l2_get_link_freq_pad); diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index 5bce6e423e94..cc5f776dc662 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h @@ -148,6 +148,7 @@ enum v4l2_mbus_type { /** * struct v4l2_mbus_config - media bus configuration * @type: interface type + * @link_freq: The link frequency. See also V4L2_CID_LINK_FREQ control. * @bus: bus configuration data structure * @bus.parallel: embedded &struct v4l2_mbus_config_parallel. * Used if the bus is parallel or BT.656. @@ -162,6 +163,7 @@ enum v4l2_mbus_type { */ struct v4l2_mbus_config { enum v4l2_mbus_type type; + u64 link_freq; union { struct v4l2_mbus_config_parallel parallel; struct v4l2_mbus_config_mipi_csi1 mipi_csi1; From patchwork Thu May 16 07:05:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 797422 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 E8B5929D08 for ; Thu, 16 May 2024 07:05:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843117; cv=none; b=TyAQpitnL6q4o/qv/EKDetikJ1AoiiLfbJymL86z27QNlIBAKuaWgW1RR2fR779oVXrlvTmCW4zhamMIRWtCgwLN/dkNdHvHGb985X8XLd6/1K9uwrV+95DDncYMvGOOCnKkquW2gBKwPA/RtmLzD4w/1O/WSTtW+USQmzC871o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843117; c=relaxed/simple; bh=Ju6xGaKV78HqFmzw9VxE/wG8MX2cO5OMSEQGa+MWeh8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G3Fi/Gu9GsCqBVzzIIM9vU0rAMOvLcGMVb1N9Pr3UWPNjWCVAsAeowh8JUX0FB4hqOHl46J1FumHGToJD1ymYTOoTWYIZmVgRu3bVCp+x8SOfIkBl59MTV8WZQ35k+mbwQtB+yWbXqt++kK4wKdmTftGjhkWsUJKdaddpg/05v4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=UjBShEQd; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UjBShEQd" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715843116; x=1747379116; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ju6xGaKV78HqFmzw9VxE/wG8MX2cO5OMSEQGa+MWeh8=; b=UjBShEQd4Q4MiC1IbrYDJbMXcOVEgkKbg1L0ii7odtPHp+Ve/OGIoQ+7 Z77/DXmwp7B84pD2bGX8vnVODi3wlWLv1r8oC0TZOLQEd9e50NPmvVsmZ 8ZgN8E3xCOrnZOu7spYp9xxtblClaccERLPWFxyocc6SO+bLSaEkSec/W NXGwdFbgn5WAqsCFF7TOR1reapVHPlnX1q12GdvEcbVCiEk6aZKLggNnx cP0uIQnH+eCX0lvClVP0A7dmW1x1LUq2DXlh6gfmRmfMDJvbEnnU0sGfY Za8uKaTpki/bi+UsQdvwSBeKqkL0SYoJYEtjGhzc4rURCrVMuwkCEW9fU g==; X-CSE-ConnectionGUID: ltgpC/0nS/uEnxtIZ/5hig== X-CSE-MsgGUID: ZgCecwoFQUGK5xMDJB7KTw== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="12113635" X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="12113635" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:14 -0700 X-CSE-ConnectionGUID: Gq5J/oWeRdSNaJVr57opCw== X-CSE-MsgGUID: y9eXvTMlQLatTGyuqohZ2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="31894938" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:13 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id 46BD5120455; Thu, 16 May 2024 10:05:10 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Jacopo Mondi , hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, Wentong Wu Subject: [PATCH v5 3/4] media: Documentation: Update link frequency driver documentation Date: Thu, 16 May 2024 10:05:06 +0300 Message-Id: <20240516070507.21735-4-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516070507.21735-1-sakari.ailus@linux.intel.com> References: <20240516070507.21735-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add the get_mbus_config() as the means for conveying the link frequency towards the receiver drivers. Signed-off-by: Sakari Ailus --- Documentation/driver-api/media/tx-rx.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/driver-api/media/tx-rx.rst b/Documentation/driver-api/media/tx-rx.rst index 29d66a47b56e..eaf3d597fa1d 100644 --- a/Documentation/driver-api/media/tx-rx.rst +++ b/Documentation/driver-api/media/tx-rx.rst @@ -49,6 +49,10 @@ Link frequency The :ref:`V4L2_CID_LINK_FREQ ` control is used to tell the receiver the frequency of the bus (i.e. it is not the same as the symbol rate). +On devices where the link frequency isn't configurable, the link_freq field of +struct v4l2_mbus_config is recommended over controls for conveying the link +frequency to the downstream driver in the pipeline. + ``.s_stream()`` callback ^^^^^^^^^^^^^^^^^^^^^^^^ From patchwork Thu May 16 07:05:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 797614 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.15]) (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 63DD52C1B6 for ; Thu, 16 May 2024 07:05:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843117; cv=none; b=frYS/9yFEcO9UvC8Y6wwAjT42yknHnl2fA6ED/+qgjBSd+oEQ49i84eFTFOduRt5Jqa6tSSSU0EHPa58KPknM2rze4WK9OL8oseN+iSkfKzT9zx1uYJ1mbk4Sl3UW6D2U/MjaBVtRYnbdQIYOj9TKpkAK+glTJP+4y6FryCWtVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715843117; c=relaxed/simple; bh=hcn/dK50gEK/5NTqbgKwv0j7YOdfsDhvTka+TY7vCjY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dibOlMxx4gtJSyC6m7Et09MFwU7VHsTX+NZQCMty9DfI1MJxtPL5t/SKsfZ0anDx4ETPgywHJsVI3BHPgRoQyzz5y19A9JQWYbvdBGTlC4CGbbS34MP3LB6fOgJC1w8Cbr7nZVHyw0S3nLKlnalmAsJXQ4CbrAdqWNCOYQV/7DI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=gR+3rDKL; arc=none smtp.client-ip=192.198.163.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gR+3rDKL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715843116; x=1747379116; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hcn/dK50gEK/5NTqbgKwv0j7YOdfsDhvTka+TY7vCjY=; b=gR+3rDKL3Vj/Q99NTgiNUyPC/jOqwu2Wg1QybrKzc3jbtAFVUScC5fbv 1+XugJvEXNSEffFBQD2nYuy29bNIzBSxYvoNzTOWQvksBUiFts4Kr+glx 9Xiymraxvn5zdY0u7TKjpUuYM9GfI2MMjcNdN48ocfBrxCD3S8gtfgDtV N2l2MoSQvaCdzwvXWPwlzg5nkt3Nfqs+FraXbFpxeT27LtrjZiUbTNr3O KepnIFA7OUmlk1MNcgiE5s6VCrNq1iPeX27iZS9vNKWB4L0WLRduOYzMN qKw5OsALd2zyuubGzmdWypTEn9rD4VxW/RuAHgOIIQOQMOGhNjG/MewGI w==; X-CSE-ConnectionGUID: wtnSaqLUTVGIwenOfBWP/g== X-CSE-MsgGUID: dCmKnxq8TAuIJxPcZxpodg== X-IronPort-AV: E=McAfee;i="6600,9927,11074"; a="12113641" X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="12113641" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:15 -0700 X-CSE-ConnectionGUID: mP0c4VSwSXGcY/4RItUnAw== X-CSE-MsgGUID: jK7NDR6CRi20za8cB9t42Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,163,1712646000"; d="scan'208";a="31894941" Received: from turnipsi.fi.intel.com (HELO kekkonen.fi.intel.com) ([10.237.72.44]) by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2024 00:05:14 -0700 Received: from svinhufvud.ger.corp.intel.com (localhost [IPv6:::1]) by kekkonen.fi.intel.com (Postfix) with ESMTP id ECC681204F8; Thu, 16 May 2024 10:05:10 +0300 (EEST) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: Jacopo Mondi , hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, Wentong Wu Subject: [PATCH v5 4/4] media: ivsc: csi: Obtain link frequency from the media pad Date: Thu, 16 May 2024 10:05:07 +0300 Message-Id: <20240516070507.21735-5-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240516070507.21735-1-sakari.ailus@linux.intel.com> References: <20240516070507.21735-1-sakari.ailus@linux.intel.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Support the use of the media pad for obtaining the link frequency. Similarly, call the v4l2_get_link_freq() on the media pad, not on the remote's control handler. Signed-off-by: Sakari Ailus --- drivers/media/pci/intel/ivsc/mei_csi.c | 72 +++++++++----------------- 1 file changed, 25 insertions(+), 47 deletions(-) diff --git a/drivers/media/pci/intel/ivsc/mei_csi.c b/drivers/media/pci/intel/ivsc/mei_csi.c index 89b582a221ab..621a6ee32e01 100644 --- a/drivers/media/pci/intel/ivsc/mei_csi.c +++ b/drivers/media/pci/intel/ivsc/mei_csi.c @@ -35,8 +35,6 @@ #define MEI_CSI_ENTITY_NAME "Intel IVSC CSI" -#define MEI_CSI_LINK_FREQ_400MHZ 400000000ULL - /* the 5s used here is based on experiment */ #define CSI_CMD_TIMEOUT (5 * HZ) /* to setup CSI-2 link an extra delay needed and determined experimentally */ @@ -121,12 +119,11 @@ struct mei_csi { struct mutex lock; struct v4l2_subdev subdev; - struct v4l2_subdev *remote; + struct media_pad *remote; struct v4l2_async_notifier notifier; struct v4l2_ctrl_handler ctrl_handler; struct v4l2_ctrl *freq_ctrl; struct v4l2_ctrl *privacy_ctrl; - unsigned int remote_pad; /* start streaming or not */ int streaming; @@ -148,10 +145,6 @@ static const struct v4l2_mbus_framefmt mei_csi_format_mbus_default = { .field = V4L2_FIELD_NONE, }; -static s64 link_freq_menu_items[] = { - MEI_CSI_LINK_FREQ_400MHZ -}; - static inline struct mei_csi *notifier_to_csi(struct v4l2_async_notifier *n) { return container_of(n, struct mei_csi, notifier); @@ -284,11 +277,13 @@ static void mei_csi_rx(struct mei_cl_device *cldev) static int mei_csi_set_stream(struct v4l2_subdev *sd, int enable) { struct mei_csi *csi = sd_to_csi(sd); + struct v4l2_subdev *remote_sd = + media_entity_to_v4l2_subdev(csi->remote->entity); s64 freq; int ret; if (enable && csi->streaming == 0) { - freq = v4l2_get_link_freq(csi->remote->ctrl_handler, 0, 0); + freq = v4l2_get_link_freq(csi->remote, 0, 0); if (freq < 0) { dev_err(&csi->cldev->dev, "error %lld, invalid link_freq\n", freq); @@ -307,11 +302,11 @@ static int mei_csi_set_stream(struct v4l2_subdev *sd, int enable) if (ret < 0) goto err_switch; - ret = v4l2_subdev_call(csi->remote, video, s_stream, 1); + ret = v4l2_subdev_call(remote_sd, video, s_stream, 1); if (ret) goto err_switch; } else if (!enable && csi->streaming == 1) { - v4l2_subdev_call(csi->remote, video, s_stream, 0); + v4l2_subdev_call(remote_sd, video, s_stream, 0); /* switch CSI-2 link to IVSC */ ret = csi_set_link_owner(csi, CSI_LINK_IVSC); @@ -468,34 +463,29 @@ static int mei_csi_set_fmt(struct v4l2_subdev *sd, return 0; } -static int mei_csi_g_volatile_ctrl(struct v4l2_ctrl *ctrl) +static int mei_csi_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad, + struct v4l2_mbus_config *mbus_config) { - struct mei_csi *csi = ctrl_to_csi(ctrl); + struct mei_csi *csi = sd_to_csi(sd); + unsigned int i; s64 freq; - if (ctrl->id == V4L2_CID_LINK_FREQ) { - if (!csi->remote) - return -EINVAL; - - freq = v4l2_get_link_freq(csi->remote->ctrl_handler, 0, 0); - if (freq < 0) { - dev_err(&csi->cldev->dev, - "error %lld, invalid link_freq\n", freq); - return -EINVAL; - } - - link_freq_menu_items[0] = freq; - ctrl->val = 0; + mbus_config->type = V4L2_MBUS_CSI2_DPHY; + for (i = 0; i < V4L2_MBUS_CSI2_MAX_DATA_LANES; i++) + mbus_config->bus.mipi_csi2.data_lanes[i] = i + 1; + mbus_config->bus.mipi_csi2.num_data_lanes = csi->nr_of_lanes; - return 0; + freq = v4l2_get_link_freq(csi->remote, 0, 0); + if (freq < 0) { + dev_err(&csi->cldev->dev, + "error %lld, invalid link_freq\n", freq); + return -EINVAL; } - return -EINVAL; -} + mbus_config->link_freq = csi->link_freq = freq; -static const struct v4l2_ctrl_ops mei_csi_ctrl_ops = { - .g_volatile_ctrl = mei_csi_g_volatile_ctrl, -}; + return 0; +} static const struct v4l2_subdev_video_ops mei_csi_video_ops = { .s_stream = mei_csi_set_stream, @@ -504,6 +494,7 @@ static const struct v4l2_subdev_video_ops mei_csi_video_ops = { static const struct v4l2_subdev_pad_ops mei_csi_pad_ops = { .get_fmt = v4l2_subdev_get_fmt, .set_fmt = mei_csi_set_fmt, + .get_mbus_config = mei_csi_get_mbus_config, }; static const struct v4l2_subdev_ops mei_csi_subdev_ops = { @@ -531,8 +522,7 @@ static int mei_csi_notify_bound(struct v4l2_async_notifier *notifier, if (pad < 0) return pad; - csi->remote = subdev; - csi->remote_pad = pad; + csi->remote = &subdev->entity.pads[pad]; return media_create_pad_link(&subdev->entity, pad, &csi->subdev.entity, CSI_PAD_SINK, @@ -556,26 +546,14 @@ static const struct v4l2_async_notifier_operations mei_csi_notify_ops = { static int mei_csi_init_controls(struct mei_csi *csi) { - u32 max; int ret; - ret = v4l2_ctrl_handler_init(&csi->ctrl_handler, 2); + ret = v4l2_ctrl_handler_init(&csi->ctrl_handler, 1); if (ret) return ret; csi->ctrl_handler.lock = &csi->lock; - max = ARRAY_SIZE(link_freq_menu_items) - 1; - csi->freq_ctrl = v4l2_ctrl_new_int_menu(&csi->ctrl_handler, - &mei_csi_ctrl_ops, - V4L2_CID_LINK_FREQ, - max, - 0, - link_freq_menu_items); - if (csi->freq_ctrl) - csi->freq_ctrl->flags |= V4L2_CTRL_FLAG_READ_ONLY | - V4L2_CTRL_FLAG_VOLATILE; - csi->privacy_ctrl = v4l2_ctrl_new_std(&csi->ctrl_handler, NULL, V4L2_CID_PRIVACY, 0, 1, 1, 0); if (csi->privacy_ctrl)