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 A605839184A for ; Sat, 25 Jul 2026 18:09:19 +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=1785002961; cv=none; b=kcnXh0nncKl5OlnSV5mmGLF8CqPcW4FotT02Nx59JSABYicKYLaFDwjpGCcNEwPS0XzKslczm/+rBDcMOCHqejhJ26qSYaMwuvuVBfDgzk76/aAVLwvJllwoW0N1Z2Xjz3Z95UEheD8RocLX/ECh5I7LjjgQRcM4Za028z4AxDI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785002961; c=relaxed/simple; bh=4yrl2silhlvtw6FGr20Rqmve1mPBsRFG2/vp+Vf4ibo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q2ERSc32+xVVbh13dzEPTdPdv+x/qv6K6+T7HWPjflXj3YLZiT5hGxEaq/JDaJuo1PZR9dK1ArjH0idnVqB5r9TfDItl36iTh0Ouwb+x8o0cUi/KqLgoFqvdMoRtzfKsdRSrQpYMvZ5BRXg7eLGwJ5qFCZmQ4IKHpweq+c28wNI= 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=FwrbEUoE; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=c9Gw8cdC; 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="FwrbEUoE"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="c9Gw8cdC" Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66PGvWbV2584813 for ; Sat, 25 Jul 2026 18:09:18 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= 2myjTbU+sj9w7aA3HNe8LFaZ9bqgTxE1758/GCeGuew=; b=FwrbEUoEFYYSgv/B OqGQ7Hmy16ZriYAmQszx3jVS6QUIRdyy6Wyf9ZZVDBQDKmLj0J6dxbkhJTu5fHSb YUx/JmHSzhUYcHcIu1pVJ3eXUwSLadv57x5G/IuPVIy8lpDqHvwIWcwufedRBQE+ eCtMSYp0wAeadNKNvWZfiz3pmVTMjIs9xuDzuoz5b+hajnR/5prAwyLbJXtshZJc mRZt8LNuTFapXGsGkSUYSaCaA7uAUkqkNwUaYoKzOudDpD4X/KnuNo+XedA+dEQu n04AN82Bvcm3fta86xCmCm/vJzYNpuHLeN78gFUumPQJXbK1pmF8lbnHJ6JmxBRu Uy/ewA== Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fmn7v9cuj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 25 Jul 2026 18:09:18 +0000 (GMT) Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-cbbb9c9bfc3so302423a12.1 for ; Sat, 25 Jul 2026 11:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785002958; x=1785607758; 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=2myjTbU+sj9w7aA3HNe8LFaZ9bqgTxE1758/GCeGuew=; b=c9Gw8cdCCbXQvYK7uIPvTA5DlfsKi3LViMpLcd4JbFRG9DvjtvHgqdybV11bx+aZHx rKY+ym/XS6hUTKU0S3bOGODzdNHl2BDZMR40IpHxSwNCyTJ89aC+lrqUsOLVqRGg1Edn bmBDrPaUzOOg18tBycDkcAoPRSR988MV0cu6BGLzNEYUTxlZnTJ1mG9FaBqROCOODbxB R2hAexv3RL3HG0xi6Dj9nwgD5jiR+Ufa/sCo3C+ImABV87oI2T1a+Zsl8qTyikVM+fqW Xtk16SDqNkqRpgQpxgF3ZQ4/d/YwMf7W4IwkI4Lwv/btko4DontWkwVeVjcAAv82FmxJ TGxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785002958; x=1785607758; 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=2myjTbU+sj9w7aA3HNe8LFaZ9bqgTxE1758/GCeGuew=; b=Ju5hGU0gX9lc4L1yKdKQMaIe1eEb16QHD7OaJWfeAugYm/3ozWKkEBh4NyBjiEZb0k KOjse6jpFC96kT2iVzLhFa+oQE9BxXMgEEUuMB23V3TLb6+JQiaoSkCseMxeiA74icC8 FmhYvgQ3pmSh1eoTQr3Yz4xJ/wpZxzRtQ8e9Ga0tuHKXt/AIPmpXrtQbGrJiSFean8SA g5T908lMS5AWsh/Q4WrcD1+v8OxIJbihSJt4xliUdIctuEfQhGYoPGHY8Tvdys177VSP sS2jxPRokl4AI03+uWNGm+lV35yAYUH9AK8j55wDRlraBvfFs6kHZz+5PBizxyB85MXU ZhIw== X-Gm-Message-State: AOJu0YxpxOtrHYaYguv/blRoQWx4ZCQqOOjKkcH0h7OZUAxR2R69ljyP f/Nv3GN0DCC2teKWzkg5SouXL09K5xr5B5pDc+0M6O9qywcxpbOEoccM9blwepdXLSWOycSYniu OPHI9VGs7F2jLxMwp5UBm9NsRslZKEMxEmMAjOqtIKo9BRAnt90LNjl+pB+jY92JYUw== X-Gm-Gg: AR+sD10z2m2ah4eSsri2BFgQy+bzHbjQegU2d4taNrKC289wRRsc3lbr/sNr1I7eLLl WPojVKcUSOoqgY0I4xgq5VQJM0K3PQ83deLyUV6Bd7kGj+r/+GqiOv9I9hGsyjPGiMVKXU+lBk6 8KQNnCn0u+vLAD8xKz3AD66wWXXSZm07+tAkvxfT5Spktk+hxu6fQ8Pvrer1cpbJuidakYSXR5G Nbfd9wJNzs1ENBozaiomLsR5Y1ygXnsde6bCBl3fYRsa7U2BuMUGLMnv++dLL+pKxSl51zQENTr SV88ScFLHVEe19tZVHA1j03b8g1nZW0uhHC1SJdMl82V+aYPWOTZrZgnKo032oCmoCxPl3Yme9F 3v79WpbnklVLPVPhYLeGOrGWSQzxklqk= X-Received: by 2002:a05:6a20:c90b:b0:3bf:6237:4d46 with SMTP id adf61e73a8af0-3c67da812bbmr3028869637.28.1785002957569; Sat, 25 Jul 2026 11:09:17 -0700 (PDT) X-Received: by 2002:a05:6a20:c90b:b0:3bf:6237:4d46 with SMTP id adf61e73a8af0-3c67da812bbmr3028845637.28.1785002957108; Sat, 25 Jul 2026 11:09:17 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc419c52sm12592642eec.10.2026.07.25.11.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 11:09:16 -0700 (PDT) From: Sachin Kumar Garg Date: Sat, 25 Jul 2026 23:38:53 +0530 Subject: [PATCH v7 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: <20260725-iris_multi_slice-v7-3-b4365c4930fe@oss.qualcomm.com> References: <20260725-iris_multi_slice-v7-0-b4365c4930fe@oss.qualcomm.com> In-Reply-To: <20260725-iris_multi_slice-v7-0-b4365c4930fe@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=1785002937; l=12988; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=4yrl2silhlvtw6FGr20Rqmve1mPBsRFG2/vp+Vf4ibo=; b=TGnOSmkcvFvUVSlYkC89IQ2gAn5CsHi1tmK5+nPFuq90B5EPKz0YA6f2wNbUxILdCzMhVHAU2 4N1nGq8oGfNC6ypBoLjSfAwkous/8630XVVNapLQ6TLW18V91uq5mmV X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Authority-Analysis: v=2.4 cv=GKk41ONK c=1 sm=1 tr=0 ts=6a64fbce cx=c_pps a=rz3CxIlbcmazkYymdCej/Q==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=gowsoOTTUOVcmtlkKump:22 a=EUspDBNiAAAA:8 a=OAqk7MT-k0GzjPOkeSUA:9 a=QEXdDO2ut3YA:10 a=bFCP_H2QrGi7Okbo017w:22 X-Proofpoint-GUID: KBSrtOy5xcdVnZP6oiFA27h4Ha5Lkc0G X-Proofpoint-ORIG-GUID: KBSrtOy5xcdVnZP6oiFA27h4Ha5Lkc0G X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI1MDE3MiBTYWx0ZWRfXxRi84mTK4aGP vcXalfyzlhqRA1mu78FTVO3THB+EXHoTvEX4n5JtkIVPx5zhpuewFZEfbGoSDR1F8Yv10t1DjTW CC/rVcB/mt2/1anTlDT0qU4CHoSEak4= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI1MDE3MiBTYWx0ZWRfX/fpCm17QSAaX 2O+MzgaQv1RoOC4k5Z07b53N+bwgPPTowus4iYzpect6QwWFTlRVzZo//8hE60Vsdo0C2G69JTO CK2gX07Cf2q4VKrk6Nl/2JdpwaJJu9IQENCci98yJqD+P/Z1aw4Zx1uFA0YFns69NVD0213KBu2 SIY6EhDE5QfNcezrZD8Vcwu7ctHFxBA6lY8jyPt/3qs1WBlVJ5etYAHyTmNMMXF5Ipa+H5iCgAq iwDaCzkhDD2G6CV9GIdvdWn3jerRykHln1/UgNfBF6rry0NPUYvkbxwk0JvntPVz/fk8rrw3PuR oaXpuys+yFCTUWRLIGSxeE4ZcWWLnM8vQahySXpcxFSR2djz+s3NC+sQw9WHvd7gv9EkQ40H+o2 GhXBrdgNsTrbZTSNYsptQabi4ZZKH90e9BpTCZFgzJDQKGwHJKMCY1znmJgCMo7hSGXBe703u/0 l9C/XEjhjuApTYCn0yg== 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-25_05,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 clxscore=1015 bulkscore=0 suspectscore=0 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607250172 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 | 45 ++++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 + .../platform/qcom/iris/iris_platform_common.h | 17 +++++ .../media/platform/qcom/iris/iris_platform_vpu3x.c | 5 ++ 6 files changed, 155 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..351310dee12e 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, enum platform_inst_fw_cap_typ &bitrate, 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 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 platform_inst_fw_cap_type c int iris_set_layer_count_gen1(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_layer_bitrate(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 acc0ed8adda1..a61a2852f4b6 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 @@ #define VIDEO_ARCH_LX 1 #define BITRATE_MAX 245000000 +#define MAX_SLICE_MB_SIZE \ + (((4096 + 15) >> 4) * ((2160 + 15) >> 4)) static const struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = { { @@ -937,7 +939,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_layer_bitrate, - } + }, + { + .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[] = { @@ -1118,3 +1149,15 @@ const struct iris_firmware_data iris_hfi_gen2_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 slice_caps_vpu3x = { + .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, +}; 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 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/drivers/media/platform/qcom/iris/iris_platform_common.h index c9256f2323dc..849b96fc6272 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -52,6 +52,7 @@ enum pipe_type { extern const struct iris_firmware_data iris_hfi_gen1_data; extern const struct iris_firmware_data iris_hfi_gen2_data; +extern const struct platform_inst_slice_caps slice_caps_vpu3x; extern const struct iris_platform_data qcs8300_data; extern const struct iris_platform_data sc7280_data; @@ -88,6 +89,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; @@ -183,6 +196,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, }; @@ -315,6 +331,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/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c index 2c63adbc5579..546018b43541 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -110,6 +110,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 = &slice_caps_vpu3x, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 2, @@ -139,6 +140,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 = &slice_caps_vpu3x, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -176,6 +178,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 = &slice_caps_vpu3x, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -205,6 +208,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 = &slice_caps_vpu3x, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 4, @@ -240,6 +244,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 = &slice_caps_vpu3x, .tz_cp_config_data = tz_cp_config_vpu3, .tz_cp_config_data_size = ARRAY_SIZE(tz_cp_config_vpu3), .num_vpp_pipe = 1, -- 2.34.1