From nobody Thu Oct 9 20:22:54 2025 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C09C5221F03 for ; Mon, 16 Jun 2025 15:29:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087763; cv=none; b=tpUaEUDs9QH2yvWPBLQPJEXsP2x7B/KfTF25aHMz0Qul9eK4tCclFw8YBVj6xPnsbMazBgOU25uAqeVyxkxUjuJ5NNiEBgoH9hVhBuVv8bG2+pDeXphd2rUgtTmFjN6M0RT214vK8AfGbmRZdRoEwPNkNM7/mIB6SLqCODjsVQY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087763; c=relaxed/simple; bh=pnwKaxykfNl41aVSJ0fgQXHFHUyk5NTEvR8PclHUs2U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qanDoqUqr3uyJnThzzYm3t2P9m4vZCJ7m5Re0LQIL6piJlN3Cj2bIgegbpSR0GhzQZFabAXifYQot2qVnKACJSL4dyeNk71z9pIxQrlYl4wSQsbdVNb69j9TnqI9J82ojtTKgScySpJ3YyXwIRA/Y1LmlzAvfLIqVAVLU2UKZC0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ZTNid2kG; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ZTNid2kG" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-32ac42bb4e4so41908451fa.0 for ; Mon, 16 Jun 2025 08:29:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087759; x=1750692559; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=kMUfpPv+dKOq5nGqXppL/8SlSmSo+MNRFt4xE51N1U0=; b=ZTNid2kG4zqcEvyUL/hWbtfy9fOiKHVrhvXPfsU//3Psk9cQ2Ktu+E82jwPaR9dk1k BIJxf+DQZlQfZp1hZA4XYE8iGMDHDsRhWMDXtO9d5faEPifYT70gP8b5yLyCtHZt3AfI pm/iMMu6/rimtmbd1oJ+D/brBEXyJlue94G1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087759; x=1750692559; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kMUfpPv+dKOq5nGqXppL/8SlSmSo+MNRFt4xE51N1U0=; b=APAMOATiWnlouRpMSfQKEL5LMcbH9PXguEawqi/t7c/nxNx0NRm0GYpYPYHpDsQlOu h3/AP/LNIyi2HvxCOk2oK8QClP2OLLvXO13jMCaqCPpSUM6tc5FFu/YW42dkBzeOCzKn VJrdc4yvFV+PIzW/VfwmjAbepJ9+9/qJ/vqfS/a+PVxSxAqKucZuhAYm5g8erEkRksy2 R6eYUUHxV2tyiTR3wfglsE7yZF+k/ejphwlHDXxwUhOWC37HjXTklRcYclmM27wRXu9l XUknOS5YqOu9rQfngQgw1qHbcWTh1CGs7TpP6ankgLkjDsUIY7RzIP7tlXP1r93fWyBh jwsQ== X-Forwarded-Encrypted: i=1; AJvYcCVXUvWHepb/7UU6BR7oWvsas6T9xeg10joC8rwSQEYpABhm6WgzMa/imXXpROOtGgTYKJqTp3pmpmpqap0=@vger.kernel.org X-Gm-Message-State: AOJu0YxgAtqiNEDL9Pvw7mwW0y9HO6EIxYkKiGM9UFfwjk3z8O6TuKXM I43uI02B83P2BIp0G+2+fSwtzCr5vV+FREM67GrirnkMW/SObvFbazRascZ7av3kMA== X-Gm-Gg: ASbGncvB/toXdS3UOiNb/TBfHjurY2hX7T6D7/FK7CrJ45GpGVSd1QULcyulI6156+O 8FuHsRtVAH6m7JMFqoYIBZIZ3D68impXY3FxcKqGJDPgv8NtvPlFsSjJ8B72aVJVRB1UrjWKRcO 3JxXgWcucCRRH9KcrVLtPa0nBq/MmyER/9fDUHyc9GxZhHi/TJl5j0S+8qIfGKGIVJEQPNUJs6q hF5ZYLZc/Wjz7lVOJ6WQK6wZhFcPWmkqvCkh4l3Vxmp7QOkWh87ozYxRpNrYZAD0vtxcKJnE1Co JgezHNP9gqbbu6OinNy5W6kIbwcfkUDtxsNY4W+veIYO0fTXLzj1h7/eR+CXqRiLs9xk3e25JbU hjXjstq7cgPDCS1cecy8ze3umcfn+8LUNeNvBHcvYog== X-Google-Smtp-Source: AGHT+IFD7e6mqRIDzO29wojSrb1K2/2adoVUhXjbM4ngtgXAPyANGqcX+Ed9wMyzJi7Yviy9nzQ6+Q== X-Received: by 2002:a05:6512:3b11:b0:553:2f33:ac0e with SMTP id 2adb3069b0e04-553b6f25d94mr2553688e87.41.1750087758806; Mon, 16 Jun 2025 08:29:18 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:18 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:14 +0000 Subject: [PATCH v7 1/5] media: venus: vdec: Clamp parm smaller than 1fps and bigger than 240. Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-test-v7-1-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Hans Verkuil X-Mailer: b4 0.14.2 The driver uses "whole" fps in all its calculations (e.g. in load_per_instance()). Those calculation expect an fps bigger than 1, and not big enough to overflow. Clamp the value if the user provides a parm that will result in an invalid fps. Reported-by: Hans Verkuil Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147= 453e4@xs4all.nl/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0 Fixes: 7472c1c69138 ("[media] media: venus: vdec: add video decoder files") Tested-by: Bryan O'Donoghue # qrb5615-rb5 Reviewed-by: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/core.h | 2 ++ drivers/media/platform/qcom/venus/vdec.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platf= orm/qcom/venus/core.h index b412e0c5515a0916f6a8969ad3be01841e09edca..5b1ba1c69adba14c3560a4bc6d0= 9435529f295a6 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -28,6 +28,8 @@ #define VIDC_RESETS_NUM_MAX 2 #define VIDC_MAX_HIER_CODING_LAYER 6 =20 +#define VENUS_MAX_FPS 240 + extern int venus_fw_debug; =20 struct freq_tbl { diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index 99ce5fd41577284098dca54c7772da0691cf29a5..fca27be61f4b869840904cc0577= 949635bc63cab 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -481,11 +481,10 @@ static int vdec_s_parm(struct file *file, void *fh, s= truct v4l2_streamparm *a) us_per_frame =3D timeperframe->numerator * (u64)USEC_PER_SEC; do_div(us_per_frame, timeperframe->denominator); =20 - if (!us_per_frame) - return -EINVAL; - + us_per_frame =3D clamp(us_per_frame, 1, USEC_PER_SEC); fps =3D (u64)USEC_PER_SEC; do_div(fps, us_per_frame); + fps =3D min(VENUS_MAX_FPS, fps); =20 inst->fps =3D fps; inst->timeperframe =3D *timeperframe; --=20 2.50.0.rc1.591.g9c95f17f64-goog From nobody Thu Oct 9 20:22:54 2025 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6480C238C25 for ; Mon, 16 Jun 2025 15:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087763; cv=none; b=TN0hJEa/repvgXQClH36Y1Q1FRW+0YGklxesv5f+nF7CBSxYwpXbw/dPXA+HipAu53PXUPaoVFKVk2S1Uc1haOoBR5MTVBDSubx+CVsioumPE1CGd5svyKXZd3CM0hq/4Co6SkvDaU4tjQv6f1ChCraGWkaodoPIirHdTnnh0Is= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087763; c=relaxed/simple; bh=XsDzSp/r0I19SrtO3s96jhGZF1Jyp04nnayeAGVsMbY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Cosmd1wXw15xu6ksEN6XEUJisckan9KdmYub5ThtXjGogrsDLTnoT3krm6I9/wuPlopaGRKwRH6UcCQZ2crQdvT//Roi2oExodGQ7lEPwQjRF27Eh/EhMzykmY8LYb5gYbgbrb8ZO81K6O0XUAyqMeXGX4mBJvOcj/7Sl9dqEc4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=mEyXLJXk; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mEyXLJXk" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-551ed563740so5040691e87.2 for ; Mon, 16 Jun 2025 08:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087759; x=1750692559; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=b4qCfe95ovipLi+Q1lPUaWCyEx536UAo0JNdtcLhiHA=; b=mEyXLJXkxJZ1zZ9x6jQ0l15CnTWviA/SgpJuxhJzIMQLEKJ+NwRRwfDeUgVv8GG61T QfLJDU9XCh7qQctHlMaek/Nwf6L8Qn1RSSgtLqk34weL5FdtP1BYYWo5H0OgbhM37kbz n1+nqFWkI4NhZeHY9x1PbhMQAs23vMbIexZsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087759; x=1750692559; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b4qCfe95ovipLi+Q1lPUaWCyEx536UAo0JNdtcLhiHA=; b=At0O4Mr/FcYwDiLCDmK+1TWmVkcVW1s0f25DY8ij6IHVuE92N08XR21gJ55Yyst0Jp jDEmViisrBPY5Zmj7D8YtfQjeC7uACvlL6XjuzpKn3jJKr8eqnvr4j4GLYzN4EOMRYuB iRhtCEDz3lUUvNQhuaYBYuoLxEgT13zLsAhfsehBZiVrS10N//j7phuQSNGwlAqTaWps HFvHeM7GHxQSU24xhA8tv7OMQ+wVloSiP7YpUdOQ6vommXPQGcXfkJPsP7skOAmpHNMz DEmhhGkq4NvsWjyl/xFv9cLhGwY8iW0r5lY3MUSfFA/GX5QT7uTr6XXK0K5WKvwhmlnX OrWA== X-Forwarded-Encrypted: i=1; AJvYcCV4d3ZU0CjVaeQgKbLm9Ai8qzLKMh2q6HkSHJDiO5Mq9IDGAhqlBS0YRQtR60ucRi31CVqIkPBuC9oM8gQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzIyO7fKQ7EfHhIjAPE8LavNKs1+zd+HJxxyeNuvjDWKYCMuywH ZpmpLSO3C3OuRCM+FexySMTQvrlI4liGogdVp9lUU0zMzhF5PnKEXPc4R5aTxHSpSA== X-Gm-Gg: ASbGnct+cAIwchmFpSctwvzVSsDzGydS1Ur3xlP0CHuHR5KUg9SZliEz3IsRYtX6p/Q nhmK5B1FBM3o8695gjkqtqlDum5TgZndmSC7d3umXV1qK9ck1n2fIvjJpeDkkpjzuSOqDoNROh9 siuw+boaGO4THkeV5oViSjgMjqSmrNed1PnJhlQPfXCUnMBVIZ4OmU79y2paa3+qi/zlp1GCOQK 4ETY51eZocc8DJQyXPhMAPAefjFYQfuN3yaKaIo6RdcXJ9XuhgM78m8WFVKWTNm2nZnAyiacI4G stPHzT+pyOuy0EkS0UwTTuEuCH1OzM/GLc56UbT4b1IT8Ouedi9do3p/T7gOTdaRY6heo8PQqdv /GFDeXY0em1EbW4Z6VFhCIHIgs13oaMr5KnmwbAswcw== X-Google-Smtp-Source: AGHT+IF+CjAPPii3DRazMfwspaw/MOGh8nWAr7ANWhS1wRIoncHx/IZg8+IM5oaqRFqxKmrYKpfodQ== X-Received: by 2002:a05:6512:31c5:b0:54f:bdfe:ece5 with SMTP id 2adb3069b0e04-553b6e8b382mr2595070e87.14.1750087759554; Mon, 16 Jun 2025 08:29:19 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:18 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:15 +0000 Subject: [PATCH v7 2/5] media: venus: venc: Clamp parm smaller than 1fps and bigger than 240 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-test-v7-2-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Hans Verkuil X-Mailer: b4 0.14.2 The driver uses "whole" fps in all its calculations (e.g. in load_per_instance()). Those calculation expect an fps bigger than 1, and not big enough to overflow. Clamp the parm if the user provides a value that will result in an invalid fps. Reported-by: Hans Verkuil Closes: https://lore.kernel.org/linux-media/f11653a7-bc49-48cd-9cdb-1659147= 453e4@xs4all.nl/T/#m91cd962ac942834654f94c92206e2f85ff7d97f0 Fixes: aaaa93eda64b ("[media] media: venus: venc: add video encoder files") Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/venc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index c7f8e37dba9b2218c0988dbfad1f7c04e055bbb0..b9ccee870c3d1238e04cef5e934= 4bd992d86d737 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -411,11 +411,10 @@ static int venc_s_parm(struct file *file, void *fh, s= truct v4l2_streamparm *a) us_per_frame =3D timeperframe->numerator * (u64)USEC_PER_SEC; do_div(us_per_frame, timeperframe->denominator); =20 - if (!us_per_frame) - return -EINVAL; - + us_per_frame =3D clamp(us_per_frame, 1, USEC_PER_SEC); fps =3D (u64)USEC_PER_SEC; do_div(fps, us_per_frame); + fps =3D min(VENUS_MAX_FPS, fps); =20 inst->timeperframe =3D *timeperframe; inst->fps =3D fps; --=20 2.50.0.rc1.591.g9c95f17f64-goog From nobody Thu Oct 9 20:22:54 2025 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DEE1423CEFF for ; Mon, 16 Jun 2025 15:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087764; cv=none; b=n5Fs+IXMpMISEVr2ozxBZ/9BkuHqJz5O/DNTw5qqGkEC552IAV7YYij59FWgkTwMIzjyGH/ChP3IC46IvVeTRHTSHu42ey3ee2TUynkSX25jy+3vnObwEsk4U5CxXG8F8qPEFu9+4rJmGBXX7xIBkodNHk94+0RI6gEEdHTmDOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087764; c=relaxed/simple; bh=QTqQXKpSaHgVdqMQgqBRH2JWW49/Aln0Z1IoSGyHsXs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Bad7nRchn4goAMp3UhoyaVx3a7P0BcfPKsmbYPHAUy0zBOm3sTVjiPIFjFw7O4toNKvDSygTl5pnw1W+8Z8fo+rtVbOyWpLrPVc58iV0SDzRLiylqcWgrUvnR3KsTyQFA0lp5PT6eGIGwOzDX3J1ia9EDZmZi/HgDtmIbNo7m3M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=nUVkwTx8; arc=none smtp.client-ip=209.85.167.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="nUVkwTx8" Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-553b51f5218so2928108e87.0 for ; Mon, 16 Jun 2025 08:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087760; x=1750692560; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mlyAumQktw9+u0JXM2Txd/n03QRXeUazVPfU+3yUgZY=; b=nUVkwTx8nCCbmMGbNIhwjsfBAq5gZy1gieKj8mO8JOCAWSBLY6VvX4rA/BzNxUiWRM 0PE+KUeYbK6ScZwqWJm9/Dbe/PhjuonwC7yaOTm9/GQjCuG2NIHxAa+kXXtKepAhE9GL M7tI9rEFxiS1whWoAbdiRz0bszPX7HacAEJHU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087760; x=1750692560; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mlyAumQktw9+u0JXM2Txd/n03QRXeUazVPfU+3yUgZY=; b=QFXwQm4FEpFtdhU1l5ZCkzfS4k6SMx52IEYHXlKCntOY8rveqMi8TCsq4ckImJIlVs A3J8U56Ck20Q49MECBHGWCvHsL7U2ZQJ660FKGQdgouupb4NuaUgUrdLm7vZ0vvQHXrA 6zYp9YjaiEF5VN8K3Hs4bh17F/SO0lbuj2xBQOZ2ieeD/ZWJxx/60z7A/IDEqeMVRAH5 IVGSYxdLefIhsTW+a/ngzx1MA1JEWjy+Io7XOOJzwrNBFCMtP8vvJs2rh5uB021qf5Rs P5H/O3ZV8HxNUKEfk8PeTJ2NscWcVqkgJjXKvVrTj0AbyfWV/gElbl8Q1ExmS6KixSGd cvWQ== X-Forwarded-Encrypted: i=1; AJvYcCWVXFxmfxu7HbdRfe52oANauDC21W9NOPNjWlf/koegHa/8PnpgwE34DWWVgyOY9d9jnO01j3Ux/syOkOA=@vger.kernel.org X-Gm-Message-State: AOJu0YynAOjKKa1B+CT7badsUX5BRuvCcma7tHTmfxjb6cu4TVMjk83i jg+2n0EmMmgQQVPNwHrgCaDJuBMzvpHQih2DaaDrOi5TQleRsAh4kWnqXZppVmHazg== X-Gm-Gg: ASbGncthq7YbRUC/zVdnQll5S5SCP/pfhcs8mvrgX7F4u1blFdmCg0MMDtj+qliyrzY /+x52bNzmRwpXDLVluI8vekz5LBFjwtGkP6WUgYf9zeM/e8JdqCD+emuwd1B+yxGQnxjjKy9m0m 4A4+slwREU4gg5GYe0gsJWNqczrJjqr3cf3pisgJEd1PE/qasBgEkm/u5z9ydO5oyflhLEzPbTQ RSOf+0cqZAWEotfpe/eHqi/Zsqk1ydLRmsiWvG/Om8rCehZtqGNIzkDmSKEyPxwHypD7VKyipjm 7cbIWMo5YGrRXiFaWuq1Q+Y8ZVcnb4yVO5NeBnGsUAXKtbVfBmLL1b29uEj1qhlrdfbIDU52+tI GuTq0QYvvRS0F8m4mzoeCom+uH8bdg1/OXwtRWUottw== X-Google-Smtp-Source: AGHT+IHXgxUoxsW63ox+OnSgw8OyuXCA4mc43J8ddOKq402U70VL/w2SFl0wGPNxpkoy3jGyCrD6iA== X-Received: by 2002:a05:6512:1188:b0:553:af30:1e8b with SMTP id 2adb3069b0e04-553b6f19a2fmr2486272e87.38.1750087759937; Mon, 16 Jun 2025 08:29:19 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:19 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:16 +0000 Subject: [PATCH v7 3/5] media: venus: Remove timeperframe from inst Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-test-v7-3-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The driver only cares about whole fps. We can infer the timeperframe from the fps field. Remove the redundant field. Reviewed-by: Vikash Garodia Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/core.h | 2 -- drivers/media/platform/qcom/venus/vdec.c | 15 ++++++++------- drivers/media/platform/qcom/venus/venc.c | 16 ++++++++-------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platf= orm/qcom/venus/core.h index 5b1ba1c69adba14c3560a4bc6d09435529f295a6..9cfb860e01e752bf9856a3550f5= 9c8c7b43647d2 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -413,7 +413,6 @@ enum venus_inst_modes { * @tss: timestamp metadata * @payloads: cache plane payload to use it for clock/BW scaling * @fps: holds current FPS - * @timeperframe: holds current time per frame structure * @fmt_out: a reference to output format structure * @fmt_cap: a reference to capture format structure * @num_input_bufs: holds number of input buffers @@ -484,7 +483,6 @@ struct venus_inst { struct venus_ts_metadata tss[VIDEO_MAX_FRAME]; unsigned long payloads[VIDEO_MAX_FRAME]; u64 fps; - struct v4l2_fract timeperframe; const struct venus_format *fmt_out; const struct venus_format *fmt_cap; unsigned int num_input_bufs; diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index fca27be61f4b869840904cc0577949635bc63cab..7d6612234d18a49573dc502d48e= e61a900b63194 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -471,10 +471,12 @@ static int vdec_s_parm(struct file *file, void *fh, s= truct v4l2_streamparm *a) return -EINVAL; =20 memset(cap->reserved, 0, sizeof(cap->reserved)); - if (!timeperframe->denominator) - timeperframe->denominator =3D inst->timeperframe.denominator; - if (!timeperframe->numerator) - timeperframe->numerator =3D inst->timeperframe.numerator; + + if (!timeperframe->numerator || !timeperframe->denominator) { + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; + } + cap->readbuffers =3D 0; cap->extendedmode =3D 0; cap->capability =3D V4L2_CAP_TIMEPERFRAME; @@ -487,7 +489,8 @@ static int vdec_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) fps =3D min(VENUS_MAX_FPS, fps); =20 inst->fps =3D fps; - inst->timeperframe =3D *timeperframe; + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; =20 return 0; } @@ -1622,8 +1625,6 @@ static void vdec_inst_init(struct venus_inst *inst) inst->out_width =3D frame_width_min(inst); inst->out_height =3D frame_height_min(inst); inst->fps =3D 30; - inst->timeperframe.numerator =3D 1; - inst->timeperframe.denominator =3D 30; inst->opb_buftype =3D HFI_BUFFER_OUTPUT; } =20 diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index b9ccee870c3d1238e04cef5e9344bd992d86d737..4979392aa20b6dc94895c708987= 8531b92b57754 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -401,10 +401,10 @@ static int venc_s_parm(struct file *file, void *fh, s= truct v4l2_streamparm *a) =20 memset(out->reserved, 0, sizeof(out->reserved)); =20 - if (!timeperframe->denominator) - timeperframe->denominator =3D inst->timeperframe.denominator; - if (!timeperframe->numerator) - timeperframe->numerator =3D inst->timeperframe.numerator; + if (!timeperframe->numerator || !timeperframe->denominator) { + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; + } =20 out->capability =3D V4L2_CAP_TIMEPERFRAME; =20 @@ -416,8 +416,9 @@ static int venc_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) do_div(fps, us_per_frame); fps =3D min(VENUS_MAX_FPS, fps); =20 - inst->timeperframe =3D *timeperframe; inst->fps =3D fps; + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; =20 return 0; } @@ -431,7 +432,8 @@ static int venc_g_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) return -EINVAL; =20 a->parm.output.capability |=3D V4L2_CAP_TIMEPERFRAME; - a->parm.output.timeperframe =3D inst->timeperframe; + a->parm.output.timeperframe.numerator =3D 1; + a->parm.output.timeperframe.denominator =3D inst->fps; =20 return 0; } @@ -1454,8 +1456,6 @@ static void venc_inst_init(struct venus_inst *inst) inst->out_width =3D 1280; inst->out_height =3D 720; inst->fps =3D 15; - inst->timeperframe.numerator =3D 1; - inst->timeperframe.denominator =3D 15; inst->hfi_codec =3D HFI_VIDEO_CODEC_H264; } =20 --=20 2.50.0.rc1.591.g9c95f17f64-goog From nobody Thu Oct 9 20:22:54 2025 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B1D1258CFA for ; Mon, 16 Jun 2025 15:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087766; cv=none; b=czmTrWH0y4VGK26563IXJ6uXuIlI80W5nasuwlge3idiWbsgQhPyhfQBp2mmN11hHxEEbGPv0oHNGizR9tgpsA77awxUy8TmngT/BZ5+NrfzgMed3PGkqF1BhOQsmApTd2BMZzFe3G/BzZiWbX7Pis5czts6oVvKe70tHg8APoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087766; c=relaxed/simple; bh=nJe/rCU0mM1LK6ZhEfAvqmM6ue4Q9Vd6jDTW9fx9UlI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AwNOu+WaDpAv8UxW9tUsqoD4fqRu7N5BsfSn1ZX2DC1UnjTE54vyW+KDJlKTlZJarnLaZLFCifaiv7JYmU0eKC4yGddgeupZ2YQAtF+JsrwpbjKyTyaj9QYtwBQ5ub1oaLUwf25SQgbohmPPhX/xEd5MtnFeYJvsENSpVbhxFfE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Fntgc+a8; arc=none smtp.client-ip=209.85.167.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Fntgc+a8" Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5534edc6493so5041840e87.1 for ; Mon, 16 Jun 2025 08:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087760; x=1750692560; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tU/MOIKq84YnAfhWoL4YWtwA5Rdh3uTG/Wp8rz5grc0=; b=Fntgc+a8z5geufgs8sQoEQbGb/K+59HnfptcsL0592AYayiLkVrWQw75I19JSwYuN5 kY3NRTR5wCMKwcXdDiQPmUp/Q8uDOsc+kp63l8Axa6LLPTR/eItMX3RHFcN9PkaiEDJ1 erZdXwV8uzT0z+h8MZ1otW4QkQnIb3UvjI/2Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087760; x=1750692560; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tU/MOIKq84YnAfhWoL4YWtwA5Rdh3uTG/Wp8rz5grc0=; b=PIMlgG2PwjAEnQkB5/02IiloQIU0oUiy5wp/XKY/fgbOXiHto9I6JWhhGX/IDqTitP MtWNXd6FxE28GpVmSXngSSDjYkTGXncRQWTU+sxhyC3KsFZK0OJTZAbQ09ZS4xZtAcSb zDoJtrzKjSzcS+SJidH+TATRWZbzwPrgX1jQcmN9DCq8Ns80Ru8hgAaSbzfG8o1M8GIF bmxuCD5Mg/v4ridr20QCWw03V3kfwKKdGvVrTGbxnOoZBmXCOtjefZFhGstff5Sj/HTn 7BU1Ry9Su9pAT2EMG0f+hDSekpPLiGv+u1JZwm3YDkG8EZBEBN0b6D/kMpxyxbhoGd0j jUwg== X-Forwarded-Encrypted: i=1; AJvYcCVM0JvfZL+DPNpPJMif+QF07Y07qRC5d2b9yQgZdCCHe9tMiYJLGW7v32nblUGLu4GmFbPvdRKW11zTKK8=@vger.kernel.org X-Gm-Message-State: AOJu0YzYR+gdfXLIgLIBYU2jIhFrOvQh1V/PWHF4+mHAKu4o3+do1FYk V6zSmf8+vn5ujWPvKSL8YTDyed1pGAJ9uwpPAzwRAodb5leEi33lwHw0VxKvdEZVpQ== X-Gm-Gg: ASbGncufkPsKn1gzMT9pbu+vRFkDWLPBwEB4qjb1MuC3/RRX8AR3StFVpY3W3wxUcg8 ViDxPz4evuDwAxwZtKhP9OZhIayzHWjW41Zo6PY/SIaJMQVN20du83A1aNJ9ful1UwvDIXWquTi Flno0ODnJjj9NzHrRqwTD8kuOAh9q9+tXLbSfQFXF1nh8uinMs6T5Imh9vsAgtlm9lw1Zn+z9BJ US8JG1936N1Dv7ftg9M7z/hbPHPMGByJKCXIzrs0232Xfes/TIb/tjvTClq7gxc4hIEZ2X2FQou MrtUrS/VPQxSjiMMPJkG2M+Ex22pOKUVLtK7LVmVX/kVPWK+plfLzGtBqcfXZZhBLD2mxt02j/P LwO2fBwdPFUWdKKjJK5xzepMV48l7Dxjie8SLzZmGHRxNIm28PYbE X-Google-Smtp-Source: AGHT+IF9Hd3Wtj66G1qTf/FKk0SD1/kjIqCqNtZy8C7aM1FLVNBfFTvcQ0578pGYNs8i7deIw2reqQ== X-Received: by 2002:a05:6512:b0a:b0:54f:bce6:63bd with SMTP id 2adb3069b0e04-553b6f62293mr2330891e87.54.1750087760319; Mon, 16 Jun 2025 08:29:20 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:20 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:17 +0000 Subject: [PATCH v7 4/5] media: venus: venc: Make the range of us_per_frame explicit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-test-v7-4-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Fps bigger than 0.000232829 fps, this fits in a 32 bit us_per_frame. There is no need to do a 64 bit division here. Also, the driver only works with whole fps. Found with cocci: drivers/media/platform/qcom/venus/venc.c:418:1-7: WARNING: do_div() does a = 64-by-32 division, please consider using div64_u64 instead. Reviewed-by: Vikash Garodia Reviewed-by: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/venc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index 4979392aa20b6dc94895c7089878531b92b57754..13395aaf06bbb1f381d809c18be= 61c5d6da85723 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -412,8 +412,7 @@ static int venc_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) do_div(us_per_frame, timeperframe->denominator); =20 us_per_frame =3D clamp(us_per_frame, 1, USEC_PER_SEC); - fps =3D (u64)USEC_PER_SEC; - do_div(fps, us_per_frame); + fps =3D USEC_PER_SEC / (u32)us_per_frame; fps =3D min(VENUS_MAX_FPS, fps); =20 inst->fps =3D fps; --=20 2.50.0.rc1.591.g9c95f17f64-goog From nobody Thu Oct 9 20:22:54 2025 Received: from mail-lf1-f43.google.com (mail-lf1-f43.google.com [209.85.167.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EB6942638A1 for ; Mon, 16 Jun 2025 15:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087765; cv=none; b=g4iv7EtqewYXjim0nMDeNgFuiNqV3vEeCbhftMOC+2mFJAMikI3yK/K+ISNY6tsr+WrezYfGmZaDQ8HfKwej0MhtpaMrl101zqcdItfzkKaI8U0PcK2vfRDHRBhU1S/+FPmHldKUciEniNp6OUWnNQPz+1nJRARzeXLEtQWhhKc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087765; c=relaxed/simple; bh=6eIWkWuKOIsBSFSU81VrPxHUw8nDWPxgWAtBDL7zshI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qBzaZBfm3hRdjAIrJ7fRXoieWyhon/OV4KdBIVwzt/CLB7DOxCzqAtGJ7ExLFodOTanNBglkFLJNnF9sp5v8qBBvmke/KI4qnilXJuci/c2sDJ7mPjrqZHfCgciOwZ6IzBs4l4zfWftx/2jU4Ge237+1YXXO8KNlz2zgGGO/cOg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=lo8vdmQm; arc=none smtp.client-ip=209.85.167.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lo8vdmQm" Received: by mail-lf1-f43.google.com with SMTP id 2adb3069b0e04-553b544e7b4so3224142e87.3 for ; Mon, 16 Jun 2025 08:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750087761; x=1750692561; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=CXcagyWgdxPaOdyolF8VUudFwWviLYrCDNyLuJgMIK8=; b=lo8vdmQmQIuBU+rG6oVMZ3Paswhb7vfDWvcnzuQ9VQgwSm73+wZs6xsP9lUDT8jxCS 0bfa0mtN3r+4xz60vJS+YuAUcEU+EiAboktTxBD/urpXRUp/uuplWUYa3h4cZa1h31W+ QyjUb/VOSXjBPjtKF+P6xvxtHE/o7ZW0TLuxw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750087761; x=1750692561; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CXcagyWgdxPaOdyolF8VUudFwWviLYrCDNyLuJgMIK8=; b=ZHanJG17uTgNfR7csIreSJ1lH+zvOpRTwlefHucv/lFfNNM/KcUZy/ryMsD3SZptdu 6RqE+zUiSN2pGqrtAyZlZqhxzjGtb3Ak2GECiOpsfEheEpM3xqfQdJI0GW85N4q96rIY l5x59yqNpZ6JchZUQUMxx97a+NFUNOF4SKchEGJ3HbaSOmtdBnUlmdbrlJCLOlUwlJUZ EFwmadQXMo3hwcG4xqS+PabKVqtqRQyfCI9CmWgQf+Sbyxhg+Dh2uEZoloqz9oFIVmCV r1UMeaK2wXH+243qWKtpfPji8ugyYro63mGyGEx/xNAaPKUgwv5p1rROKtcf+ehFDp6i xNGA== X-Forwarded-Encrypted: i=1; AJvYcCUG2HKqaTTNYIJWjX1CaSuSY5AF/RU0eVgKviEwg8tNbcYlEBE/PQEY8ukKr5+AkqB+6M/buxmO3wROMhs=@vger.kernel.org X-Gm-Message-State: AOJu0Ywke1pDxDt/nmkxpC6Dcn106ISZ8xeeseB70/uaOFptWL8wt/AJ jemMA9HT57SjVpExk4RU1Hv5/F3NmYTqL3X22bcAWtOffaEMWIumvBXilKWoNZBBu4yPV7nuhsu slykFJw== X-Gm-Gg: ASbGnct6bYGn9o5xkXxng8AYjtVmDl1fibUB8LEl+RpF7313bXfYiBK343X8hU5cEiU UnR/yodNspTYRKD02YjgtkhdONzKT+tjFR2zXTWzfMFhsz1Yw5CpyVIVPJ2Jz5M8qJTG6OO5m/K KeTxlGEkZmMRVHpggisZ804tUvovsvDhO4MtBybDjhqGku4hZTxcKbNnlSaXF4+Inbh5/k45G1j 7QRF+Hlc6nU9tUu5A/LVZw7JcSPRpLKzC97Ie+oSrpiI218/jGYSdb+0Ggw51qV4xOBzZOok1L3 daWj1XNJWni6tIbrYzNTabc3PpbeE5gQlvu2dBb0k9Pnp7MEhsgmRkNCp3bxxJRqHjCv0CgJRKj TOHhsk1JLDcBwKYFKLwL44zg2ts2hjTz8cmKUCCkq0A== X-Google-Smtp-Source: AGHT+IH1S4ALM2gMeb/svq1KORr41xuNr85Hs8gIC4o8fbK5Xpu5PFMKGkdjJyiQOAmowu8Unfeo7w== X-Received: by 2002:a05:6512:1114:b0:553:510d:f46b with SMTP id 2adb3069b0e04-553b6f0f99bmr2569990e87.32.1750087760767; Mon, 16 Jun 2025 08:29:20 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ac11ff5dsm1568020e87.31.2025.06.16.08.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jun 2025 08:29:20 -0700 (PDT) From: Ricardo Ribalda Date: Mon, 16 Jun 2025 15:29:18 +0000 Subject: [PATCH v7 5/5] media: venus: vdec: Make the range of us_per_frame explicit Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250616-test-v7-5-b8c0f98494fa@chromium.org> References: <20250616-test-v7-0-b8c0f98494fa@chromium.org> In-Reply-To: <20250616-test-v7-0-b8c0f98494fa@chromium.org> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Stanimir Varbanov , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Fps bigger than 0.000232829 fps, this fits in a 32 bit us_per_frame. There is no need to do a 64 bit division here. Also, the driver only works with whole fps. Found by cocci: drivers/media/platform/qcom/venus/vdec.c:488:1-7: WARNING: do_div() does a = 64-by-32 division, please consider using div64_u64 instead. Reviewed-by: Vikash Garodia Reviewed-by: Bryan O'Donoghue Tested-by: Bryan O'Donoghue # qrb5615-rb5 Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/vdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index 7d6612234d18a49573dc502d48ee61a900b63194..6042eb1e8705196b754dffc16bd= b714378bb4cd4 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -484,8 +484,7 @@ static int vdec_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) do_div(us_per_frame, timeperframe->denominator); =20 us_per_frame =3D clamp(us_per_frame, 1, USEC_PER_SEC); - fps =3D (u64)USEC_PER_SEC; - do_div(fps, us_per_frame); + fps =3D USEC_PER_SEC / (u32)us_per_frame; fps =3D min(VENUS_MAX_FPS, fps); =20 inst->fps =3D fps; --=20 2.50.0.rc1.591.g9c95f17f64-goog