From nobody Fri Jul 24 21:29:27 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE053421239 for ; Fri, 24 Jul 2026 10:36:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889365; cv=none; b=rgcc33B23oSuCS75Rkw4KnhQCBDMv4x7Foe9jTN+ZFH9bqhofPzSMTYwdthqgPUWoRyYKfaoKlR5vkLxEgOeuWjen2W/TDJUZfoQ3H5VD3ixjWFRNoU7qDmGDFq/f2ZYYDrkmVZYrFTW6LK8YIl+wjDmmxrqroQsgxNeTRx6LuQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889365; c=relaxed/simple; bh=mjrVDz4H6RpOYzrPpqqkMT5INmyzNFeOGabjHCl0QJs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RYp45gCf95nuueBSCY44CZbprSDBSXjxJVwCC9PGMc0CcNYQC33pmoN2N7IgLmCIPhKtW5oZMxPJS/Uhjxa/82SfxM3YdT2FOwPuIs38GihrDjW4IRbQucMb0+qFEg+bces08F3xzVo4w0iC3bHY3pKvMUeGCA1+bhl3DoIO2Yk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=DBwJi0nq; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Yh/Les1j; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="DBwJi0nq"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Yh/Les1j" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66OADrV82742615 for ; Fri, 24 Jul 2026 10:36:02 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= C4fjwuViaOd7s23k+7ReVdvQjEcM0iippnZxvUolPq4=; b=DBwJi0nq+e0fEKVk HaIPfq9OxPG4QENN1e8F5GYFjFXfwXc0ebC4+7Fr+WXpFtmyUNVtK8EOMAL/Pq/+ IHHth/tl5NeO6WsHzKM8sSVS5P2KNkmlXfk0GgHRz3y27MHvph6ssdvQzjGn/ptr 9nzZ7BZA2zzzfF22V9s3YteVAzah7FLGvp9oI64yT7NpYjrQUzztgIisFraC+0gc YOriQs03jvZ52ODwUmuqx9oPgM3FjIRsXJH6v+lggSA5R/0/e7HeNDbjcO9X/paV 9BxfS4kByt7deyW2lho/Y/uJiGMe8pby0BdhdUi7V1xT3uZHhXusYVBbhCgFtEGs mppKPA== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm0p51c9d-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 10:36:02 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ce8a76df2dso5372645ad.2 for ; Fri, 24 Jul 2026 03:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784889362; x=1785494162; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C4fjwuViaOd7s23k+7ReVdvQjEcM0iippnZxvUolPq4=; b=Yh/Les1jP2Gk0srBRrmbEoKYTaH3epq0I7UnPhrN4YYQ3Q+CM9KIbGFxlUZnaLXwEs nePYJaKNtT8RUoAf/v37KFe9dJ0f65xore1hVkwLPho6H42j9ZPiqifcXwMsqKIv08fo ffo8dDH4FbOHVlk2B95dfSyDl6A7f2+f+/nG6e2mJ5kStiD8kfI7rb7OOXbMHC0qSucE h5Fz7JFF7H7pnSuccNGCJVkhP4T0oUyI95wZxsM4Gy7fqJrCFNBM90iK7viy3bAp0DWP xfYsHZylfgebN98wi/6xmKfa6QsaFttOznEd1fSC9QtNWuoDpmIyXJGUbMTgQpfiCEgy ba5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784889362; x=1785494162; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=C4fjwuViaOd7s23k+7ReVdvQjEcM0iippnZxvUolPq4=; b=NSbr6UPtPR1C/WsC+jsCyq42hYdcJsTqE1rTB2TWGteT3oN5ffIG7YDQwV8pThUscU tiCkx/S6SySSxtRhhORhL0vL59BF8QKKhuYnDICKo/Tud2zScQv2Tei/N1QjFCDFYjWZ w/cEifbpwGCVsq67OXSgyhALgum/V4JN6/rpBYETXx1u13xv2OnGatJIDPnV1hI7tUB2 MpQaqfUkDpzdPCi4Q3ByV72rfu6dm7oMemm5y7ClS7FM16GHS0ckdbSctV8rjriEymaK RHc0+WDtvUjsR9CgccHCuHP1QbRHE8o+vUGaXYd1qshPBeM5J4ISjQqDvayGIzJ0RwJq judA== X-Forwarded-Encrypted: i=1; AHgh+RqsUaVC7QPJtZcWg26EHaf4unL+E7vbtKC0Mh0QtHLdwdAjWGKimz1MGQ4LI0KMuM7mvPk2cb/ZHEmv9nA=@vger.kernel.org X-Gm-Message-State: AOJu0Yz4WPeunoaYWe1RJvwPbe9/Ydt5gOYyVUfpiiNP4Nvvl7L6eZpN ckqREQx49Mcx/5IRSyM2xQL6ZzMlHFfc9ZNiKzvlRXwHYPLPHOPdG/bBuf3kwS6qFUVkr78O7CB 1nv9MZuhUzXqjPXSahvIaQGuFmerA7aEI9GFdqVZm43mAk6d0x+lbLyDGvdxlLku0kJg= X-Gm-Gg: AR+sD12Yacbk2x0HK9ReEn79d0ZtKH6z1DPkQGEN0rsnO5TUm87Sv1JVueMsOzKvaQI xLoqGzOfWdH3vemLzkRhXJz1rA6twdrF6kFEguXc7c6Lsr/cbcVyd7GDdT20QhQvtbocEWweaXf fsw1kpUqZqvkyTaQ12spOHfQvI3guErUSPQrvuQwRNB/cRjgW9NVmTLXCrTBQS1LA7Ai8e9vRkg LnL1Oe3SkiHVmBwzYLXTcwTK+d80uETK7XrrVnCMKJTj+Ji8IgbthjfbzhaQTa2wSNNVDAkM3OS 9ydHJOh2/5MKx2/EdH6gRYVcKTzdQ7i1+2bwTYQPLtLKTTpkSaFMU9vWjVy8x/FRBItVb5Ic/Sl LZ9JK6xS4+JkJzh0sw6E250YG+PM8lRw= X-Received: by 2002:a17:90b:4c0e:b0:38e:8050:e63a with SMTP id 98e67ed59e1d1-38ec648af5bmr6238216a91.6.1784889361643; Fri, 24 Jul 2026 03:36:01 -0700 (PDT) X-Received: by 2002:a17:90b:4c0e:b0:38e:8050:e63a with SMTP id 98e67ed59e1d1-38ec648af5bmr6238187a91.6.1784889361209; Fri, 24 Jul 2026 03:36:01 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03b0e976sm1228657a91.5.2026.07.24.03.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 03:36:00 -0700 (PDT) From: Sachin Kumar Garg Date: Fri, 24 Jul 2026 16:05:50 +0530 Subject: [PATCH v6 1/3] media: iris: cache work mode after computing it in iris_set_stage 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: <20260724-iris_multi_slice-v6-1-a99d160cb42a@oss.qualcomm.com> References: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> In-Reply-To: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Vedang Nagar , Stefan Schmidt , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Sachin Kumar Garg X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784889352; l=1459; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=mjrVDz4H6RpOYzrPpqqkMT5INmyzNFeOGabjHCl0QJs=; b=VNRdqHUXVV/dn2bCzZkN2nv6+aQrFjmZYsgSIns/bCndJwNxmoTNXQkA3NtNbFLHK7StokB5H mlXIesa53ItBNQ8JDZLK5fbGV+GtisLtZY3jETf0QolifEpCG92flq8 X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Authority-Analysis: v=2.4 cv=Pq6jqQM3 c=1 sm=1 tr=0 ts=6a634012 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=DQE9uWRhMQBL0dtU3VIA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: bziuj732REJwrvg6PAcrRLH8PDwBgh2V X-Proofpoint-ORIG-GUID: bziuj732REJwrvg6PAcrRLH8PDwBgh2V X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfX2DCLji7po0Fy /M5qiXNL2ducDPMwbRcfihgG/6lj0/jRBeSXd3/2e2oOnEnGh8yl9QZJE6wyOjKmbm7XrptFeya mSALNzFXzxJrj2jJ8dKHmGsmlstpFhs= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfXykkOUBdwRTMq 1PQwPzRNjVqolJKKQWNSeFtzgaQrx4ONrpoNfS8g3kkuvNi+aaM38E8/A+8I9Y45raeUqgsa+4D 4a9QUPOpZD8DitMl6CB349lToWnefQFDcnTludQxjbfloMlCwfCIRE+CK4VXVTnAjrbPrn2OC1w 06cz3pu0cYkUxE5xS4YcxeEEpvVDkP3nlvPiMkjoOXWzv12dSbm62XTacsvDjowe3j59vjUsOSJ +N9Swc5LGiNy8kcPcHc5NC9tl2FhUhxt4SVCaq2krlnx951Y0ZB1OYi5VHDKpJ3r41+ZPZPGg/o Wp12PaXptO410xQsU/NphP4pmi2zPvMBk0EeWWyAFQ8eOD26hwP0hjxs73yVVCmgQzXY5tT2vjT n0DaqjsctvNMPhN6zjfDC7rohht3imcch/6FCxcnQu7j4kfGmLL1k0VJmkQ2Ir0ZoHMX5qdyVjp XtJgnKsGfVdTur/BkKg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-24_02,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 spamscore=0 lowpriorityscore=0 adultscore=0 bulkscore=0 clxscore=1015 impostorscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240096 iris_set_stage() computes work_mode and sends it to firmware but never updates inst->fw_caps[STAGE].value, leaving the cached STAGE value stale. iris_vpu_enc_bin_size() and iris_vpu3x_vpu4x_calculate_frequency() read this cached value, so a stale default causes them to miscalculate buffer size and clock frequency for sessions actually running in a different stage than the cached one. Update inst->fw_caps[cap_id].value with the computed work_mode before sending it to firmware, keeping the cache consistent with what is actually configured. Fixes: 3a19d7b9e08b ("media: iris: implement set properties to firmware dur= ing streamon") Reviewed-by: Vikash Garodia Signed-off-by: Sachin Kumar Garg --- drivers/media/platform/qcom/iris/iris_ctrls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 10e33b8a73f6..58d195d2ab87 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -521,6 +521,8 @@ int iris_set_stage(struct iris_inst *inst, enum platfor= m_inst_fw_cap_type cap_id work_mode =3D STAGE_1; } =20 + inst->fw_caps[cap_id].value =3D work_mode; + return hfi_ops->session_set_property(inst, hfi_id, HFI_HOST_FLAGS_NONE, iris_get_port_info(inst, cap_id), --=20 2.34.1 From nobody Fri Jul 24 21:29:27 2026 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05391424D73 for ; Fri, 24 Jul 2026 10:36:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889369; cv=none; b=uOG+QFvnIVsfTHm8Pm5Aoo4TVJo3iBHivEdv41pu5sV5DQNG+TKrQSasd3OU+v7kqHtASRG0yHMyOTBkEqVy5IYAe4u8IQer8nXWT94pHB/QV3tmUsVAKoMRDsZifXvwV5zCV18dX9HkIu8SeLGxEVABps98fJZWjqxxJYVuHKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889369; c=relaxed/simple; bh=vyhhtZo2WdIR+FGNDgM41Ud6FlKDiGMJM2eDDf1MrJg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nWihpp+8tXGgOeZ9xCh7zKN7rj8ZOAW4UgjC3w6IOKFYRUnZEvmGgNoTd2f1pMnM00MEkPS/zkExzOLgxVxXjPGg+KdrAfRloKhxdZ7CbFF23TOX44ezARMZzUfJLSmJS93JUt0W6bK3R2cR2FYx8srCDvHBHQ3lC8m56Up+bGE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=fKtvT5Yz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iDhZ/1kc; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="fKtvT5Yz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iDhZ/1kc" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66OADxSh2917051 for ; Fri, 24 Jul 2026 10:36:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= jqEI+F/1SIBbj6LdgTjUTc+Y69JPX3b2PxQd4sqwy7I=; b=fKtvT5YzyjkVJW0f sGgMI3kkwGtP7hzyiBnE30SLJ0RpWFdGj6fI91spwbbQN3cGaN0wCJWdvciI7a3o ZQJFoKU0i/xnR+xhhshIFy+2x3UeKpX7cS3M0MKHzztd3FSveW6t6HFlZBDJ033X WJPQE37MuIr5pxStxOBI4OSVXialdCcD18kawiM1ueRim5+Fm3GdDJf4Wm3whG2w rFU2H7SXDyoJ9FN+zgwBDfe+PxdR9rXBvIF7AHZLjbrmInw1bH6UsM4hV3mLZ37V Gls2ilvGUMoldZW51dbXPmMbunCQG4HDr9HdxwCYWW+RBbdb9ftGVGUfU/EqGaBy LleecQ== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fkp5vks1k-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 10:36:06 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38e7b87ce77so604249a91.0 for ; Fri, 24 Jul 2026 03:36:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784889366; x=1785494166; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=jqEI+F/1SIBbj6LdgTjUTc+Y69JPX3b2PxQd4sqwy7I=; b=iDhZ/1kcfNBFQhkqhZW2m6A/HQEJL6XKgybOSLcg0Wl18AzBzf2xbXBrQxgIQuuTK+ V3FCY3GSPVhoHHfqFseOHLT4swYUKhqJkJOGILzT+q3S86R1Pn34Ovqh81GwHdK1T5zS TO2QhfMw7StCgkSjR+swvfR0HSmnHjn1gv3lu/DN2ZRpOx1sfxzdnWpg/UgJ2WCivWNQ lUblw+X1wTcBtjfmgxHEfFsb5+xv+UEtWWc0lwGddLn1/HuscPr+cv7WxMJQwPfkXg3c tdAZzuU4OIyueIrAhN/sK0ZkmEACxfbi+z2sJqZjSnyH+vNLVakFd64CB0ww4QqIMH3X pmLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784889366; x=1785494166; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=jqEI+F/1SIBbj6LdgTjUTc+Y69JPX3b2PxQd4sqwy7I=; b=VhdwxOrjM33QT+Fe6l4uPAwFUXrhHIKZ1EtcABqI0n1nNRZj4G9TTR2t61QmPdsUno I/jVItAsKOKS9Q5jv3eMhQLQ7O6ewadcUU7FOQ9ZmhyFbqxb0aIDsB9VRLbdtO1jlKkk bh6uOJD+cPyzuyVM+jmET+fQh3Rgn/giMD5IO1KvuoEQ/5iYbqn4+HlNWpqClrSFVvPv MzUI93XpjBgF7Enzm2B7wbgdIrs1up4eF9dZWJ87Pw/WigG5/VTFy+i0jLWdFff0GLVW gotqa51DVLUzJCLbEGxFiraa6JNQo5mZxCt2gufs7LDkrTpK1SkWlKYv7Is0AFLSYoxM Hj9Q== X-Forwarded-Encrypted: i=1; AHgh+Ro6s6xycv9Al0VL2HuOnVNilKQdlNKMirdZ4KQvHJ3wbkLE0nCwKq49843n3ocpl09KpEvl1HZm5WPXfb0=@vger.kernel.org X-Gm-Message-State: AOJu0Yy9INOuJeRvL0ovu+l+6C5QJQLk2Wdg9RSNui3tsrsy2aTFXXHD vfS2r95s4QPfCYe/qtu6JoqgD7lumPvifz26gigC7qqXrtnIo7jCTnJM7GLacAkO3d3MbobWSum MiOD1f+3PaS7Ikl6OcJCIouXa8sdTKYko2zkzR8bfhhM4jZmWFFhmjiTRk4zJHQYCIu8= X-Gm-Gg: AR+sD133FnmgRniTOfwLS3/z0iZM7L5GJeAO/51bkMH4lY6eNEf2yfxIx70IuSEwJHX quF6F0hWvmYeG5zkFxvMGE9Q7zWeJ6UzbxSs9xTGWwUUdyvUD/0U9J7fDlFJCvJ6IfphLQWfdoc tOAhB+VcLTrYJ40OqcyomAvDqd9soO/PakhrwnLDR21Or7BqMcNhAAiwCqUs839Jj6YNIF5cbAw ZDBaN4gBZ3ns140MuKNT9T/yp+5Z0OovenEHZP9TENkLjdSc1tGV6bqqTZgetgP9stumVjoynVH QjYl/AeTQiFhIctaJxD81E5esw1TTb9eNhEHN/pjMz5HwWIizw6aTlA7Zf8fLM4/Zeo1SKFpRl1 eIbJpOKyw6pnLs2WZ8SY6BIb/s3bPs38= X-Received: by 2002:a17:90b:2b44:b0:38e:2f21:3bb5 with SMTP id 98e67ed59e1d1-38ec66594e6mr7039765a91.21.1784889365963; Fri, 24 Jul 2026 03:36:05 -0700 (PDT) X-Received: by 2002:a17:90b:2b44:b0:38e:2f21:3bb5 with SMTP id 98e67ed59e1d1-38ec66594e6mr7039751a91.21.1784889365635; Fri, 24 Jul 2026 03:36:05 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03b0e976sm1228657a91.5.2026.07.24.03.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 03:36:05 -0700 (PDT) From: Sachin Kumar Garg Date: Fri, 24 Jul 2026 16:05:51 +0530 Subject: [PATCH v6 2/3] media: iris: force stage 1 work mode for CBR RC on encoder 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: <20260724-iris_multi_slice-v6-2-a99d160cb42a@oss.qualcomm.com> References: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> In-Reply-To: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Vedang Nagar , Stefan Schmidt , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Sachin Kumar Garg , Vishnu Reddy X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784889352; l=1399; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=vyhhtZo2WdIR+FGNDgM41Ud6FlKDiGMJM2eDDf1MrJg=; b=a+jfX+gHztN/XVjFY2OVsYTMHJNU4SfNw5F/lLT5W6oI8fhZIo686bkoOrhvRVYGmsD45O6Q4 OZPjRcVsqGXC6aXttqtFVUBWp3x1h/KAigzaXLEGLTFiwEoHGvSPbJH X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfX0ROpmFE0RHr8 YgLnLTrbwkQtWq1WyInZSa1SPx4dlmi70P+0hBnhx++g2XLaYCXPLlQUeYnj6tYeJPbobsU9gf2 LU4+jRxRsq2dvQjkd41W8loWEMBJDrI= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfX/4VqGQBA2zTY QnfTJYV4Dv+3LrtWbv6Tx6UONhAnjTdsV0jkHVXTjzq5mzziVVGH2lw0hljfwEyNjJJEQXYd99x svObhbifuSASzwSOml51dj5k3asUaWNZ1CoDiO1y+9Gnw7Wz3o/QdXF0WGf9zMAJ0IQmnvufVfs TbEs7GMq+s2Fg1g8grdVPWimVYhpIveKRQIbWFSGBXxZOHGmfRosD+6XVN9OElXpOXPoPbBZ9R2 Yf7klqNDYWbO2HBmsjqzjLUFVQUg4S67EzNquy2W4STR7NaCyV5QG+uuK/Y83BH+d0TycNubDY8 z1cbPVK1qMLZGqQQEIzwxWtjY9Vn1S1QTQB2BilYf8NL3st2LyPB53bb2v2wvpgA6o+cGmNdJyC 5VE/4OpeTdaFEiSvPVXlPSdpqjmPRrSs5Fg1PxLRHIPKfyMDAmlmTHk+Hkj0VGMclBBASAoj2X3 AtuXJGOczd7fOQPkBSA== X-Authority-Analysis: v=2.4 cv=Z9Dc2nRA c=1 sm=1 tr=0 ts=6a634016 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=LMK2Ni0dcLaqO0rVonUA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-GUID: z6g0g-wuOYemus1v_QI83RSUFtNA3CKs X-Proofpoint-ORIG-GUID: z6g0g-wuOYemus1v_QI83RSUFtNA3CKs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-24_02,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 impostorscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 suspectscore=0 bulkscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240096 iris_set_stage() currently always picks STAGE_2 for encoder sessions. CBR rate control requires stage 1 operation, so force STAGE_1 when BITRATE_MODE is set to CBR. The BITRATE_MODE fw_cap value is used instead of inst->hfi_rc_type since STAGE precedes BITRATE_MODE in enum platform_inst_fw_cap_type, so iris_set_properties() would still see the previous hfi_rc_type when iris_set_stage() runs during initial config Reviewed-by: Vishnu Reddy Reviewed-by: Vikash Garodia Signed-off-by: Sachin Kumar Garg --- drivers/media/platform/qcom/iris/iris_ctrls.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 58d195d2ab87..d7cbf6c3614a 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -519,6 +519,9 @@ int iris_set_stage(struct iris_inst *inst, enum platfor= m_inst_fw_cap_type cap_id if (inst->domain =3D=3D DECODER) { if (iris_res_is_less_than(width, height, 1280, 720)) work_mode =3D STAGE_1; + } else if (inst->domain =3D=3D ENCODER) { + if (inst->fw_caps[BITRATE_MODE].value =3D=3D V4L2_MPEG_VIDEO_BITRATE_MOD= E_CBR) + work_mode =3D STAGE_1; } =20 inst->fw_caps[cap_id].value =3D work_mode; --=20 2.34.1 From nobody Fri Jul 24 21:29:27 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A78AF426D18 for ; Fri, 24 Jul 2026 10:36:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889374; cv=none; b=CiTmh70NG+VVdUiw31hxRNi4CaUb7W3Zs9bsPUP763nG9X5walcH/FZkTb/JPWb43P2h4zWrquokdmdVjWbFgrO6hJnIPrKLxX/Zrr+regAQlrJScv3mJUAvGG9XA8Lh5fCExo1j4IxMa6x/2rzz4uhj9fQHahVfnhwebJgpAXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784889374; c=relaxed/simple; bh=F77InqL9rsnjgX+yqKt/ImkMkd7iKrk5mMUJU9k/HEg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rwJCWGy6f1zHNekvJSJJaM4Fdn6X1PgXiTW1bpjrimU9fNm1SGdH+AUnlTOeStMPB6PAnhYsXQWfiWhug2w+cwxT45KvBz684FtFNwpyKS9zSDgC0EiOFUyez+v77rNYxXhtCWCf9U18jqy1k189GyP5drfNvnWPtBWk2SnvgsM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ILGxgnma; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Zpft+E7A; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ILGxgnma"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Zpft+E7A" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66OADP9W3889189 for ; Fri, 24 Jul 2026 10:36:12 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= /3hYGut6TfV3I9NH02mInJzSkYevkJTj9GHIv+eaxqg=; b=ILGxgnmaArs7gXBj QboxA/uQIZOU46ScgWJ63G3IuIjTib8j8F5DNRMZ/ERxaUVMadXrD/iFuJKukGAL KxhjWdR/25DSL6e3iyS6IBlDtBe6sSpAH0b295Nc0/vpWilucxO1tLRkjsl/t8L9 YJsqTFhcnouDByUsFmwoi5EKkfmu0EHzsSVVFys26aGvT2n9Ywl9CZ7FwMlDUbPo I76FgMr/crA46bumHM1lz6iTezqKyu5CB3IrMWRlggOcf9UlRo9enfZUoaA75qBC gvAkQ4LI/G16lQPye5BqN/A0TEMz08FfXnFDf/xvX/mcR2CQod0HVeUOmBBG2Eag 3mDpRQ== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fm5f68870-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Jul 2026 10:36:11 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e4758ab46so303841a91.0 for ; Fri, 24 Jul 2026 03:36:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784889371; x=1785494171; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=/3hYGut6TfV3I9NH02mInJzSkYevkJTj9GHIv+eaxqg=; b=Zpft+E7ALF6vrys1nU5MnxoBcsyaU5/EEmaMXtOrxHHPNgnhp7CaxfLKnjqGJOsHaN gAvZuUZ+JWw8eEfdsnn3GkFFeF2Tuduoaziwl+j+/UJ+fHLUCm8aN+tV5FpjTmJc6OHi xA5B6cU5JK+zH+fVK6GHi4hKOSaJKFeefCNnf9RBAkBZbrM1g2RDLwmkEH+pmuvJZMPT N0tc95lBQwuVJZO7PV+CnD5JBwzgw5ZYrnAUBYlY946Kn1H4dkyvOzUpThld9o/7hFK1 gjsRyDzqI1NP4O+i566UnKRZCwHoGdjR/yQ/9Xo7SNUKnrdGMln7HCzoc6nKz3ZZk5Av 0NJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784889371; x=1785494171; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=/3hYGut6TfV3I9NH02mInJzSkYevkJTj9GHIv+eaxqg=; b=MZHk6DbtzuGNpi5PqQCL6sQ6VFPb+9fBkyrOA8gWXmFanpUIIybcD0heR1SOjOMDoL hIcqABW3AcxBX6ALSr+Nbsvs2lp9H6WEUk4YgqA5bSH8bVOSi76iNKVARXzzb8A4C3O8 PzHG33FYBCYS8KSXlSWu67mTKD7Osu3+kgEkLHuEcNSYi3lpIVvd71e7iuWiRz9IOJYv SLLmWDASoeQ3M9nLZo6LHdef1Dp75SKuFwroR1yEkMrpzuGwy9WuyQmvgjRtbi/+4ZhH LUZyGw/uiCIKkFnR+WD7hk+psCYFI6QxeuayH6VqRYHeiiEAmE0QE9wDKhw5BnQYDkyz LXKQ== X-Forwarded-Encrypted: i=1; AHgh+RpJ9agKlulWuaVqaCuXxGBYHAj2HE41Rw/1B89c9YkMqDOKyrsJF93oi43wJCYUrRNAOz/gKfILSkjoSak=@vger.kernel.org X-Gm-Message-State: AOJu0Yzv1LuNeZ4iUBPBwCA5UYH6s4nI8l7Mzc8MhCRpsw3tMdrRnNeZ RVNkgoFJO4lnid1AVqzb+EgwGMPqeEnPiEeAZd++UpjdPeiZbEAYUd3typEsSfWXwRoNC8+xN7W pY/c5X5cZ7cxaZ4M+JUh/hmGj8Q7OyusUf+ZI1rcImXWbiHR2WAX2vVotn+qnyoQfFuE= X-Gm-Gg: AR+sD12TkjaIIgLl9aIASxGhhQ65L86hb2iFe7/iHr39g9CwYcB8d28sbXSdIDEhCTf 1wEZTLBQJfjaNdC56WbMS4w4zMB0gZNGEK3NGolfOMuPxk+7opJrOPWVZNsCPA84h+XHUhr0nJ9 OWB+VkulZBSa/gs0dh8p4wmcBHr+Wd/LhiXvsZONHJfudywqmvsCeQCOgAK8O4yg5XZ5h7dmgg+ qla/6QJQCZ21lHMM3bAXizPBKLetl4wxW7F6mkTBn5jJZDCBcb4H5+rL0DArmaZHHR8XP0DGSxD DQBCHvOdx0QtRAHESY+wNR9KvNG60jDzJk9FiphfbSvdMZSMOOfVkKxOJaY4l2+lGVr5ZCB4qqW sP9vFMrHzxwZWjXJQjYV6swzRSOrZOpY= X-Received: by 2002:a17:90a:e7c4:b0:381:25ce:bcc2 with SMTP id 98e67ed59e1d1-38ec6401dd8mr6700440a91.6.1784889371077; Fri, 24 Jul 2026 03:36:11 -0700 (PDT) X-Received: by 2002:a17:90a:e7c4:b0:381:25ce:bcc2 with SMTP id 98e67ed59e1d1-38ec6401dd8mr6700415a91.6.1784889370543; Fri, 24 Jul 2026 03:36:10 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03b0e976sm1228657a91.5.2026.07.24.03.36.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 03:36:10 -0700 (PDT) From: Sachin Kumar Garg Date: Fri, 24 Jul 2026 16:05:52 +0530 Subject: [PATCH v6 3/3] media: iris: add support for multi_slice in iris encoder 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: <20260724-iris_multi_slice-v6-3-a99d160cb42a@oss.qualcomm.com> References: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> In-Reply-To: <20260724-iris_multi_slice-v6-0-a99d160cb42a@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Vedang Nagar , Stefan Schmidt , Hans Verkuil Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Sachin Kumar Garg X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1784889352; l=12675; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=F77InqL9rsnjgX+yqKt/ImkMkd7iKrk5mMUJU9k/HEg=; b=T+oSFT7fH308Hy8D0cKI4Ji7jpTdpRRFHsHrSf7lilSCK9wr5nFJXwYwaJ+GSBkdRhYbb4Wr8 sphAL4kydAIDF5Dc5YaWDb31XUIQp7e6GB53LLW5zcDJC2G2NCcwtip X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfXx+Gjkb/yRxFF cANa3Me7w1DfyjhkX39EgGnn/BXORGD269CiUxLMp0uDpxTZ1mpDce6i9scfJa+hlzPdT+EhFKC vbJyYDYMSeQCrrhilTa5GKwhqelodJA= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI0MDA5NiBTYWx0ZWRfX8ADHPy5hZnWK ze2DmmSYGLgLK+17TfTcaWGqG0HaVQ9JLrJmPOys6QNsoELMDKhwgXs9yUJqxh5IMwNZpPbPApP 26TNATNEtMHpKyvvgft5X6sv/Y6DpeL9m/UwwUjFfyR/8vP0bLCcJqUqbiU/PWbC9K+hQqGKRui P+A/Lf2sZOmuMY81Mf6KdujAKNkSNl4GrGiVBvgeVB9hPUmedzh+8kqBGsbgJ/oLb5D3PhdQBJ2 SVcvrctJQ1gLdwfpuA8IUV57CKiCgHsxWR9Idn7W3ZKtCc9JtT3WMGv6IUEzQD9qcy3DlICVZRr 8gIgNkc8qXB3IBr7djRQZ4FP7MUaSwtztSA3PgwHfw32XFn5rceHevOYaT3OkqxgfrXzS0XE31X iYpFDcWGx/dVXFJMVANL4MGy4417TqhjlIU5L4ddXLIFVJfhVCykI59gbXCu0JK+dVAiscEgZdX 72Hu6vsNTUfn+24m92w== X-Proofpoint-GUID: AKAEDUKiehyrJzun0OEEOSQFtCo-xdf9 X-Authority-Analysis: v=2.4 cv=BNeDalQG c=1 sm=1 tr=0 ts=6a63401b cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=ZIa84HXPZlRSj4Il7NUA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-ORIG-GUID: AKAEDUKiehyrJzun0OEEOSQFtCo-xdf9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-24_02,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 bulkscore=0 impostorscore=0 priorityscore=1501 adultscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607240096 Add multi-slice encoding support with MAX_MB and MAX_BYTES modes. Clients can enable slice mode using V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE control and configure slice size via V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB or V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES controls. Signed-off-by: Sachin Kumar Garg --- drivers/media/platform/qcom/iris/iris_ctrls.c | 86 ++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 33 ++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 + .../platform/qcom/iris/iris_platform_common.h | 16 ++++ .../media/platform/qcom/iris/iris_platform_vpu3x.c | 17 +++++ 6 files changed, 154 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index d7cbf6c3614a..0bda89755565 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -154,6 +154,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(= u32 id) return LAYER4_BITRATE_HEVC; case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR: return LAYER5_BITRATE_HEVC; + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE: + return SLICE_MODE; + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES: + return SLICE_MAX_BYTES; + case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB: + return SLICE_MAX_MB; default: return INST_FW_CAP_MAX; } @@ -297,6 +303,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_= type cap_id) return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L4_BR; case LAYER5_BITRATE_HEVC: return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; + case SLICE_MODE: + return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE; + case SLICE_MAX_BYTES: + return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES; + case SLICE_MAX_MB: + return V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB; default: return 0; } @@ -1482,6 +1494,80 @@ int iris_set_layer_bitrate(struct iris_inst *inst, e= num platform_inst_fw_cap_typ &bitrate, sizeof(u32)); } =20 +int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap= _type cap_id) +{ + const struct platform_inst_slice_caps *slice_caps =3D + inst->core->iris_platform_data->slice_caps; + const struct iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; + u32 output_height =3D inst->fmt_dst->fmt.pix_mp.height; + u32 output_width =3D inst->fmt_dst->fmt.pix_mp.width; + u32 mbpf =3D NUM_MBS_PER_FRAME(output_height, output_width); + u32 max_width, max_height, min_width, min_height; + u32 slice_mode =3D inst->fw_caps[cap_id].value; + u32 max_avg_slicesize, hfi_value, hfi_id; + u32 rc_type =3D inst->hfi_rc_type; + u32 fps =3D inst->frame_rate; + + if (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) { + dev_dbg(inst->core->dev, "slice mode is single slice, ignore setting to = fw\n"); + return 0; + } + if (fps > slice_caps->max_slice_frame_rate || + (rc_type !=3D HFI_RC_OFF && rc_type !=3D HFI_RC_CBR_CFR && + rc_type !=3D HFI_RC_CBR_VFR && rc_type !=3D HFI_RC_VBR_CFR)) { + dev_err(inst->core->dev, "slice unsupported, fps: %u, rc_type: %#x\n", + fps, rc_type); + return -EINVAL; + } + + max_width =3D (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB)= ? + slice_caps->max_mb_slice_width : slice_caps->max_bytes_slice_width; + max_height =3D (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB= ) ? + slice_caps->max_mb_slice_height : slice_caps->max_bytes_slice_height; + min_width =3D (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) ? + slice_caps->min_hevc_slice_width : slice_caps->min_avc_slice_width; + min_height =3D slice_caps->min_slice_height; + + if (output_width < min_width || output_height < min_height || + output_width > max_width || output_height > max_height) { + dev_err(inst->core->dev, "slice unsupported, codec: %#x wxh: [%dx%d]\n", + inst->codec, output_width, output_height); + return -EINVAL; + } + + if (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) { + hfi_value =3D inst->fw_caps[SLICE_MAX_MB].value; + hfi_value =3D max(hfi_value, DIV_ROUND_UP(mbpf, slice_caps->max_slices_p= er_frame)); + if (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) + hfi_value =3D (hfi_value + 3) / 4; + hfi_id =3D inst->fw_caps[SLICE_MAX_MB].hfi_id; + } else if (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) { + hfi_value =3D inst->fw_caps[SLICE_MAX_BYTES].value; + if (rc_type !=3D HFI_RC_OFF) { + max_avg_slicesize =3D DIV_ROUND_UP((inst->fw_caps[BITRATE].value / fps)= / 8, + slice_caps->max_slices_per_frame); + } else { + /* + * No bitrate target exists under RC_OFF, so approximate a + * worst-case frame size the same way size_bin_bitstream_enc() + * does for buffer allocation, to keep the slice count bounded. + */ + max_avg_slicesize =3D DIV_ROUND_UP(output_width * output_height * 3, + slice_caps->max_slices_per_frame); + } + hfi_value =3D max(hfi_value, max_avg_slicesize); + hfi_id =3D inst->fw_caps[SLICE_MAX_BYTES].hfi_id; + } else { + return -EINVAL; + } + + return hfi_ops->session_set_property(inst, hfi_id, + HFI_HOST_FLAGS_NONE, + iris_get_port_info(inst, cap_id), + HFI_PAYLOAD_U32, + &hfi_value, sizeof(u32)); +} + int iris_set_properties(struct iris_inst *inst, u32 plane) { const struct iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/= platform/qcom/iris/iris_ctrls.h index 3c462ec9190b..5a73c7c49d36 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -47,6 +47,7 @@ int iris_set_layer_type(struct iris_inst *inst, enum plat= form_inst_fw_cap_type c int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_f= w_cap_type cap_id); int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_f= w_cap_type cap_id); int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_c= ap_type cap_id); +int iris_set_slice_count(struct iris_inst *inst, enum platform_inst_fw_cap= _type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/med= ia/platform/qcom/iris/iris_hfi_gen2.c index acc0ed8adda1..fcbebced05c3 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -12,6 +12,8 @@ =20 #define VIDEO_ARCH_LX 1 #define BITRATE_MAX 245000000 +#define MAX_SLICE_MB_SIZE \ + (((4096 + 15) >> 4) * ((2160 + 15) >> 4)) =20 static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] =3D { { @@ -937,7 +939,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_s= m8550_enc[] =3D { .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set =3D iris_set_layer_bitrate, - } + }, + { + .cap_id =3D SLICE_MODE, + .min =3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .max =3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, + .step_or_mask =3D BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) | + BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) | + BIT(V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES), + .value =3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + .set =3D iris_set_slice_count, + }, + { + .cap_id =3D SLICE_MAX_BYTES, + .min =3D 512, + .max =3D BITRATE_MAX >> 3, + .step_or_mask =3D 1, + .value =3D 512, + .hfi_id =3D HFI_PROP_MULTI_SLICE_BYTES_COUNT, + .flags =3D CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id =3D SLICE_MAX_MB, + .min =3D 1, + .max =3D MAX_SLICE_MB_SIZE, + .step_or_mask =3D 1, + .value =3D 1, + .hfi_id =3D HFI_PROP_MULTI_SLICE_MB_COUNT, + .flags =3D CAP_FLAG_OUTPUT_PORT, + }, }; =20 static const u32 sm8550_vdec_input_config_params_default[] =3D { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index 776b21cd11b2..226894b99dcc 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -71,6 +71,8 @@ enum hfi_rate_control { #define HFI_PROP_MIN_QP_PACKED 0x0300012f #define HFI_PROP_MAX_QP_PACKED 0x03000130 #define HFI_PROP_IR_RANDOM_PERIOD 0x03000131 +#define HFI_PROP_MULTI_SLICE_MB_COUNT 0x03000132 +#define HFI_PROP_MULTI_SLICE_BYTES_COUNT 0x03000133 #define HFI_PROP_LTR_COUNT 0x03000134 #define HFI_PROP_LTR_MARK 0x03000135 #define HFI_PROP_LTR_USE 0x03000136 diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index c9256f2323dc..ad9f2b20cd90 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -88,6 +88,18 @@ struct tz_cp_config { u32 cp_nonpixel_size; }; =20 +struct platform_inst_slice_caps { + u32 max_slices_per_frame; + u32 max_slice_frame_rate; + u32 max_mb_slice_width; + u32 max_mb_slice_height; + u32 max_bytes_slice_width; + u32 max_bytes_slice_height; + u32 min_hevc_slice_width; + u32 min_avc_slice_width; + u32 min_slice_height; +}; + struct platform_inst_caps { u32 min_frame_width; u32 max_frame_width; @@ -183,6 +195,9 @@ enum platform_inst_fw_cap_type { LAYER3_BITRATE_HEVC, LAYER4_BITRATE_HEVC, LAYER5_BITRATE_HEVC, + SLICE_MODE, + SLICE_MAX_BYTES, + SLICE_MAX_MB, INST_FW_CAP_MAX, }; =20 @@ -315,6 +330,7 @@ struct iris_platform_data { const u32 *inst_iris_fmts; u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; + const struct platform_inst_slice_caps *slice_caps; const struct tz_cp_config *tz_cp_config_data; u32 tz_cp_config_data_size; u32 num_vpp_pipe; diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drive= rs/media/platform/qcom/iris/iris_platform_vpu3x.c index 2c63adbc5579..27894050a31a 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -12,6 +12,18 @@ #include "iris_vpu_buffer.h" #include "iris_vpu_common.h" =20 +static const struct platform_inst_slice_caps slice_caps_vpu3x =3D { + .max_slices_per_frame =3D 128, + .max_slice_frame_rate =3D 60, + .max_mb_slice_width =3D 4096, + .max_mb_slice_height =3D 2160, + .max_bytes_slice_width =3D 1920, + .max_bytes_slice_height =3D 1088, + .min_hevc_slice_width =3D 384, + .min_avc_slice_width =3D 192, + .min_slice_height =3D 128, +}; + #include "iris_platform_qcs8300.h" #include "iris_platform_sm8550.h" #include "iris_platform_sm8650.h" @@ -110,6 +122,7 @@ const struct iris_platform_data qcs8300_data =3D { .inst_iris_fmts =3D iris_fmts_vpu3x_dec, .inst_iris_fmts_size =3D ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps =3D &platform_inst_cap_qcs8300, + .slice_caps =3D &slice_caps_vpu3x, .tz_cp_config_data =3D tz_cp_config_vpu3, .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe =3D 2, @@ -139,6 +152,7 @@ const struct iris_platform_data sm8550_data =3D { .inst_iris_fmts =3D iris_fmts_vpu3x_dec, .inst_iris_fmts_size =3D ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps =3D &platform_inst_cap_sm8550, + .slice_caps =3D &slice_caps_vpu3x, .tz_cp_config_data =3D tz_cp_config_vpu3, .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe =3D 4, @@ -176,6 +190,7 @@ const struct iris_platform_data sm8650_data =3D { .inst_iris_fmts =3D iris_fmts_vpu3x_dec, .inst_iris_fmts_size =3D ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps =3D &platform_inst_cap_sm8550, + .slice_caps =3D &slice_caps_vpu3x, .tz_cp_config_data =3D tz_cp_config_vpu3, .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe =3D 4, @@ -205,6 +220,7 @@ const struct iris_platform_data sm8750_data =3D { .inst_iris_fmts =3D iris_fmts_vpu3x_dec, .inst_iris_fmts_size =3D ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps =3D &platform_inst_cap_sm8550, + .slice_caps =3D &slice_caps_vpu3x, .tz_cp_config_data =3D tz_cp_config_vpu3, .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe =3D 4, @@ -240,6 +256,7 @@ const struct iris_platform_data x1p42100_data =3D { .inst_iris_fmts =3D iris_fmts_vpu3x_dec, .inst_iris_fmts_size =3D ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps =3D &platform_inst_cap_sm8550, + .slice_caps =3D &slice_caps_vpu3x, .tz_cp_config_data =3D tz_cp_config_vpu3, .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe =3D 1, --=20 2.34.1