From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (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 C3D7E1DE2A4 for ; Mon, 6 Jan 2025 13:40:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170813; cv=none; b=oX5JKXHN8mM1byvQyIaY27I2qJPSGrispaT/FP6Z+v0UQHXKpZ0EHbaEpxoNLvNggPw2oBLgTPq5A6fb+3crDyGOswbBQ6ZHkNwa58iNhzYWzy8jj9kasQTgMAhOeJu4VyP9DIoORsPOrENzkYhvsmZEnm/gdiQTLV+JDSDP+QQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170813; c=relaxed/simple; bh=/HaOC0UQuUCRG7UtKoSrqnIxQLLgF8uNCr3tEiNAggM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mTl1GLjpV9EwA+tCzNN+I26znViU6Wjs0RVtjgpEwGxdA8RIgDSJxfBKROCBgnyn9bKyHB3fHfSYyNfsb0abe7wVct4XUXRz8cg1Af/ExWLBL9PeSWQoA6EbRgSe4qCfqu/mKufaqlXYgYTPQCmlZ5ZyHo/RGM/5APzWbJYDB6A= 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=Akfrpqpq; arc=none smtp.client-ip=209.85.160.172 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="Akfrpqpq" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-4678664e22fso128272541cf.2 for ; Mon, 06 Jan 2025 05:40:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170810; x=1736775610; 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=TwdwuAkwGCHw83yVS+OBZ5UTbtgtyF3XHLP2TniQ+hw=; b=AkfrpqpqFkO9oYZ8EYkAjIdvYTBAZS8RS6VjxAJV5+HAulLkuQM0eWq4+GwaEll40a AphnfeHRT52gMbNs2fGLn2YH2c+zJpGEiz7HEXDlBhKpfNPgFFn6KE9/Neyvyjj2GHry L3lLFHXzz/486wxAb9TzEqzQzovowwV9tsgtg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170810; x=1736775610; 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=TwdwuAkwGCHw83yVS+OBZ5UTbtgtyF3XHLP2TniQ+hw=; b=aogn++NJT+aP61PZpU+fdVxPJNhDZwu0DAY+zdV/RbAQfFo4sUk8XPVuXxLYzOWOW3 e5MqnzpkoSAJMoLuFlBu8IaC+FRQq7mvx05dPPHDtXzB+bC9n+ZbY7Z0mowS4OY1BnnL BCF1CssFyFtXfPQ0ZdvEm23k4e3w/luJzuLA4yySXPgZqKtJ4mWdwVHQvDM21DVAxjMD M+P4nTofvvCyHwfVnxqrBl/PoCZF6GeMbuqk9ljV+yixWBfMD4dmJ6tt2P3yn+o2HWrZ b+R2JNFH/CL8Fy2ezNU/NCp33wGIrnulFx+dO1sEuSGlcFYUzTYfTAoR0eHESgAJQVWe MKuA== X-Forwarded-Encrypted: i=1; AJvYcCUQcV5KdEw7QOaMVBmzuu5XM+fLs7eYoTPs9dOtuNqXEVFBhx/ijUAHP7Pi3OkB+AANJ2UGwKaumK3Z8yg=@vger.kernel.org X-Gm-Message-State: AOJu0YxUDkxHVCOJeE5zzhj+kI2uZkGoDz/MXAzih21kahQ3OH85MqK1 WEJDmpVycd3x53D7I1hBvd/AuZjwTZhMZJa/yQKRKsAfvdQ3deresWhtpr0x3Q== X-Gm-Gg: ASbGncvdv9/DcyCitoTtvOmZjgrnLp+iVRTt1pCKuZLFGIG878avelx42Mjv2DyZtTD 5bYZrhmIz6hC9Y6akUF8kSYr04p9B8qfJ7p3Rvek5z4zMqbsD9H0Qo6US85LMknMYlV5abEvmJ6 2NiFep35E9w/mhfGHxLpBZOmlMp/ZJ9aA+L+d6JTyLyyXDTXZzxFRcVUt+uKOCSz1AXWJXVPAJE vdwJKKWZmKcKmSWCvU0oRN08dJk9F3yTyT4GUu0irxxR9olQMJTrAnqsWb0NyF61nsddycrzmYl Rm40oEVybliGa4EGvQlvZ/7PdBmaVCtetUTI X-Google-Smtp-Source: AGHT+IEn5Ou8N6A5ZuxRVWPs80QvCQAMfXcoa0B7FLd71FuJaMTg55qppld2zbRIfvJF/yb+Z4SD8w== X-Received: by 2002:a05:622a:54e:b0:467:6941:4ecc with SMTP id d75a77b69052e-46a4a977daemr1272210731cf.39.1736170809768; Mon, 06 Jan 2025 05:40:09 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:09 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:07 +0000 Subject: [PATCH v4 1/6] media: dvb-frontends: tda10048: Make the range of z 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: <20250106-fix-cocci-v4-1-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 We have not been able to find the relevant datahsheet, but it seems rare that the device will have a sampling frequency over 613MHz. Nonetheless, this patch does not introduce any change in behaviour, it just adds a comment to make explicit the current limit: div by 32 bits. Found by cocci: drivers/media/dvb-frontends/tda10048.c:345:1-7: WARNING: do_div() does a 64= -by-32 division, please consider using div64_u64 instead. Signed-off-by: Ricardo Ribalda --- drivers/media/dvb-frontends/tda10048.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/tda10048.c b/drivers/media/dvb-fro= ntends/tda10048.c index 3e725cdcc66b..1886f733dbbf 100644 --- a/drivers/media/dvb-frontends/tda10048.c +++ b/drivers/media/dvb-frontends/tda10048.c @@ -328,7 +328,8 @@ static int tda10048_set_wref(struct dvb_frontend *fe, u= 32 sample_freq_hz, u32 bw) { struct tda10048_state *state =3D fe->demodulator_priv; - u64 t, z; + u32 z; + u64 t; =20 dprintk(1, "%s()\n", __func__); =20 @@ -341,6 +342,7 @@ static int tda10048_set_wref(struct dvb_frontend *fe, u= 32 sample_freq_hz, /* t *=3D 2147483648 on 32bit platforms */ t *=3D (2048 * 1024); t *=3D 1024; + /* Sample frequency is under 613MHz */ z =3D 7 * sample_freq_hz; do_div(t, z); t +=3D 5; --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 C80AC1DE3A8 for ; Mon, 6 Jan 2025 13:40:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170813; cv=none; b=X/SuLArDiCB4/nPjx1lOj1VFjsGsXpwANfvw3D96Yt87gSBWoBg8TT9LYzXAxWHpvJO75L19A+6foJIKX4uHpL0avVes14EgUAt5O+SOZsRGglbBNBcS/xiPx7hLe2F5StV/omyNk5lXI33YYZL9JjoOWIMIPIL/ND+rZXVDW9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170813; c=relaxed/simple; bh=gyc7PHkVIuT7bzGNideviSZKpST9Tf7H8/ISjHyIIjY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=T24RKNHWQvbkMvL714m/L0ymoPcW9nSU6yFYGnifBst5omr2Bssh5a1iJoUbaD5OpNLQwX0RvzqxTxDOOM4vYbY9H2RfzzNCMFafwHLNrlH37ISTg6fg4FsXdhs0VgasQvPVIEOPYCWbOq0XGOgHMOmyDpRuqxwqfVlx2v1TpqA= 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=NK/aRmgz; arc=none smtp.client-ip=209.85.222.169 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="NK/aRmgz" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7b6fc5bf609so1128562885a.1 for ; Mon, 06 Jan 2025 05:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170810; x=1736775610; 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=xMOQdsC3jIKqQqpuSf98ArK9l8+i2xudhvOp7OPxjDw=; b=NK/aRmgz9LKIXUPVFMhy4wbRTxq1E/szT1BUS+4vaPjUKQHxIGmfMG204yuEF8nR60 2DTN020rRv1oUH9UU2NkN50uF8OzswPU35kGPe9JsG0jC/V0sNcyqkqqzikKWH22Z6ri GoW4F87p3YkOt6QfATh0uQ+pputPvZLNlKzXc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170810; x=1736775610; 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=xMOQdsC3jIKqQqpuSf98ArK9l8+i2xudhvOp7OPxjDw=; b=rixqbZgAT6xiPhUtHMAZvZ2aph9LshC/RLOKFfc6yc7DWtH82spSt78vF5WGYZNlKe JboKoorSaHXHNo7l8bpErqCLaTv3C7bIbY2mmsqifVQW2j6xBpgUCoTjiC1jx/rKNxkO cS/OhzSywC/T9KicryJxxDwGb5VvB7Fj0w2ro8J/UOtQqHZY7E616bj/izqPg1vwhC+M 0dheKNM0tQ3/oWRfA0oamnvjGeXBdhCjoDLHDI5H3OZWrx/+6dI7X9Sx9tOksPK8YdrV +ixlFyFEOWFHqv/FQyI9U+AU4KLca9oyuEBNnDZSYITDzHWoex3DIS6k+0Te4LPoVyeL j7kQ== X-Forwarded-Encrypted: i=1; AJvYcCVYQ8VsPFdWdenDYfmXgE+kp9A4Rc3YZ1F2lca7tPSGmmfYXCOHtNUyQ4obHIYlliHroC+ypZ81cqm+4Gk=@vger.kernel.org X-Gm-Message-State: AOJu0YwN+VgDCgIQjgaquF0eeawpxRi540HMDg48sv/Tge4XDLsST8Sh BexUl9N0iWTMG0ZPR68E8+nDVJcWgKWSuJfl7if1hrcfxU1DbECv3xqXT8q4cw== X-Gm-Gg: ASbGncta1AqvBezS2hxtzaTSjYs3QztSOuiMYR/ZPlCh4BVV6LXgi3SZE0kEfSbAJL9 bSG9omCsAFLTxxsWjELOUEBu7eykQl5LlKj6yqaLRMLYGZ/iv9nMYcVv/wzRycrB+6JCc+//QUB dMh5Oz+xO/WqkH4OrDcIMx5k7YNOSh+v8q6EfOmyKNHNo/8pDWss9zhFsIWeD7f6/3dR5sjpVr9 iHdipzmsLD4/di0ltIXadEobmmRidz6f9xi6O6PHLAvi532+otfwPhuHEPXvUQY7e9mAMQi7py3 xdzTpfNhdpb6ivuRLjW2yxgAizSx/LClRffO X-Google-Smtp-Source: AGHT+IG0tS/HxvwhAy9Tnpx7Oq6KCN6+Gj7OoItlkC6sM95sCyRq2jDgb+/eacthbZcfoPddSstN/Q== X-Received: by 2002:a05:620a:2904:b0:7b6:d959:59e with SMTP id af79cd13be357-7b9ba715e92mr8941485485a.3.1736170810497; Mon, 06 Jan 2025 05:40:10 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:10 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:08 +0000 Subject: [PATCH v4 2/6] media: venus: vdec: Ignore parm smaller than 1fps 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: <20250106-fix-cocci-v4-2-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 The driver uses "whole" fps in all its calculations (e.g. in load_per_instance()) Return -EINVAL if the user provides a parm that will result in 0 whole 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") Signed-off-by: Ricardo Ribalda Reviewed-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/vdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index 98c22b9f9372..25edd77b9cf9 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -481,7 +481,7 @@ static int vdec_s_parm(struct file *file, void *fh, str= uct 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) + if (!us_per_frame || us_per_frame > USEC_PER_SEC) return -EINVAL; =20 fps =3D (u64)USEC_PER_SEC; --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) (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 7ECD11DD0DC for ; Mon, 6 Jan 2025 13:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170814; cv=none; b=gUQr9C1UTRrzLrgezYsXmPP7jm8iV7XdJUg6lQwBOk9k6AsPKpLWK7qiTFt/CZfSoJehXFT6Uneiub5gqZN4pcr5Sr4rnq2s3IEpexP6xht8k3quskQ3EUlwO+xk1OXZjvtpSMxwxZPWH49MKn/Z0MQJn6tijzWqTmLWTFWpoEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170814; c=relaxed/simple; bh=6S98sC9zb379SpXjPj44qvbnzAChVkkYXuoHqOebMyY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Fie+LFK+KRqD4hsttGqd7KOw1TVHefDdZuP8y3JULLGfazV/599z3MiglYVsy1PrsEcUyg0UcZu3CYPBhyXtXyoOTK07qAxkVopXupaAQUai3YiehUPw6mJPUI+76aw5EwMJD4hnIFuVZT2gNYZGz5g8AvTBeukwPZtwkmAF37Q= 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=kncgcZxE; arc=none smtp.client-ip=209.85.222.169 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="kncgcZxE" Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7b6f53c12adso1151845485a.1 for ; Mon, 06 Jan 2025 05:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170811; x=1736775611; 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=1sua/H7q/HxBmtn5ehYvB6xIDSURBEgE+eseMuH9rt0=; b=kncgcZxE+nBN/bBF+yiZX3cdt+EhOgfulXyNO8OT6URRm2wHJFX5LnH/1LaVH81cxH wKO54jBDLv3VQ1vjsWJIb4f5SUHhVrmGISlKnT3S7TzbLB5FN8ocZkkLe5lHXmL1AGaC kCTFK4/URJCBqLYNKduqa16gpwyYMMUVyWyKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170811; x=1736775611; 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=1sua/H7q/HxBmtn5ehYvB6xIDSURBEgE+eseMuH9rt0=; b=lSKcj7zIUL3xo97spYevsQV16hnQDAarjmn5ngIaPXTSZ6mWpcVsLLtfkLgl1oPKwL 5DYYTOmaXYyJC0pAMtAGfyb5VjBZ4z1z9iWpdgpYKUSbSqyC2DF5mL1aXPI+auxLMMYh +IDhpTkbohVvpJTCPt1Doy3Sj8RcJu+sDjvpI6K0sFlUBnRq5totW6y+DfuQoFhMrd8a uAj/JkTpdqHz1FkQ95pOCqYJ6onGl8D3PRHJpM28lv1KGKvIT0NQuAUaiB+vTbE20R6U vKf16H0qpyDbHCSWIL770LagARC4+R3lzdsLN1DustToV/1tqVBP4T3/HimiLWGiyNYt T+5w== X-Forwarded-Encrypted: i=1; AJvYcCXt4p4TQhuFSp6L87Uek+3vgkovnvd/sgWrOBqCD1qpYG/T8fY7i2zq7ttFcwa0+mCTE7f7z8B9McN+0CE=@vger.kernel.org X-Gm-Message-State: AOJu0YzAY68f4UPWnQjPSpzLaxQfzuB9ucGOF1wdnXnUXzSg1s3sylVA Bq+ZAvZttTbPLwGxeqZUjdN40ibtdUPwTiMCDUQ/LJUFivA1eOf7YManCCzFOQ== X-Gm-Gg: ASbGncuKxxIz/9rHJ7yRdOGXNjzZvrhWOLPP4m8WW6P+5rpMJaT4EwZK0HAcytOviyF CMrACiRs6s2kZe8rvzWGOhF/OBG3JRF1abVQtOHfVBJpnwB/KSacENnSiRw0xGjVqQCGiZiZ2wr a5t8jcMI+X6opB9BdW9iufcz5wIbPnJjDHy7/FnP7x/KdcNP1GqKs/c8zNO4djrMkgnUWVfph/O 7bjPSpZsUJ0eexDNjKgNowrXdwnyndyb/p9k/adVfVV7G5MexBIlR/oUy1X2ZC6bqxNTnYEfxDb eGeNwyI5cyeZl0otZUaCKSSrcGkx1nJzHL9B X-Google-Smtp-Source: AGHT+IHL/i9PYol7/BeTRyIFkBBCg5WCtmISC7fUpGW6mAhMPY0gQu9kkKdiaUQVy0qOM3paHIXmwA== X-Received: by 2002:a05:620a:4410:b0:7b6:ea22:3069 with SMTP id af79cd13be357-7b9ba79c26fmr8894375485a.26.1736170811310; Mon, 06 Jan 2025 05:40:11 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:10 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:09 +0000 Subject: [PATCH v4 3/6] media: venus: venc: Ignore parm smaller than 1fps 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: <20250106-fix-cocci-v4-3-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 The driver uses "whole" fps in all its calculations (e.g. in load_per_instance()). Return -EINVAL if the user provides a parm that will result in 0 whole 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 Reviewed-by: Bryan O'Donoghue --- drivers/media/platform/qcom/venus/venc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index c1c543535aaf..bd967d60c883 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -411,7 +411,7 @@ static int venc_s_parm(struct file *file, void *fh, str= uct 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) + if (!us_per_frame || us_per_frame > USEC_PER_SEC) return -EINVAL; =20 fps =3D (u64)USEC_PER_SEC; --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) (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 431491DE8B8 for ; Mon, 6 Jan 2025 13:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170817; cv=none; b=fYdXCFZCq/hMNJr5nOardMTBWglPntFpqvI0UfRScWw0mcIKCZQLEfiBzA+IwoUzlh+dQzs+DcOB3eAnlYzyksIh0jCroeYNgSCPtYqvR2mqoHAH9EFjleuPSGk7dcLeQ2lp5xGI2praS52mEWz5u89IXW8G5oXtekq+F+4mkBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170817; c=relaxed/simple; bh=5Q5B+vO8g/U6CHt36fHOQ4ZUPAjwu5u+O8RVnGjaQOU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tSiuleR8h/jopYG0O9t4Fr3qYRSqY0GAXfP1JSEOnJmPC5TOosMPn8ArcMaVdNkdMW7AvKR35q8sws1N0MI+ni+23sfDcdSi/jcGshqFtrxX6iE0IDeGT4U+H4t9kSjOoqqV2YgfmtmToQbLAvtea1KlF48pgNvpBmn6pBSjFTE= 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=mN0cEaP6; arc=none smtp.client-ip=209.85.222.177 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="mN0cEaP6" Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-7b85d5cc39eso1544492185a.3 for ; Mon, 06 Jan 2025 05:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170813; x=1736775613; 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=dtAqvkDjh2PaFdbysTqXE6H6Y5IVHgLV/gXYs6imBU0=; b=mN0cEaP6+zqFP3CRdYSnZ20pm0BZGOTdsrwZhW/nXoWFBxwmbnxCilPsHodXzrauar txXVO+SoTpGWiv6USoURd6crXGqArI/7m+8y3C45AmbUh36TZ9+7SlzmN4vfsQ3zVgVP eg+W2bU0xLG7DEeVqE5+MBUkOPrDHpCZSt0Es= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170813; x=1736775613; 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=dtAqvkDjh2PaFdbysTqXE6H6Y5IVHgLV/gXYs6imBU0=; b=FdM0hAV1zLwZetIq4QTnFbfD3v2NJBh3hBOOdn1Vuc6xt7EAKgdfAjF5N5MerKPujW veTjklBM5yFmm/SQW+ykeNod9L5d9unwB6UMIgjBcNkYRbFbcD6eJdxSykqd1bZd+NSC hndhgINE46ZQNtJPqvu+xvdcpYgiD7gBO57eTiOaAMdnMxIs7hpsxkrSX+nlq0Jo0Lal o5F5W7PZB2ooBYcUYURjQNj3bhq8IFGcbYXh4hgdzrwJlwRVWas8TFUBqOkipMn1JWZY ErnhaoZV+98W/xXMGqtFs++EzJmMvWD9z8IeC/A3cHaJeXwFh7+ZAhWzCHT3Xb6WbUl1 v7DQ== X-Forwarded-Encrypted: i=1; AJvYcCWXYrIfL5eAx4tkg8fKSxjdVSaw/vLlHwjlYvjnbN72e7g4QzQbANKGfOtYl86COtCJ8hbBliW3PQhAHC0=@vger.kernel.org X-Gm-Message-State: AOJu0YzQ344qaCsUNVIpdNH94BQDbNAACbN9sAUk3NVq6g21QvOioONg A97BhmYWN0wOeOvwkshcHxyZ8SDlRxuIhIEWgGnY8PDHWW20GEpbiaz2Wn6z0Q== X-Gm-Gg: ASbGncuM2ntsXOFBF/fI+tfmsr5fvJsiQZCL3+IAfzxrRF7B2wrq+dR5DCahccAg9tM wQ2BQoDI8m12SMmZeMP4yv9B1jFfa5a67NDulsVieAqEoHc2SZzRyhEWXyl/wtIAvixznWolwP/ i6rsCIgiOCHWiWAVLUrVxHG01mANvL90fA/GnupKptE6L97hdHXhseseJpZE/hw8bEgga5AxIV3 AMxhM3ZRJAuQbYrk6kBioJdUV5yhKTbYn6axYR0/mfeli02sSBHrmAvdUnTumQprYtfMWCg55Jf YmUnYEYlPCBuP2bFfkck38bEn3HdzT3uI5og X-Google-Smtp-Source: AGHT+IHty6kiPE899b/JSwzYcAr9Qll9mS0qFE11JSQ7TgmlLBCHUvVXP+LphtWR0tpu29q+SbqO4g== X-Received: by 2002:a05:620a:470a:b0:7b6:ece3:825d with SMTP id af79cd13be357-7b9ba716a6emr9941850385a.12.1736170812604; Mon, 06 Jan 2025 05:40:12 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:12 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:10 +0000 Subject: [PATCH v4 4/6] 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: <20250106-fix-cocci-v4-4-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 The driver only cares about whole fps. We can infer the timeperframe from the fps field. Remove the redundant field. 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 | 17 +++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platf= orm/qcom/venus/core.h index 44f1c3bc4186..988198280687 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -405,7 +405,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 @@ -476,7 +475,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 25edd77b9cf9..6b8906ced6bc 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; @@ -488,7 +490,8 @@ static int vdec_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) do_div(fps, us_per_frame); =20 inst->fps =3D fps; - inst->timeperframe =3D *timeperframe; + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; =20 return 0; } @@ -1613,8 +1616,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 bd967d60c883..8355bd59a5c2 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 @@ -417,8 +417,10 @@ static int venc_s_parm(struct file *file, void *fh, st= ruct v4l2_streamparm *a) fps =3D (u64)USEC_PER_SEC; do_div(fps, us_per_frame); =20 - inst->timeperframe =3D *timeperframe; inst->fps =3D fps; + timeperframe->numerator =3D 1; + timeperframe->denominator =3D inst->fps; + =20 return 0; } @@ -432,7 +434,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; } @@ -1455,8 +1458,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.47.1.613.gc27f4b7a9f-goog From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 357801DE8B0 for ; Mon, 6 Jan 2025 13:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170818; cv=none; b=LXYUiYki87ZRPRRyUXG8aDP+dtIUeoKHa9UsEEbgBv8gUeksyQuAtkWVqPw/gOA6PTqwGSmdjrrR1XQoaUTQ3MChU2aSPbyI19Or+P5BZjT+qnmINPu2rqmvFcVi4l2evGkJoLMWc0xUD2vbK4NstzTREbLd8dz3GB30ceGRIUQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170818; c=relaxed/simple; bh=MKfqw2WVGARyLQAOD8Mt7Dqo3jHse4EHvr4z1KQ2TkE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cHgmQA2G04Shhiv3Mi9nXLt+ZKenAFGbIIcwWXxDuw8k3tmUqAZODmdoxPW/hg5FJsf+m7RHWrf7LINEnPjqncfQFIJgCatHH5XZljJz3TMB+9AhjdUYkES4B17q92FzQfGARw696CQ54XChJcViDf4OPP4c61KqJonZsL7dg1w= 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=UJXIyOZD; arc=none smtp.client-ip=209.85.222.181 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="UJXIyOZD" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7b6f95d2eafso1403643685a.3 for ; Mon, 06 Jan 2025 05:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170813; x=1736775613; 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=Fr8YCqaCWwp/Be9W9ht5j9c8BF4MD3nNLHYL3KKI1+A=; b=UJXIyOZDLCqwwJcc9P3iK34i7mE2hQ8APvMppE4KuCMjHuxhaRwK6GuRp4+bDGKjJZ ZOhop9yxWZC5GTrcgVozLT41m3saXmDGHZhk7ndGgvVd6dVWLHZyl5Jlw/liCnUD7raZ i4B9g/Gp7Hwlu7ybTTcNiFmJaSNEL2D+BtBiI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170813; x=1736775613; 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=Fr8YCqaCWwp/Be9W9ht5j9c8BF4MD3nNLHYL3KKI1+A=; b=tZ6ko04GCOBrInNLpBdFp8weuvHSdfy8eJUgfZDo337oPSNwhNUQHRK8ftY7sETJGl jFym37S5w9/bMkPGyeGCfB8yVFJnHkfVwo/r+7Uv3OIsoyv9Px8dEoA4MBKIRjsh7xdk i0qpxm3FvjLRNcMszqTKK8K6Lsr0A85xsTjMUa5iheX243VvU6tg7ZrLakyhCH1q+w96 YO0RX/LWM0DEiy+2MfFWcP4wj2F2cbTBzjIs/ePJiEmsDaQm7b7qqo7/eqPChiJ5nXo1 8Xqo0i/76GKiU9IzUvxKMli84SAIf47I8yl/bgL3zfiW7O9jJvP0kJWt9EF9tJVQmNP7 hr2g== X-Forwarded-Encrypted: i=1; AJvYcCVlZR2/U/qDTB7o5LXkDoxOL4s0hdhaOQTMFyygSkpLCZ6VdSAFRAzIh7hMvWkFG4bAJ+NWleoFynLa16I=@vger.kernel.org X-Gm-Message-State: AOJu0YyfBHUctt0EiYb4FoexQzEApvnhDE5eApf5avARu4P5DV/UzHIq o3wk5yFVfUpLvlnibnY5qbPc4ZKtkEAGFOTJpMRa6WCwSnCo51rlZUg+TefxVQ== X-Gm-Gg: ASbGncu0xw0AE7SSsW2lNlHGgX+vYjyYGPBaxUd700gsfm6Rwcomt59LkHX1/K7+rRj vJmIr5GyPhdIScb+u4A4OJRhalGfGum/55TGGIZaAf6Id8uZLzuSJlNp5Am5qYUiTdFejgMpdBh dW4a/nQggbirSK+O840axeiqC4tcOtt6X3Tn6NCEvz2/vtszAy3swcdi5501X4Jcqo0yGYREADy USduAZriGcmewg9SiwrO3Kf3zckBcyjFYXyOQPLhOH8TUwHAPdZRCGSfXAp3ec6SpISrKujVhtk FHNlvcG3DgnzFOlnGvTlvkoS5TvNwV0Csdjm X-Google-Smtp-Source: AGHT+IHcjB/Pb8QD204DXadECgJD3hF6JOTt0Wc101hAlBe7SX6FDrf39ifHgQZXoKerdzwzAWLNnA== X-Received: by 2002:a05:620a:2805:b0:7b6:ed18:fe2 with SMTP id af79cd13be357-7b9ba79c187mr11546099885a.30.1736170813425; Mon, 06 Jan 2025 05:40:13 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:13 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:11 +0000 Subject: [PATCH v4 5/6] 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: <20250106-fix-cocci-v4-5-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 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: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/venc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platf= orm/qcom/venus/venc.c index 8355bd59a5c2..5683a04bdc14 100644 --- a/drivers/media/platform/qcom/venus/venc.c +++ b/drivers/media/platform/qcom/venus/venc.c @@ -393,7 +393,7 @@ static int venc_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) struct venus_inst *inst =3D to_inst(file); struct v4l2_outputparm *out =3D &a->parm.output; struct v4l2_fract *timeperframe =3D &out->timeperframe; - u64 us_per_frame, fps; + u64 us_per_frame; =20 if (a->type !=3D V4L2_BUF_TYPE_VIDEO_OUTPUT && a->type !=3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) @@ -414,14 +414,10 @@ static int venc_s_parm(struct file *file, void *fh, s= truct v4l2_streamparm *a) if (!us_per_frame || us_per_frame > USEC_PER_SEC) return -EINVAL; =20 - fps =3D (u64)USEC_PER_SEC; - do_div(fps, us_per_frame); - - inst->fps =3D fps; + inst->fps =3D USEC_PER_SEC / (u32)us_per_frame; timeperframe->numerator =3D 1; timeperframe->denominator =3D inst->fps; =20 - return 0; } =20 --=20 2.47.1.613.gc27f4b7a9f-goog From nobody Tue Feb 10 17:08:31 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (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 356D71DE8AF for ; Mon, 6 Jan 2025 13:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170817; cv=none; b=TDo1f2lht1D0wR/bCfC+Fend0+Up+t4R5VX4YiEVGoURfeofdOQmYNz9hmA2RXhFn3NXer+RbYZ+FlzcURMTrcXmsNMhIxMh811a+fpx0m03UbDnl/+ZegYh0/tP1KmFw0f8INCR5i1pTxbY/uuujhN2AvngLEtOLjPOtHh/wpc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736170817; c=relaxed/simple; bh=/hPtkiqbMiSuYUABeLf0k0X64qWSBh2CcTj5F3/fdPI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f4ElprfIg6/WVvqwnToPhhq+TMgUR+jlNJFnRtQwdrv4bKnErWDdRZLjlR25Blf46uMj5XRSmRLTxJEfTjZU2w1Me/GXMEXwdMs51/gxyB87P+LdiH/Sz3fIiA9mSkfaiQN8gMWM6RJWPdv+8twPdsxoTDY2oHAd1TzrOUAzdJA= 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=PAQxFpv9; arc=none smtp.client-ip=209.85.222.181 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="PAQxFpv9" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-7b6e5c74cb7so1030717585a.2 for ; Mon, 06 Jan 2025 05:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1736170814; x=1736775614; 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=OaluQD75i5WN0/M2E9V2xLSR9NLQRzro4V8nhNRsJEo=; b=PAQxFpv9MIGmrwTaRjVIdwABBj58hHScDnH38p+lDl4EVwNoyIoOrdWTWfvpi9x04D KhQCidNj7qaHL0gfXVUUQVleuywVolb9Jmbh4hgjbCrpwoXxgL28jr5b9EZpNulVa8Gy k2pNZmcNOjW1GJMxV+SE/kKt69WQ/iI8ChNFM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736170814; x=1736775614; 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=OaluQD75i5WN0/M2E9V2xLSR9NLQRzro4V8nhNRsJEo=; b=t5qSQC3BC6XoXXjhuDf5iELRzw6540KezT0qiXjNVRHUnIkPvJVyKpuAKuoP5+GL4M +UN5Vn96bg1/oqI0kgfGzxhA/onIP3N0ZctSgllEZjPZQa7c+mMPn/03i3oOUa8RMZil c+njw7J/e3PbTtIMii8nfFeHWsUA85fC47upsfsg/df0MnARTFrX+Pz7f1OAa/9kh28A SPQF1+g51Svg/zXRKmMBqvKNY/LyZNCwdeS+RlkWgMhuIFKs+iXoLXg5dEtWWpsk64Kj f4Ks3rTr1JAfNKmN+wz+IZ59sioZVc9auAmEEMsOzZ9Unfykn/Fbf2os4fdNpGW4GR4n me9g== X-Forwarded-Encrypted: i=1; AJvYcCWvZGnhXvZBy4W2/5dZVFDTmfBBiJdssktpiWdGsXzUKO2V/9QZJXwM8/unOhUoas6b9VaNupUH6mLQTFo=@vger.kernel.org X-Gm-Message-State: AOJu0YxpSdZ9SajfGs9noJwkTUdaqg1VRHew/5Da48VW2c66QIl7MJSo 42D3v+c5GT4B4sBZhrG6SZLCZvKboij2siFEXvIoUy5PQL9YU2r9NBqjs2xgsw== X-Gm-Gg: ASbGncteAORcoRGjYO9l8a8QCmn0KiplTaDZsUgg8e6WkaUKWL+1+a8x68XEzNOg9h7 NL2f3yH0Ptv2dOZ8YCBUP6yPEwp4n5Dqdu5FZT64h5j+kFBBt8geuFV0JBIlujzYS/nANPISF2+ IagUPBlxkonBrSP/I3xYQfGwJ3tDzoBaHLnaUF5w6auIkIIo3Fxe29JxrwajUJ4Lh0QUtPVq1jt aXA3DTkDW59xLb4tmmyDZvLQJ9yndjj6sN1N1AcV56DIjl0nWIBqYRVFSg5B6eN7Ypio8+1M72W skvA2TU+iCIMUtBLseHNpcy9c/ihEQD48OKB X-Google-Smtp-Source: AGHT+IHv1oIpl6WcfgN36jKDKAWdHfzzIkAbnj9H7EHr8HHbAWlAP6Mwo+/BVH3tIZ5MTc2nhgENBw== X-Received: by 2002:a05:620a:468f:b0:7b6:d050:720f with SMTP id af79cd13be357-7b9ba79ae8bmr10079146685a.22.1736170814275; Mon, 06 Jan 2025 05:40:14 -0800 (PST) Received: from denia.c.googlers.com (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b9ac478d35sm1501861085a.90.2025.01.06.05.40.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 05:40:13 -0800 (PST) From: Ricardo Ribalda Date: Mon, 06 Jan 2025 13:40:12 +0000 Subject: [PATCH v4 6/6] 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: <20250106-fix-cocci-v4-6-3c8eb97995ba@chromium.org> References: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> In-Reply-To: <20250106-fix-cocci-v4-0-3c8eb97995ba@chromium.org> To: Mauro Carvalho Chehab , Stanimir Varbanov , Vikash Garodia , Bryan O'Donoghue , Hans Verkuil , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Stanimir Varbanov , linux-arm-msm@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.13.0 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: Bryan O'Donoghue Signed-off-by: Ricardo Ribalda --- drivers/media/platform/qcom/venus/vdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platf= orm/qcom/venus/vdec.c index 6b8906ced6bc..88f6b5a3a4fe 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -464,7 +464,7 @@ static int vdec_s_parm(struct file *file, void *fh, str= uct v4l2_streamparm *a) struct venus_inst *inst =3D to_inst(file); struct v4l2_captureparm *cap =3D &a->parm.capture; struct v4l2_fract *timeperframe =3D &cap->timeperframe; - u64 us_per_frame, fps; + u64 us_per_frame; =20 if (a->type !=3D V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && a->type !=3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) @@ -486,10 +486,7 @@ static int vdec_s_parm(struct file *file, void *fh, st= ruct v4l2_streamparm *a) if (!us_per_frame || us_per_frame > USEC_PER_SEC) return -EINVAL; =20 - fps =3D (u64)USEC_PER_SEC; - do_div(fps, us_per_frame); - - inst->fps =3D fps; + inst->fps =3D USEC_PER_SEC / (u32)us_per_frame; timeperframe->numerator =3D 1; timeperframe->denominator =3D inst->fps; =20 --=20 2.47.1.613.gc27f4b7a9f-goog