From nobody Sat Jul 25 00:55:19 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 A067045BD57 for ; Tue, 21 Jul 2026 09:54:02 +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=1784627644; cv=none; b=Rxv2iCGavP9HkQbTfDtDJXHEZJmTrpVIYoDOytd4bhMPJaffJkGHvyePxZ0NDBt/Xwi4MR/y/xkkkj5BV7PRldfyrynUGPwGwdPWkf3QXvvzczVEo7OLbU7l58GyL++Vfv0WoH3ShsQ4wYWXpyPJ/FvCMdJ0lGh64FHwvTiNtWg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784627644; c=relaxed/simple; bh=WXUGAaHvZcP/oxO0DV+soJrpYB+PVdMtwrpzlji6Ipc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XG5KHu9sgAhrSgrKhd1cK/7RceO5QkKvBBGVhTGqy6RQnzG0vPfFwLchXMVhyLuU9X/+l6NkCR0Fg9n0cI+A1YjP+J9zOSArk4uyEijw85E1oSDK9JUp+JxjI5/+0LUSPxpEdA6A9Umik+HkEQ5cZLQzEyCiZuydh+lvhCvh69I= 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=gGjafiEn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YfYotC1k; 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="gGjafiEn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YfYotC1k" 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 66L9XEGm1389899 for ; Tue, 21 Jul 2026 09:54:01 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= 2uEDiQtnwF1x86R4MeL94Cs9fWflhOZR9a8WmLazXrU=; b=gGjafiEnKXg4AMkm MqwcnhClSb8hlL6HXKAIqDgUbb12QikfaXBdIBSADPCs4GVzCaunzvsZqJtCVoug NK4bn2tE/LNRDStu8RgSbdHDcYbl3tsfZnWiNxme8Xqv/eSRAEziowthRXDrCyLm m71wC74Y3AE3YOJ75SRdR+mSh16Ygztucm61unkUqL9tknRSHClWxMpeoJHazijk z89ZUgf2DrKzj3Vsm/KtLVQsqxe7Bf/SGkeaxIMYD9vReaOzlbHp02kTgQ01pdHb /z8kERd+wn5eOdYw2pUK2D+Bqkaddv1qmHZY+pgQchGjG6wq7Ja3f/CEuPhgW5bW Tp0F6A== 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 4fj68602gg-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 09:54:01 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e095fd889so16098247a91.2 for ; Tue, 21 Jul 2026 02:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784627641; x=1785232441; 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=2uEDiQtnwF1x86R4MeL94Cs9fWflhOZR9a8WmLazXrU=; b=YfYotC1kiCI6gaaRrOcG4oAfyf2qByYRoaudTKzNL4+2Fx36NVcgROiPHc585ddkrU b/wb4D98/DLx3vyPO37BZKbCI9n2aFh4AsYWNnpX/9mxdwonP3plC18VEud3qldeD871 Lk3mrbdwNg21bsn1uxxUkAFG8iiKgSRs04o8D8vQMMOJx/lihZ95j6idkJAsWnK3IFLP Y5B3ble0TuSoVDsgl4boBw1jcwWggkHSvFGl13C5Ewp4rPF0xUBw0QDFoCS+oglEIk21 aI/PgzOZ4GCaktaEFDLK7xLAxrbNUzojQHcPo7M/HUXo8Uec8w6XqBt+QCXNTPTuFlvG tQCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784627641; x=1785232441; 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=2uEDiQtnwF1x86R4MeL94Cs9fWflhOZR9a8WmLazXrU=; b=LhbSV7c9lFvCmNuhmCCpL92pojx9WnPoqO7LoKnvQtTCKq0M24Rdrg+EySkyl3lr4Z YcX4UGJg8f2NMFosm8lpxTAqrgMCmVKfT/Jh25gmlKmw4BT81Kq3yFpDPTCX+ILgOc4x o4GqVHtOoBLrvQwJ6d1dADe7edJGZSIPu+crE94bjNRoQ3TNVtvrZj2GksnNYH3XJgar v2leAsWyjtVsNxXQu9UA6ykCOT/7mrx97jdKeR3qkH8cpdfksww8+yu/sT1sdUn9qctW sz+5FcMx3BFuFXaMVVSP50K31KsZ3bLrfaRhwJeVT0dmyyknxBSTI8hai2TRDszmqv2V ReAg== X-Forwarded-Encrypted: i=1; AHgh+RrzzdCc7C+gIZcwc3n4utCn1wHTaxwgu/pMRg4vQK8kONgoKrbGoROLcXeA/RDOQQLX4/idXbxR7Vd09mg=@vger.kernel.org X-Gm-Message-State: AOJu0YzNuVJZ65A3LN/Qwi3WP0O1LelkUSNVnuy4r4N8zLQTmyAD/OAw zYYy4dyC5kWBBmH89OoVhgG5DScl6QQvsCAhbnmvAQ2uovhvH52svlqXndhw370Bv4LlDhS3gXp 0UwgCB8cEWDXMxpTTa0DnnPuiRm6jYnATWAC5lg46F09V4INO+a4K9p9ya/CcOxW6OeZya4TdOa w= X-Gm-Gg: AR+sD117+aTvWTB9EvOEmK8Z9ULMJfmhOYSwmaNXll1PxQxGCWmt8Xt1LXrFd/51R01 Fj2F4SUFYlUIiJEEmhMv8yOmagjpvn6sZtRLs6xUbpXrdBoEqVIMCotCieXKOoHQSVhTdndsLBi H3MaQGsHqBAgYwmRR4yc3aLaqUJttxClitET8unIcQjSjNscFTRnkMGu9C6h1fxKEpSjsb7pNe7 Q8MVLqG7ukZH6tpF5H2yVlyLjl0WXp/Jk4nyDKWGC9gVqI/M/tkZLMyiRe9/B6hn2oXiNiLL1Ds MNPGXAJ5uuwWft1tPUliubtk1UfH8NaEE8zzlJ1lQ+0Hf5o8HvTTxB83eXE0woHjEA238weVzYN MApVPAyhXbUvSwhvO/T1VzZ4g+WZh734= X-Received: by 2002:a17:90b:2e83:b0:38e:101f:c867 with SMTP id 98e67ed59e1d1-38e4b493606mr18184403a91.18.1784627640736; Tue, 21 Jul 2026 02:54:00 -0700 (PDT) X-Received: by 2002:a17:90b:2e83:b0:38e:101f:c867 with SMTP id 98e67ed59e1d1-38e4b493606mr18184375a91.18.1784627640296; Tue, 21 Jul 2026 02:54:00 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e92064c77sm1285462a91.1.2026.07.21.02.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 02:53:59 -0700 (PDT) From: Sachin Kumar Garg Date: Tue, 21 Jul 2026 15:23:32 +0530 Subject: [PATCH v3 1/2] 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: <20260721-iris_multi_slice-v3-1-adc61a687e7e@oss.qualcomm.com> References: <20260721-iris_multi_slice-v3-0-adc61a687e7e@oss.qualcomm.com> In-Reply-To: <20260721-iris_multi_slice-v3-0-adc61a687e7e@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab 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=1784627632; l=1475; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=WXUGAaHvZcP/oxO0DV+soJrpYB+PVdMtwrpzlji6Ipc=; b=vs8rwZMxtxXyMgaTDhoUDVax1sXib64cOIogOH97iNepIw7SvwkEajjRNyOJA98gM0DisvBlr Lbtv8j6YXVWBsfYk3b/RNjLuectDHKOI+aSuTdX/qrDJv5QfaoA0HEk X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfX32AqYsXtk2QX wtxzP88fFXtWS2VUD4bl1KCs4IDV8TXahO+wjXE+LeDavfwvw3A1O8b/P+kBvUWZrZDFCBm/3N/ AMLotxc0NnmQBsFDRl/nIPu7z6DWBO8= X-Proofpoint-ORIG-GUID: bbHlppcbbkgUmWqW452z74nb1dLbZY2p X-Proofpoint-GUID: bbHlppcbbkgUmWqW452z74nb1dLbZY2p X-Authority-Analysis: v=2.4 cv=X75i7mTe c=1 sm=1 tr=0 ts=6a5f41b9 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=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=LMK2Ni0dcLaqO0rVonUA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfX6xt/sY11fHFt wH2d0irwFkIR2rVwruawsi9lOE26oNWCZ6yHlY/yl3k4Uhr91vTIOkW+fKlXZhAv7cGSQiQ7fp9 yGHng4SA7CWIZApL0NZNj2KvotLDq3snD2a+Otu2EWiHLy470rrCbSa+3WLnK5YxljI1HiUpdF+ BR5WuHJocAtfH8IkuFHfx8L5KBFnmd3C6XWuJXAH/53GSBNyxDn2pC8ihyBiZSXQ4C/A8XIZTHv Q69mq6vG5ritiKkDJbSxfbZhw4LzTRczda21ncSW/hfq+q3cJ5x2eepjUalDT/YhvucC1FqE7OK tCmayaTQtH5dq49KOSIZ2rNUDyz4VL+QoNNp3lWe+K8tzAs3nWNZ+/OZ1WBtAjgFMkGgwAX2xM6 mUbDWzyUuvWHlv5id60m38bzBpI/RQ3YgiyfrcUhZml5NtcRzAhfTf3uaGjacEW8KEmRW4UOqMh 6hCGX3dD4egcA35P8/g== 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-20_06,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 spamscore=0 malwarescore=0 phishscore=0 adultscore=0 suspectscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210104 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 Signed-off-by: Sachin Kumar Garg --- drivers/media/platform/qcom/iris/iris_ctrls.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index 10e33b8a73f6..d7cbf6c3614a 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -519,8 +519,13 @@ int iris_set_stage(struct iris_inst *inst, enum platfo= rm_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; + 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 Sat Jul 25 00:55:19 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 D1AB946AECF for ; Tue, 21 Jul 2026 09:54:06 +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=1784627648; cv=none; b=s34KwQffUo1JYREPASDrFGh043FouolLxNNChY0MsdfYIAnDq70KpTaY0JaXAMLHl8qOo2GgD/7iURUG/2LXBJhkXRZfkBPO+o4tCKXWjFjZ9RaWdsDJsutn42l9Q7DeLvgS7m/aPs/qvvy6sQ4ugKY8PDKOkAmAgmS0VYuAeJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784627648; c=relaxed/simple; bh=G6sXT4iZQ/SavUQVdY3CX17lFIWSmBII451V49PMX/0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i/IJhqVsWvbt9uCLYxM0Jv8zrQCBcV4nRdGOo2AlRhiehtFObYZ23qGFtDQSCoc2Mc00v+0783MVANcnSpopMr9dwCs21l7tImeCMWSKLTKbYQ0NDKJhL8zZ3rbV7TQE9jkHKFFK/VhTbIPAm5wfcbHy0ROebKaPK7wUFKRDU4g= 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=AmfLxN93; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=dOlxEBFn; 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="AmfLxN93"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dOlxEBFn" 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 66L8rrAa527891 for ; Tue, 21 Jul 2026 09:54:05 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= N1NnVdi7HOKftrszVSXfsw0fOgh8RyeVc9f2xhkwLz0=; b=AmfLxN93u/XiAPis NNMVG3BYsHMNIBbzCizaOOGJgRmhhtnB76D4ldxFaEgyj6gwT4buhWmKxZlOFomi ZlaTYZyGMesIvacPIxuE+NOUTQUtdLE8IFvRQn9gC205JM9dZJsez0w4Auz4TQhK ZrV3xfFyULs/koEWeg4fXz1+GlG6AQmeSWWh7o9CQao64PpfsORlnyeSwKxIniiX eaWamX1plyRf94bR3vxMsU58dYOA/hzqqkLiyWaGR2bFuq4nN8H2QdrXiYp5qjgV C2GFQNEazT3ihdDOkQ9Homy7yfUDPsM9QXbviYTONkKZyJce6xhS/qDOt/KWfgsd /sfduQ== 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 4fj1se1f32-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 21 Jul 2026 09:54:05 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-38e2f61c09dso7610527a91.2 for ; Tue, 21 Jul 2026 02:54:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784627645; x=1785232445; 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=N1NnVdi7HOKftrszVSXfsw0fOgh8RyeVc9f2xhkwLz0=; b=dOlxEBFnenvszdywXgwBnwWuoSPG6VnKyia7A+VXKqXJToiZW+k8Jq97/UPqd/9P2R 6TRLt9SQpPACOPJGbcXRX3k2PufRlOft/Gff6qDV6ARX9UN2VkwEWVo0VHDJQ7oL1R7u J+3u5Ly/3Ni8XUbXbSABnlwl5UBC/nB6j6aMeoZ5NFa/Ca2mCFDlN2cK3err6MxC7xSC DDTjmgGgRf9OPm4kpCeHPlLOnBDN7e2WpiWGmnynY5zlH5JEHGOoUnu0zGEn9XVe8QQV C/NTupo4boDNK4+0nrYAt1IlvhcXCPgzwD4Bme/fWpsX+mp815TWEgCJjzlU1yyUWmxF NHWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784627645; x=1785232445; 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=N1NnVdi7HOKftrszVSXfsw0fOgh8RyeVc9f2xhkwLz0=; b=OGad69cGtE8hMmode5aht8z85+D5y81jOQ5VIPs2+1ZRIcLbBb09c4IhZ0RudQDgDH fhIQ+TqtGiyRa+5LYb092lX+S7ES0Ko3zleH+QkHSFGSCIGuyeZqFsqT1glR5D+yejrm eyyUh/izjldyBRcDjuHW0bkfPo85rBuetA8MYqNFC0pPqftMpXgNKNW3l8QgVlSeG7gl Op6DPId2o86gep7KEU/wf7WFSSs8zCMKmxajrWOGUA0x80HnANZ9gkbSGZ7B8hhq7XyP ZVjOGVTS51wvACMjiGW/Bh3H502TC6D6lvYk4/8p8xyLgDTA5bl3yO/ft+25NsMhXQj/ ohig== X-Forwarded-Encrypted: i=1; AHgh+RqAuukBOh0PWESe5Fh9nGZT3V/D1X68RZa1/EoPJro4aPjtaYjuccBYmtXWfeuejGnWHFOb4yVSHknjtSc=@vger.kernel.org X-Gm-Message-State: AOJu0YzeN3hbLmLjjX139Z7Rulr4YaEwB03tUJx4G067rmji2jd+/M1p uPCtz8CAp1mnygRvjLAW+blAVzspzJPUW/c2WLGHEZBZ/ZuQ9VJjEjjPxQSu9zm93JHyhUTNcz6 qDEsRoL8nWxBk+4QaLDr4o2LvpBsZEjxzXk6wHK4gYYgCT3SjlwCwN4sqpty71M26B7LMiO0eAL U= X-Gm-Gg: AR+sD13lwKIPEqXFLaN3SFdl6iucssyQE1ZVIDS7osalpjaj7znYUYS9Jk70aVhSHTy yVarzllMBHEgrZDF8G4pQU762jfBzrbCIKB9E36xK7Tojnr7jAOJ2bETui2/KX2ctD5CLC7ThEr jIkE3BiLnUKXQpOgJyFaV+k1krvr9WXLB6x/CYwHX0G+i4oausmKwOV2vN2D5t5Yty+66/+Sl2u 3USNXr3U/NLhggQPsreJtWG7T+wAe/3FBhNkDYc/0pmW8fQMcJkYsrYjf+9ak5t0CJm1OMCP976 9iiMe8/fi2VyeS3ydRxbhhT01VASlPomi4QhKUOEaAHvAf7SDshPclxdjIjW8Dc76K3gqGiO0Ee PPHjXXUfUxtbCILd+HSyoEm2KNMkSb9g= X-Received: by 2002:a17:90b:1c86:b0:380:9f17:6df3 with SMTP id 98e67ed59e1d1-38e4b420041mr18000757a91.4.1784627644294; Tue, 21 Jul 2026 02:54:04 -0700 (PDT) X-Received: by 2002:a17:90b:1c86:b0:380:9f17:6df3 with SMTP id 98e67ed59e1d1-38e4b420041mr18000732a91.4.1784627643764; Tue, 21 Jul 2026 02:54:03 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38e92064c77sm1285462a91.1.2026.07.21.02.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2026 02:54:03 -0700 (PDT) From: Sachin Kumar Garg Date: Tue, 21 Jul 2026 15:23:33 +0530 Subject: [PATCH v3 2/2] 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: <20260721-iris_multi_slice-v3-2-adc61a687e7e@oss.qualcomm.com> References: <20260721-iris_multi_slice-v3-0-adc61a687e7e@oss.qualcomm.com> In-Reply-To: <20260721-iris_multi_slice-v3-0-adc61a687e7e@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab 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=1784627632; l=11832; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=G6sXT4iZQ/SavUQVdY3CX17lFIWSmBII451V49PMX/0=; b=hM2EsKMqM8YzCBhpg3ldd59niOdKEy+OqNA0U3KAFfMARMhsea9TfOFny49xhlASZjbmez0c1 zY7AA3VCMSsB8cEAuRGNL7CrbXlGURMbcRv7HwmcmodoAvfQZUxXJgH X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Proofpoint-ORIG-GUID: feQCOY0_oXF2JlgR9_HhJIMiSExaJ8ag X-Authority-Analysis: v=2.4 cv=TIZ1jVla c=1 sm=1 tr=0 ts=6a5f41bd 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=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=57x6y-xoAtUlfagzgEwA:9 a=QEXdDO2ut3YA:10 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfX6oAMpPYertU7 bkiN8XOLwAdR5Xbq0T55vrGSHSiL9mG8LOQ/Erf2IyT6JjaNLIMc1ns+p1crOFsWZWyJ9d+Gv0J zzWluf0UYiezsUqB8rXYMdLpDBnoYlw= X-Proofpoint-GUID: feQCOY0_oXF2JlgR9_HhJIMiSExaJ8ag X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfX/0ShxAQMlPxn yi6ZI0cuP1ra2xmMsKk4+GHeGv7Ltc0XKGCkihheKx6HIRuwgh4T5kgssv2yUusKY+fHMb+r3X6 cFWCWO+1E48Q9KXOUOGDE0V6WRZ6tEWZdhcu4fRwGJoFLghY1VMoJxU/z7gmk1nSIFUuFSKGK+W Gn4B9/FLiH/xQgWUhBFb6cLaHYDveMGzmGhKsoNe2NybXeClR+ztJz8Ymbl2anfxPZOejmQ9V74 hJ+THPc+h5TpYqXAmXFafsbXKAzr1TDLluhpoh+sBY7eBhbj4Y/B5wm4/FNvzwLZy8dsQs8NxiY OtxeyuzlWlzKHifpleXfQEDUCNpsr0Glle35WmM9Ct5Wzll0uYohaUQl4DPq/CA1RIRc222jvy4 YNFKZzBfrS7hNR/lodL6jmIC7TVI7zk1Rek1n3c4rsdNnFtJKNf90NRxRQ6B3fCiLtr0Z95AZW/ 3FdT2EpGX1tAIU3EJXQ== 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-20_06,2026-07-20_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607210104 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 | 82 ++++++++++++++++++= ++++ 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 | 12 ++++ .../platform/qcom/iris/iris_platform_qcs8300.h | 9 +++ .../platform/qcom/iris/iris_platform_sm8550.h | 9 +++ .../media/platform/qcom/iris/iris_platform_vpu2.c | 9 +++ 8 files changed, 156 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..36ccb9918921 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,76 @@ 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 iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; + struct platform_inst_caps *caps =3D inst->core->iris_platform_data->inst_= caps; + u32 slice_mode =3D inst->fw_caps[SLICE_MODE].value; + u32 bitrate =3D inst->fw_caps[BITRATE].value; + u32 rc_type =3D inst->hfi_rc_type; + u32 fps =3D inst->frame_rate; + u32 output_width =3D inst->fmt_dst->fmt.pix_mp.width; + u32 output_height =3D inst->fmt_dst->fmt.pix_mp.height; + u32 mbpf =3D NUM_MBS_PER_FRAME(output_height, output_width); + u32 max_width, max_height, min_width, min_height; + u32 max_avg_slicesize, hfi_value, hfi_id; + + if (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) { + dev_dbg(inst->core->dev, "slice mode is: %u, ignore setting to fw\n", sl= ice_mode); + return 0; + } + if (!fps) { + dev_err(inst->core->dev, "Invalid frame rate %d\n", fps); + return -EINVAL; + } + if (fps > 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)= ? + caps->max_mb_slice_width : caps->max_bytes_slice_width; + max_height =3D (slice_mode =3D=3D V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB= ) ? + caps->max_mb_slice_height : caps->max_bytes_slice_height; + min_width =3D (inst->codec =3D=3D V4L2_PIX_FMT_HEVC) ? + caps->min_hevc_slice_width : caps->min_avc_slice_width; + min_height =3D 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, caps->max_slices_per_fra= me)); + 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((bitrate / fps) / 8, + 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..659d15166365 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -100,6 +100,15 @@ struct platform_inst_caps { u32 mb_cycles_fw_vpp; u32 max_frame_rate; u32 max_operating_rate; + 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; }; =20 enum platform_inst_fw_cap_type { @@ -183,6 +192,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 diff --git a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h b/dri= vers/media/platform/qcom/iris/iris_platform_qcs8300.h index 3cfecae80d1e..764acf71c72b 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h +++ b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h @@ -17,6 +17,15 @@ static struct platform_inst_caps platform_inst_cap_qcs83= 00 =3D { .mb_cycles_fw_vpp =3D 44156, .max_frame_rate =3D MAXIMUM_FPS, .max_operating_rate =3D MAXIMUM_FPS, + .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, }; =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.h b/driv= ers/media/platform/qcom/iris/iris_platform_sm8550.h index 3c9dae995bb2..ef87976c2360 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_sm8550.h +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8550.h @@ -25,6 +25,15 @@ static struct platform_inst_caps platform_inst_cap_sm855= 0 =3D { .mb_cycles_fw_vpp =3D 66234, .max_frame_rate =3D MAXIMUM_FPS, .max_operating_rate =3D MAXIMUM_FPS, + .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, }; =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/driver= s/media/platform/qcom/iris/iris_platform_vpu2.c index 6e06a32822bb..39720e7af889 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c @@ -44,6 +44,15 @@ static struct platform_inst_caps platform_inst_cap_vpu2 = =3D { .mb_cycles_vpp =3D 200, .max_frame_rate =3D MAXIMUM_FPS, .max_operating_rate =3D MAXIMUM_FPS, + .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, }; =20 static const struct icc_info iris_icc_info_vpu2[] =3D { --=20 2.34.1