From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 67A904DAF82 for ; Thu, 17 Sep 2026 11:39:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789645184; cv=none; b=dMMs1NbCSZojZhUoGu/0Qw/kJ0LMtBlPTqoUf98y+vAcf4CKG0mCh4mGElf474PQ7qmNRtTuttR6ywEngl06J1QLoQs9/XcKcpqKuaV8l17N/CXeP1CJ2l3M7aXryfpu0vFnDHzk6K2uMLfofRKSsBwARh6bPCIfUQvTydAiQXk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789645184; c=relaxed/simple; bh=ZBc74N57Ra7Mdbx5Z0Noqj8xfQ2T+MfYl59qhpIWKtM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t8K+0172gDbOW0NDLPBuKzxQRsP64n/R9W5M62U/qyuzZqYIGi6ctPeC/S1/st1q6wDNBsa9BHJF3ecSBxxeY+/jtrtTmO3A0l2OwhKvuFKv88AAwwM00awdPc7PUUytE3lth6uzpM9R8WekrqAZ4/TmcaVt/9EpmPoRJf1aCSE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ApsN92he; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass 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="ApsN92he" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789645182; x=1821181182; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZBc74N57Ra7Mdbx5Z0Noqj8xfQ2T+MfYl59qhpIWKtM=; b=ApsN92hebPhzgXLV2so/UPua4vKFJX5eCt3SI/vSKhO9MBlMhe3n5koB 3cs0nukNBqG5Tn62cHxpAnkTZocYHdqHFpUkAhVGXoMbPv8URdvIWby0s rEXrHvMgNEi3tvR4MYAZXYD+wUp/ykHbFOujG4/rez+FWIWe/V68OnUtM unqBiEqeOHmK7I3OlDV2qAYv/YrTMrJBDqQp4Rpuka2M06h8qRGPx8uj8 S7Ls6NfC594g0FAI9+E2hZP48cgSk2guqleI4ps8lelb3zSkS3Y2r0nbk ib4rQeffJgr593qzrVQmUOehFL9oycGoR80JLYofOILpX2sYrxIzumzrN Q==; X-CSE-ConnectionGUID: mZaSuh9sQQq5zCYCp1eMWw== X-CSE-MsgGUID: pRAup457Qo284XCuv8Kx5A== X-IronPort-AV: E=McAfee;i="6800,10657,11905"; a="77622378" X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="77622378" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2026 04:39:35 -0700 X-CSE-ConnectionGUID: BCGGlrWcQr6lvbr2f67hTQ== X-CSE-MsgGUID: 4YSD1n1qReWQnAR0aOXyZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,103,1787036400"; d="scan'208";a="271097348" Received: from alekseim-mobl.ger.corp.intel.com (HELO kekkonen.fi.intel.com) ([10.245.245.32]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2026 04:39:33 -0700 Received: from punajuuri.localdomain (unknown [192.168.240.130]) by kekkonen.fi.intel.com (Postfix) with ESMTP id D86B1121C73; Thu, 17 Sep 2026 14:39:24 +0300 (EEST) Received: from sailus by punajuuri.localdomain with local (Exim 4.98.2) (envelope-from ) id 1x7ASa-00000000FMu-0B62; Thu, 17 Sep 2026 14:39:24 +0300 Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo From: Sakari Ailus To: linux-media@vger.kernel.org Cc: "Yan, Dongcheng" , Mehdi Djait , "Yu, Ong Hock" , "Ng, Khai Wen" , Antti Laakso , "Bajpai, Manik" , Divyamani Tripathi Subject: [PATCH v2 06/21] media: ipu6: Clean up link frequency calculation Date: Thu, 17 Sep 2026 14:39:08 +0300 Message-ID: <20260917113923.59004-7-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260917113923.59004-1-sakari.ailus@linux.intel.com> References: <20260917113923.59004-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 Content-Transfer-Encoding: 8bit Handle link_freq <= as a special case and continue calculating the pixel rate otherwise. Signed-off-by: Sakari Ailus --- .../media/pci/intel/ipu6/ipu6-isys-video.c | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c index 781fc0e88417..3d455872f29a 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-video.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-video.c @@ -648,12 +648,9 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av, struct ipu6_isys_csi2 *csi2 = NULL; struct isys_iwake_watermark *iwake_watermark = &isys->iwake_watermark; struct device *dev = &isys->adev->auxdev.dev; - struct v4l2_mbus_framefmt format; struct v4l2_subdev *esd; struct v4l2_control hb = { .id = V4L2_CID_HBLANK, .value = 0 }; - unsigned int bpp, lanes; - s64 link_freq = 0; - u64 pixel_rate = 0; + s64 link_freq; int ret; esd = media_entity_to_v4l2_subdev(source); @@ -671,28 +668,26 @@ void ipu6_isys_configure_stream_watermark(struct ipu6_isys_video *av, csi2 = ipu6_isys_subdev_to_csi2(av->stream->asd); link_freq = ipu6_isys_csi2_get_link_freq(csi2); - if (link_freq > 0) { - struct v4l2_subdev_state *state = - v4l2_subdev_lock_and_get_active_state(&csi2->asd.sd); - - lanes = csi2->nlanes; - format = *v4l2_subdev_state_get_format(state, 0, - av->source_stream); - bpp = ipu6_isys_mbus_code_to_bpp(format.code); - pixel_rate = mul_u64_u32_div(link_freq, lanes * 2, bpp); - - v4l2_subdev_unlock_state(state); - } - - av->watermark.pixel_rate = pixel_rate; - - if (!pixel_rate) { + if (link_freq <= 0) { mutex_lock(&iwake_watermark->mutex); iwake_watermark->force_iwake_disable = true; mutex_unlock(&iwake_watermark->mutex); - dev_warn(dev, "unexpected pixel_rate from %s, disable iwake.\n", + dev_warn(dev, "unexpected link_freq from %s, disable iwake\n", source->name); + return; } + + struct v4l2_subdev_state *state; + struct v4l2_mbus_framefmt *format; + unsigned int bpp; + + state = v4l2_subdev_lock_and_get_active_state(&csi2->asd.sd); + format = v4l2_subdev_state_get_format(state, 0, av->source_stream); + bpp = ipu6_isys_mbus_code_to_bpp(format->code); + v4l2_subdev_unlock_state(state); + + av->watermark.pixel_rate = mul_u64_u32_div(link_freq, csi2->nlanes * 2, + bpp); } static void calculate_stream_datarate(struct ipu6_isys_video *av) -- 2.47.3