From patchwork Mon Jun 16 15:29:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 896942 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 6EBC423BCEE for ; Mon, 16 Jun 2025 15:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087763; cv=none; b=Z8jDA7Ocfmi4TNYZwAH9UR8IrnTvd1eFjPP98qN4Twg/cvPoLnKdcMw3SnFBSkic3etPikVarYm21OodFQb5RMvhjV1Vzrl7naFxXpNlso7rVGtolwBSr2cSPKyOZK7d2/PGlZou7nszk7ceMj6giKnr+4uoq2PuOfs2UMo1K2Y= 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.45 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-f45.google.com with SMTP id 2adb3069b0e04-553b51f5218so2928097e87.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=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=ZapvvFg7GVz6HAu5kIF/rZtvM8vB5Ej6dl16+0YW9STnRyVeNHZZyJPZHyxMPiUtu0 P8I0ybMfnUnueEQmBeXHR1VqTlz3fhYcQ0mhN2EnnxEjHp5cBDu5ng4jwPEshA83wdW+ +munAMgbTJK6jsxbtaTQUGkEOJF3mHPDYKMphadAgF/Gc+Kp7ljPkGwVleCkzMw/X5tB nH/GdJBPLbJhRinW1Ws417Wi/RaUwKPCJi6O38d3e15WEeGh5WCnf+JjFtnZdB1lnIiS hWHIhfaNjAqWkTf73S6LTVNaqO2OGxtzFvK+lNXxCJkx2/twR8+kRCuGFC7SF28qhzD7 v3aA== X-Forwarded-Encrypted: i=1; AJvYcCXtGgO98h5vehRiYBdMgSPA19VCWZQbVqRydqUcwPwwF2K8JJ31/sDzv1M91BC7VjIiXCUoMYy4ZCMvAO4q@vger.kernel.org X-Gm-Message-State: AOJu0YzWiCSw3hdHPpEW2ElopNIogWg1ONNc7JSSOolMc9FpExZg9Zp7 Ao2mBfdbtkaamWtzWrIA99Kh9LCwSrfpPnDIDe9Dylmk0SaWctQILa32oQV2Uk0pnQ== X-Gm-Gg: ASbGncsozK6BMh2p/9IoGH/21xb83m8pIbHD3SbDHgfev4WnzDZUpDCT3v1zY/K+iM+ Kwmq6biQ/ExfAgHaKxlT5C73CtKEE7nNHE+rJ30B6p6xq7bHKrrkmV9hTtHU5vgK6o6pBW0REqh CY6fKrvyMrO50QIML2PSY+x7cUd9WoiRfOMQftuXxkwcJ9jTCOt5ZLy5qCm5k3DHUJLnWVzOFtO RPHGY7YPV82OkwPQN1ZQ///PMHrQPlMfhLkRME5MEvph8r4Y47ztOVSxawA3CuuAbwvHeodP2R9 tZm/4jEl93mxfb5OpHqlp8bAyFgqsoiWhTfyVA25SEmU8uzcFstc48GNnHFycmYk1KDQig201OK jLbwHu84wmRT+V7+9FcT/pKAOBCjiURFGFILRQoLoSA== 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-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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-1659147453e4@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/platform/qcom/venus/venc.c index c7f8e37dba9b2218c0988dbfad1f7c04e055bbb0..b9ccee870c3d1238e04cef5e9344bd992d86d737 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, struct v4l2_streamparm *a) us_per_frame = timeperframe->numerator * (u64)USEC_PER_SEC; do_div(us_per_frame, timeperframe->denominator); - if (!us_per_frame) - return -EINVAL; - + us_per_frame = clamp(us_per_frame, 1, USEC_PER_SEC); fps = (u64)USEC_PER_SEC; do_div(fps, us_per_frame); + fps = min(VENUS_MAX_FPS, fps); inst->timeperframe = *timeperframe; inst->fps = fps; From patchwork Mon Jun 16 15:29:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 896941 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.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 E9E122405E5 for ; Mon, 16 Jun 2025 15:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750087764; cv=none; b=LR0Nip/9qPHAcXPoWpbkmGDrd0HECM5bWT7P5FXX3qPLK1BEAcPhRFyAc6EOO9GzB9gT03fSbMZ+tI1gXbGhNj0ovH2+3W9TL6bkGfPhLuJHLf9XOAzJjS2CGBvuUGagJo8nBExmhd3xt7oGBGQG0UR5cZ9NYSHafiyKXSKpKxQ= 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.208.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="nUVkwTx8" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-32934448e8bso38986511fa.3 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=Z9DD34eCTTuO0f8pt/3ylPj/8rRhO+rH3TZj3+lV31jlMvX9G4AKYU9DFCNJ6aV0x1 JKW8NTazV0Fx5zjX5jkr+aVPxw7uyuojqixO2Wc2ts4wgouE0Yyut4sz5DzeruzBlNrB tv0MYEWWg8osJSZgmgyBcLSyKhhM06rJJ0It6+ew3DDXIrqqpGUUWeKNkQObpU53DiTk mWS2GGA1Xlhn+ajEu7aUnp7AEjdA0RcFkBf26NqU2Cf7gYf4NzITicKIcy1iUKC9zOZB T2wZNjg8eJSzl4fZ7CR+KQQszejnshuLkmFoyy58oC/TvNWTeNUafAqmVonJtkGfe/U5 Fa6g== X-Forwarded-Encrypted: i=1; AJvYcCWlEuaUvy7u3FZx4O/oHcsMaDz71ur5ArpAFNtR0xY1CkssHun1l4wBqSUJLggr1zRZro7iDgzAmMWa6Oj3@vger.kernel.org X-Gm-Message-State: AOJu0Yz1a1LCnHSkMZUzxnnO11lIW4mRqvVp+WjRfVPHwDJ64NymOFkZ +OlxBpijHTFOfDhFY2iicBA4wCEBlBufWPHfTbm7LCh6GZ2smqx8rk/528Te45l1Qg== X-Gm-Gg: ASbGncutDTSk592xNLBI3PDuqHmNKDc5v+wW0NJ2EH4EuttWr4G7vroesgzko53Im4A r8cxm1yV5ilnskj9yUc0Qhvz75T7QoGUkf8hkof7XKMPtz5GywRqYIqh4ifmKIsb2d5Y4O3QsjI gyz4WOCXTrse3IZxEK81e89dmmrIjxfFr+SViZNl3sgfRtd04aSnqWJDDIN5hcs9f/OEJPzW5Eu ivePCZ4XjX6BcikRRzu891mSgwwTnIhokivokif5Z5424iqkCJgWe2caTzWWTcikimPcL+qzGUY F1faz3FBD1jdyfquN0/5Ul/DK6P8xJxGxhvaI33CqHrWr2JEIvuyrq3zaR5xz0btvpJyhXEBwI5 QSGV68oms3EmRu2aaAJzzF1E/4O0+BVcqbFiiLT7Diw== 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-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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/platform/qcom/venus/core.h index 5b1ba1c69adba14c3560a4bc6d09435529f295a6..9cfb860e01e752bf9856a3550f59c8c7b43647d2 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/platform/qcom/venus/vdec.c index fca27be61f4b869840904cc0577949635bc63cab..7d6612234d18a49573dc502d48ee61a900b63194 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, struct v4l2_streamparm *a) return -EINVAL; memset(cap->reserved, 0, sizeof(cap->reserved)); - if (!timeperframe->denominator) - timeperframe->denominator = inst->timeperframe.denominator; - if (!timeperframe->numerator) - timeperframe->numerator = inst->timeperframe.numerator; + + if (!timeperframe->numerator || !timeperframe->denominator) { + timeperframe->numerator = 1; + timeperframe->denominator = inst->fps; + } + cap->readbuffers = 0; cap->extendedmode = 0; cap->capability = V4L2_CAP_TIMEPERFRAME; @@ -487,7 +489,8 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) fps = min(VENUS_MAX_FPS, fps); inst->fps = fps; - inst->timeperframe = *timeperframe; + timeperframe->numerator = 1; + timeperframe->denominator = inst->fps; return 0; } @@ -1622,8 +1625,6 @@ static void vdec_inst_init(struct venus_inst *inst) inst->out_width = frame_width_min(inst); inst->out_height = frame_height_min(inst); inst->fps = 30; - inst->timeperframe.numerator = 1; - inst->timeperframe.denominator = 30; inst->opb_buftype = HFI_BUFFER_OUTPUT; } diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c index b9ccee870c3d1238e04cef5e9344bd992d86d737..4979392aa20b6dc94895c7089878531b92b57754 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, struct v4l2_streamparm *a) memset(out->reserved, 0, sizeof(out->reserved)); - if (!timeperframe->denominator) - timeperframe->denominator = inst->timeperframe.denominator; - if (!timeperframe->numerator) - timeperframe->numerator = inst->timeperframe.numerator; + if (!timeperframe->numerator || !timeperframe->denominator) { + timeperframe->numerator = 1; + timeperframe->denominator = inst->fps; + } out->capability = V4L2_CAP_TIMEPERFRAME; @@ -416,8 +416,9 @@ static int venc_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) do_div(fps, us_per_frame); fps = min(VENUS_MAX_FPS, fps); - inst->timeperframe = *timeperframe; inst->fps = fps; + timeperframe->numerator = 1; + timeperframe->denominator = inst->fps; return 0; } @@ -431,7 +432,8 @@ static int venc_g_parm(struct file *file, void *fh, struct v4l2_streamparm *a) return -EINVAL; a->parm.output.capability |= V4L2_CAP_TIMEPERFRAME; - a->parm.output.timeperframe = inst->timeperframe; + a->parm.output.timeperframe.numerator = 1; + a->parm.output.timeperframe.denominator = inst->fps; return 0; } @@ -1454,8 +1456,6 @@ static void venc_inst_init(struct venus_inst *inst) inst->out_width = 1280; inst->out_height = 720; inst->fps = 15; - inst->timeperframe.numerator = 1; - inst->timeperframe.denominator = 15; inst->hfi_codec = HFI_VIDEO_CODEC_H264; }