From mboxrd@z Thu Jan 1 00:00:00 1970 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 9BAEA387585 for ; Sat, 1 Aug 2026 06:45:16 +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=1785566718; cv=none; b=JyKFWfgpwP+8EubLaA27/Bk6yH+DEqJUKnHxAMh0AI8c+8ejS2jA/VdEHbtfBORWS6+QdiUjkNSy5JIalGtgpSERKiN4Y8ZfSpsXTa900lZxU8JohTT4tcyVqFqX3MWOcpkxdc+7nZkq1Ulr2VYE38XMfsd7185sMB/d+hdW3Qo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785566718; c=relaxed/simple; bh=g5e5wEgM//Oxq0aARbCIi1ZTdLE85qjGXttsbsEInWk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cYsVnhumOdNf/65qTv6xiqXl15PaIywneN76uez9+URQpNMFfV6px04cpHZEigiujQXTAWwjsFaEUcnD6WNnoCs1NUBercp19VZ0VQj4l7QIK4fnwuuCKq+t3SwSvecOTPUPgmqTuTym5pTgXaii8syEpYjo7DrkDLRQS4oprZ4= 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=eBt7Q4x5; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=glrhBLsJ; 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="eBt7Q4x5"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="glrhBLsJ" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6713jW7c1688641 for ; Sat, 1 Aug 2026 06:45:15 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= Vsz5hZ4+vFrzUamEfCpg9YkKUH8w6LIoEYMgVlaKiX0=; b=eBt7Q4x5xCZwIhva NN0pU3mP+tmlRNJO0HL2LvIkbQYe3vTa2qeSvi84FgewVEa1L3MqmsNPiQFsBeXB TVUlGkim1w+VAsyOCojx+zVo2LIfdn7cQu9lDjWF/ryLngWvOQNviqBdcu/CeDk+ PkSJgEyj6wSo2Z8Jy8NbjP2K3AZ0HYOJkbW1AjWOiOxp5MzUx4WKIBkRn2JBl+f7 POSySwTHOv9YV/NBEVgxv5dJAuKCb0jurvFeudcTns2txmdSOGS5nFDU/SCR1Obo fVhaoyQZXnr36XQuk1i8HmhbFnsxr0VUkiOmw0syQD3rQuZ/QXn7dt1Ygl/QwYPq lmxxlg== 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 4fs9668agd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 01 Aug 2026 06:45:15 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-38ec0f510a9so4170177a91.2 for ; Fri, 31 Jul 2026 23:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785566714; x=1786171514; 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=Vsz5hZ4+vFrzUamEfCpg9YkKUH8w6LIoEYMgVlaKiX0=; b=glrhBLsJyIMNqBIyg6mrg5YREzny9OJWIWGBwunMNIjCOiHPDlhxJ4MLc5HqY+hiMv DMWDDYeTPOAvr1SjekHPJj6Gftsm2AEXtnAihz0jUd18da2vChYxaoQlgLYdEbFoSwt1 gWXBErsxVaV/njYUK6Xdmek6SVhUXmVRc9xCC6PuKZqXKObEeVYodPhvcYzrh3PqQqnq HY1xIKeyb2YFaB7lOSShlgqQGzUHOhd1xX+36shulNepvDu7pOKijiuWLC+fztSpQ1pZ 6Y7QrnwHUZ+fFuBJR074QkrLEGFAAYmd2JybAmzIZB9GUqVPV4KOjgdn98y1SuWO/lPd kg7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785566714; x=1786171514; 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=Vsz5hZ4+vFrzUamEfCpg9YkKUH8w6LIoEYMgVlaKiX0=; b=ZVxIMpNuTZESY0Wm8dskKFhNLMfEqTzxCFe6kfNQNOLzCAcQEMB1A9bV6n/BxfiaNB fmWfLR251A95FltHgs5pazUT2LIG5oACD7DqhW0UDhlbrWoWYHjF0+ldyebtz/3AI7IM cG2J3iqgTqDtD6mxlkOBgcJZdX+yRFm/POBlrgNRZs3IT13G2YdORvMjTifKAT82w6kh lIWD3q1trMbPjYChwxu5JOhhvvNgzxxmS5HmkEVTHfIxKdNggQZNXxJmdXG69cSyAXLl 1AY4iK9lMpzdhOwJ4hJ6hio1D0T1R390SWU7anypC7paxm+4jzWY2fYRcYGlZ+LPMN6B syBw== X-Gm-Message-State: AOJu0YywDsk8HWglWutK7vrrpsJ2eqr5lmaQkjSDaOWLgv2Ivtf1kjr+ +AgPWI016K3xMUXairi7MsXQqFRvThVJVa4iOdO156UcDU17szFfAKf6VZnU5C29awqcOLlQMSa lVxY+xR6T2BWLWpk+EZDBTHXmq89mE7MR24igc6P6RreQExaQy9eE8Nn+yYqHvn3yavyv4XVI3A == X-Gm-Gg: AR+sD12yIe54pJ6HAZx0PJJ6GLBTwtVVApNVDDhzb1sn0s5EUQ4gzdK/kePQJ1GHfl6 Tn/V+jpRbhz5XVMlOn89QLVhiosKQxJ/ZwabpSfG/q27e2iFDKvkH/ixqFMg0woLU6KvuF+T70Z Y+Xn9HYiP3FP+j9L8YW4NzLMKAxrFi8zqRkA+bzlVawB4k4mn6+f5S3WRGobD3hjTkTHld52P3X nUpLBMB6iv65i0a7I3FriwVLFHPBNYi0Ckqf3ghcwQMVYwQP5TUIEeXfxL6ZnUaDuD5613c5YqY JbpYajW+MqfDy4PxyPYwmU4I4hboOdUxgFJ9FHWNLwmHABlcDqDrWGo4Eg4GB8/SceORUZUXTUz BktNoTdEk2IOILZHkNMyQAOMkoe39N/A= X-Received: by 2002:a17:90b:3a10:b0:38e:79f:76c6 with SMTP id 98e67ed59e1d1-38fbc4cffc7mr2248151a91.24.1785566714365; Fri, 31 Jul 2026 23:45:14 -0700 (PDT) X-Received: by 2002:a17:90b:3a10:b0:38e:79f:76c6 with SMTP id 98e67ed59e1d1-38fbc4cffc7mr2248115a91.24.1785566713855; Fri, 31 Jul 2026 23:45:13 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3153ddda5d9sm16863759eec.13.2026.07.31.23.45.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Jul 2026 23:45:13 -0700 (PDT) From: Sachin Kumar Garg Date: Sat, 01 Aug 2026 12:14:50 +0530 Subject: [PATCH v9 3/3] media: iris: add support for multi_slice in iris encoder Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260801-iris_multi_slice-v9-3-bddf1449c280@oss.qualcomm.com> References: <20260801-iris_multi_slice-v9-0-bddf1449c280@oss.qualcomm.com> In-Reply-To: <20260801-iris_multi_slice-v9-0-bddf1449c280@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Vedang Nagar , Stefan Schmidt Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, 20260731-iris-ar50lt-v9-0-d71a782001c0@oss.qualcomm.com, Sachin Kumar Garg X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785566693; l=16396; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=g5e5wEgM//Oxq0aARbCIi1ZTdLE85qjGXttsbsEInWk=; b=R+wfFmucs8Kpd82nTbOgywCc1hLVOVS7+nzythzeUJwlbTVd4KLPg3DLVwpa5yUy3LXkiRDBN DOzAqNr4FlHBzuHoXjgVk4etTNvjnNVnN0hqbYwpJdWkDQjjV/KVLUP X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Proofpoint-ORIG-GUID: 0ny8mgc0g6x5qOIiSd4OGVmvIEZvWGd1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODAxMDA0NSBTYWx0ZWRfX5hEtw8I8eOlS oodShTgQad67jigvXL6n/GZh2yUWcgqUQYJtYiyhqJObn3LfT7a/yF5uBzUIW5wtytDRKA0XvYR IyuJwMXgzOq+c3Ir9bs1iOotmUgHDQ9r0l9Oafi2+GsKWPb73Z30PGoNse6JPEwyW3+W2Wf9tkR fA7woeC+LvfQuWUcr8vI5JmGQEWMPOVxVeY1xkNZK8OE6W7FU9u77ttlKb/Agf+SIEfIxgS0BPj 7XxIzAIGBKwmcsSArimwwoHZgddA0cS8ksc7eey3Pk9lVRctEnJx7YrzJ9km15ZxrPOqP0DFhLZ mwcJgwVceVXn1PyOWSZzgU+YeHoV0CIEgiImTaY9hj7hcH0KAL5RiP6JJQDEgyHSWvnWoK6Z3pa zoJy/gAP0eejzosXnOZDY6ExXJAKWCa4ZIARcJnen4Jii3pWEKYlBrth5E+JWzxO4BT9/iI8kAh 8bPUnKey4ADjyhizRzw== X-Authority-Analysis: v=2.4 cv=TpfWQjXh c=1 sm=1 tr=0 ts=6a6d95fb cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=kXu9VXDJVZD71FLFU1YA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-GUID: 0ny8mgc0g6x5qOIiSd4OGVmvIEZvWGd1 X-Proofpoint-Spam-Info: AW1haW4tMjYwODAxMDA0NSBTYWx0ZWRfX6cooIgAcnb9C 4wQqhKtnqOcPb4mGryf9eSGRoJC0GZp7b8yCmEh3op2gnFo5Q9bAk/AP1a992e01u+rwNqN1XqF w0yvhf3ARaZueLJkHy9JJ33ZeY6PHQo= 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-31_07,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 clxscore=1015 suspectscore=0 malwarescore=0 adultscore=0 bulkscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608010045 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. Reviewed-by: Vikash Garodia 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 | 86 ++++++++++++++++++++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 + .../platform/qcom/iris/iris_platform_common.h | 18 +++++ .../media/platform/qcom/iris/iris_platform_vpu2.c | 1 + .../media/platform/qcom/iris/iris_platform_vpu3x.c | 5 ++ .../platform/qcom/iris/iris_platform_vpu_ar50lt.c | 1 + 8 files changed, 200 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c index 98d4ec122da9..8c4c47944f22 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -156,6 +156,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id) return LAYER5_BITRATE_HEVC; case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: return REQUEST_SYNC_FRAME; + 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; } @@ -301,6 +307,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id) return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; case REQUEST_SYNC_FRAME: return V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME; + 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; } @@ -1526,6 +1538,80 @@ int iris_set_time_delta_based_rc(struct iris_inst *inst, enum platform_inst_fw_c &value, sizeof(u32)); } +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 = + inst->core->iris_platform_data->slice_caps; + const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; + u32 output_height = inst->fmt_dst->fmt.pix_mp.height; + u32 output_width = inst->fmt_dst->fmt.pix_mp.width; + u32 mbpf = NUM_MBS_PER_FRAME(output_height, output_width); + u32 max_width, max_height, min_width, min_height; + u32 slice_mode = inst->fw_caps[cap_id].value; + u32 max_avg_slicesize, hfi_value, hfi_id; + u32 rc_type = inst->hfi_rc_type; + u32 fps = inst->frame_rate; + + if (slice_mode == 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 != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR)) { + dev_err(inst->core->dev, "slice unsupported, fps: %u, rc_type: %#x\n", + fps, rc_type); + return -EINVAL; + } + + max_width = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ? + slice_caps->max_mb_slice_width : slice_caps->max_bytes_slice_width; + max_height = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ? + slice_caps->max_mb_slice_height : slice_caps->max_bytes_slice_height; + min_width = (inst->codec == V4L2_PIX_FMT_HEVC) ? + slice_caps->min_hevc_slice_width : slice_caps->min_avc_slice_width; + min_height = 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 == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) { + hfi_value = inst->fw_caps[SLICE_MAX_MB].value; + hfi_value = max(hfi_value, DIV_ROUND_UP(mbpf, slice_caps->max_slices_per_frame)); + if (inst->codec == V4L2_PIX_FMT_HEVC) + hfi_value = (hfi_value + 3) / 4; + hfi_id = inst->fw_caps[SLICE_MAX_MB].hfi_id; + } else if (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES) { + hfi_value = inst->fw_caps[SLICE_MAX_BYTES].value; + if (rc_type != HFI_RC_OFF) { + max_avg_slicesize = 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 = DIV_ROUND_UP(output_width * output_height * 3, + slice_caps->max_slices_per_frame); + } + hfi_value = max(hfi_value, max_avg_slicesize); + hfi_id = 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 = 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 5180d53d3c90..08db80744420 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -49,6 +49,7 @@ int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_time_delta_based_rc(struct iris_inst *inst, enum platform_inst_fw_cap_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); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c index 3e752f69e414..79bbd06ef8d2 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -13,6 +13,10 @@ #define VIDEO_ARCH_LX 1 #define MILOS_BITRATE_MAX 100000000 #define BITRATE_MAX 245000000 +#define MAX_SLICE_MB_SIZE \ + (((4096 + 15) >> 4) * ((2160 + 15) >> 4)) +#define MAX_SLICE_MB_SIZE_AR50LT \ + (((1920 + 15) >> 4) * ((1088 + 15) >> 4)) static const struct platform_inst_fw_cap inst_fw_cap_milos_dec[] = { { @@ -1782,6 +1786,35 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_req_sync_frame, }, + { + .cap_id = SLICE_MODE, + .min = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .max = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, + .step_or_mask = 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 = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + .set = iris_set_slice_count, + }, + { + .cap_id = SLICE_MAX_BYTES, + .min = 512, + .max = BITRATE_MAX >> 3, + .step_or_mask = 1, + .value = 512, + .hfi_id = HFI_PROP_MULTI_SLICE_BYTES_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = SLICE_MAX_MB, + .min = 1, + .max = MAX_SLICE_MB_SIZE, + .step_or_mask = 1, + .value = 1, + .hfi_id = HFI_PROP_MULTI_SLICE_MB_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + }, }; static const u32 sm8550_vdec_input_config_params_default[] = { @@ -2814,6 +2847,35 @@ static const struct platform_inst_fw_cap inst_fw_cap_gen2_ar50lt_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_req_sync_frame, }, + { + .cap_id = SLICE_MODE, + .min = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .max = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_BYTES, + .step_or_mask = 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 = V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + .set = iris_set_slice_count, + }, + { + .cap_id = SLICE_MAX_BYTES, + .min = 512, + .max = BITRATE_MAX_AR50LT >> 3, + .step_or_mask = 1, + .value = 512, + .hfi_id = HFI_PROP_MULTI_SLICE_BYTES_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = SLICE_MAX_MB, + .min = 1, + .max = MAX_SLICE_MB_SIZE_AR50LT, + .step_or_mask = 1, + .value = 1, + .hfi_id = HFI_PROP_MULTI_SLICE_MB_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + }, }; static const u32 iris_hfi_gen2_ar50lt_dec_ip_int_buf_tbl[] = { @@ -2880,3 +2942,27 @@ const struct iris_firmware_data iris_hfi_gen2_ar50lt_data = { .enc_op_int_buf_tbl = sm8550_enc_op_int_buf_tbl, .enc_op_int_buf_tbl_size = ARRAY_SIZE(sm8550_enc_op_int_buf_tbl), }; + +const struct platform_inst_slice_caps iris_vpu2_vpu3x_slice_caps = { + .max_slices_per_frame = 128, + .max_slice_frame_rate = 60, + .max_mb_slice_width = 4096, + .max_mb_slice_height = 2160, + .max_bytes_slice_width = 1920, + .max_bytes_slice_height = 1088, + .min_hevc_slice_width = 384, + .min_avc_slice_width = 192, + .min_slice_height = 128, +}; + +const struct platform_inst_slice_caps iris_ar50lt_slice_caps = { + .max_slices_per_frame = 128, + .max_slice_frame_rate = 60, + .max_mb_slice_width = 1920, + .max_mb_slice_height = 1088, + .max_bytes_slice_width = 1920, + .max_bytes_slice_height = 1088, + .min_hevc_slice_width = 384, + .min_avc_slice_width = 192, + .min_slice_height = 128, +}; diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index f43aea10090d..2b8b057d35a9 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -72,6 +72,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/drivers/media/platform/qcom/iris/iris_platform_common.h index 5593820bbf8a..cddab9a9c375 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -59,6 +59,8 @@ extern const struct iris_firmware_data iris_hfi_gen1_ar50lt_data; extern const struct iris_firmware_data iris_hfi_gen2_data; extern const struct iris_firmware_data iris_hfi_milos_data; extern const struct iris_firmware_data iris_hfi_gen2_ar50lt_data; +extern const struct platform_inst_slice_caps iris_vpu2_vpu3x_slice_caps; +extern const struct platform_inst_slice_caps iris_ar50lt_slice_caps; extern const struct iris_platform_data milos_data; extern const struct iris_platform_data qcm2290_data; @@ -98,6 +100,18 @@ struct tz_cp_config { u32 cp_nonpixel_size; }; +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; @@ -194,6 +208,9 @@ enum platform_inst_fw_cap_type { LAYER5_BITRATE_HEVC, REQUEST_SYNC_FRAME, TIME_DELTA_BASED_RC, + SLICE_MODE, + SLICE_MAX_BYTES, + SLICE_MAX_MB, INST_FW_CAP_MAX, }; @@ -325,6 +342,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_vpu2.c b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c index e594c7a25db3..becbe3776544 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c @@ -127,6 +127,7 @@ const struct iris_platform_data sc7280_data = { .inst_iris_fmts = iris_fmts_vpu2_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu2_dec), .inst_caps = &platform_inst_cap_vpu2, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu2, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu2), .num_vpp_pipe = 1, diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c index b8099d7ce556..e963cb116313 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -112,6 +112,7 @@ const struct iris_platform_data qcs8300_data = { .inst_iris_fmts = iris_fmts_vpu3x_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps = &platform_inst_cap_qcs8300, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 2, @@ -143,6 +144,7 @@ const struct iris_platform_data sm8550_data = { .inst_iris_fmts = iris_fmts_vpu3x_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps = &platform_inst_cap_sm8550, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -182,6 +184,7 @@ const struct iris_platform_data sm8650_data = { .inst_iris_fmts = iris_fmts_vpu3x_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps = &platform_inst_cap_sm8550, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -213,6 +216,7 @@ const struct iris_platform_data sm8750_data = { .inst_iris_fmts = iris_fmts_vpu3x_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps = &platform_inst_cap_sm8550, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -250,6 +254,7 @@ const struct iris_platform_data x1p42100_data = { .inst_iris_fmts = iris_fmts_vpu3x_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_vpu3x_dec), .inst_caps = &platform_inst_cap_sm8550, + .slice_caps = &iris_vpu2_vpu3x_slice_caps, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 1, diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu_ar50lt.c b/drivers/media/platform/qcom/iris/iris_platform_vpu_ar50lt.c index 99c839a0424f..43460b82ae77 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu_ar50lt.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu_ar50lt.c @@ -103,6 +103,7 @@ const struct iris_platform_data qcm2290_data = { .inst_iris_fmts = iris_fmts_ar50lt_dec, .inst_iris_fmts_size = ARRAY_SIZE(iris_fmts_ar50lt_dec), .inst_caps = &platform_inst_cap_ar50lt, + .slice_caps = &iris_ar50lt_slice_caps, .tz_cp_config_data = tz_cp_config_ar50lt, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_ar50lt), .num_vpp_pipe = 1, -- 2.34.1