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 9C7B447D945 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=Idif/oq/SgnsfTBmroZgSSTSG920glbNKA2/Oy+Hg+6vk/whbLCkQzQrqGCXyG9qJ/NT1AVG+JnV5oiR5zwzRFOIULDhVUmSJZuS51BRSd0bIqcPP+LBg6+4Mrj+tSZWBW8YxMT6hes8cwEZRtfUjPnhZ2poRR6VHK2vNe9JALQ= 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=KWatO+mB; 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="KWatO+mB" 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 66L9XFG41389930 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-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fj68602gu-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-f72.google.com with SMTP id 98e67ed59e1d1-38e8e864ef0so1764849a91.0 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=1784627644; x=1785232444; 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=KWatO+mBB8y4FNUO1kZ3GH7wuffCQmzENg8nG7aQTKHzW5GJwJppLVeLAg2RjBnAZ9 Nd+R6lCBdjinRgBBGKmNnUxtdPY4AkyRSvn93gSYK/rTDVzDKh4SAS0PbPeV8OZJUiyv Ev6zHKltR+/BDSBJ23JwX2YL2TNYrO6krXprTRGGd/EscHmjEWJib2TGabdopUQx9l0+ qPeNWl89QR5D2qkVz5mK1G2jri6nILGWHCYbUMLL1MaOxxorVrf/DU82zno3Cl16Eknr omgskpkodXHaC54vRJZFrr6fsvEfMVlQWlD0HyqPLvEr7WnpHziIYj4Q4JXs0YtkxKUP rg2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784627644; x=1785232444; 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=g09avy+xHgO/pnwcycAlsZtWIUGtu/dxheh9Gj/5rOdnfIZzg6Lyg3QOfPW2561UFv KTMB6tECkxxJPr4/yumVkOrBDbHMzxLKfcdl29U2+AvLByszmPuBw0YyJEQkpgEYNXZC QZOAatgdQliGXhE7PXIE4zLcCPG8N4+Sy9+dLWLf2L72MjsZ8bwPlzNtmzv/OrfIy6l+ oItqnBjV3rbnFWuFadq5tf6erSksG+mV/YngZy6ebdvvOFDqY2U026GFAB/oMwX6f64S xV3QwnZUqlniKsE7SW5PuCGN1hRZw/IVPAejbaRmi77qW00lU/PR36K6cao30KSadORw BErQ== X-Forwarded-Encrypted: i=1; AHgh+Rqj8OQ0e7jHLnz9GL1yD38W0r7p4lGwc3u8QXuVPWGonStU4MiW0rz5jdnXovBtXhP12bFBcy93FPBPtpaC@vger.kernel.org X-Gm-Message-State: AOJu0Yzr2NmrfA782jTPJHLCfcQX4vJqknM01FQ9hyBT3UPGAaw7ty3b Qdq6HpMdUyOQBW5aNsWPAhQFV8LP4e/WxY496LI0MbtnBzkVMZyc3hDoYs+dsKg1AkX9MUcL8+w cHFgx8S5lwMb2xVkZz/Wk/6k/46xH8uEVpVvAKMoccCwNKQCMGVJ5IkVGb/OYj4Je3w5U X-Gm-Gg: AR+sD12rJcIRD9DFZeVXzv/biGQjU0LtcStwROJ4/2Af4t3E6jY4xDP1Xf92Yyvy3IV 1NLhg/BgpiPkpir4eI7uU51UN2mzRF75JLGmEzzieG5nX5jqXs9NcWhvX1sMxNv8qR5BBVTM1P8 mWNvusUO6Jsl/FtFRgjRg4ozqXvM47pri65iQHEp/wfV3uCZ3RnXVErC5avVjWf48HfVockcQDH SaF3L5nvVAkIVvM/xcTXwkSZJg/Kn6meIu+ZaJ6fOqJPtnxjzxy1MIjAfX52lRGEHFyGXRsbPqm AR9X6Q4TL7gUdzI7dyQAEaNLz25aOYBHbmEYxRNDGQuEu++pMw+Tl4aGSlJvN7IFMu9UWH9Tsvl 67vnYmFcEAml2zCUc88nLsZ580M16Q2k= X-Received: by 2002:a17:90b:1c86:b0:380:9f17:6df3 with SMTP id 98e67ed59e1d1-38e4b420041mr18000754a91.4.1784627644290; 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-arm-msm@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: <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-Spam-Info: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfX/romL6+N4YyX oHFAdEODqlXDeNoFmCN1G1IqLLVTli6bbNLNZyTThnJFB2gV4Vrdm5KV16YHSjoRt0DN0d0tgwQ GKR4ANWYkJckCBRlYHLyK4w7dJBXias= X-Proofpoint-ORIG-GUID: TXEVTjoY_H193HFWzn631j6osX-LPAU3 X-Proofpoint-GUID: TXEVTjoY_H193HFWzn631j6osX-LPAU3 X-Authority-Analysis: v=2.4 cv=X75i7mTe c=1 sm=1 tr=0 ts=6a5f41bd cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==: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=57x6y-xoAtUlfagzgEwA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIxMDEwNCBTYWx0ZWRfXyzqjlwHZPB0b MzdNKDXaW0BH+IaEwY8jLYlMYsctsKMkXVAppI2A2YfYgriscMFmHNZVP6ubvdyHDvAP3XT9mij HgbSX615FHhNPNW25qkkGFKSxL9oZq2tQ5F2r6vEojlotGodt/jX46Dcc6J10Gxl3k8UM3bkuLu j9iVR8SiE5sR0QSE0OQbHa1I5mm+hOYC7gR81vC2Y8VK0yHgrxpwMYdhXWdKhInP6in80EGMSFu R7fl3m9qccrD8RuU+jJK6wvD7ZNGBmKgOG2atLcRjk+vtCaVvdLUpSEoBIARmlFIemG0L5Va4nd 5yfMi9VxmTQQHeOD3epW+vUsHhgmqrAUoD64dyyAZxsg7ygbWTXSKCrsJ2oLuqZjvABZmMFnoV6 7HU5Hzi0tiPkIi95lHPRk7TWyqQZQugpsMnxdmD6NlUICfHRyj3vDSCqD0a26/P0x04640HY09f YeZxAwLU0DwF6BXAHJw== 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 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, 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 iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; + struct platform_inst_caps *caps = inst->core->iris_platform_data->inst_caps; + u32 slice_mode = inst->fw_caps[SLICE_MODE].value; + u32 bitrate = inst->fw_caps[BITRATE].value; + u32 rc_type = inst->hfi_rc_type; + u32 fps = inst->frame_rate; + u32 output_width = inst->fmt_dst->fmt.pix_mp.width; + u32 output_height = inst->fmt_dst->fmt.pix_mp.height; + u32 mbpf = 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 == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE) { + dev_dbg(inst->core->dev, "slice mode is: %u, ignore setting to fw\n", slice_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 != HFI_RC_OFF && rc_type != HFI_RC_CBR_CFR && + rc_type != HFI_RC_CBR_VFR && rc_type != HFI_RC_VBR_CFR)) { + 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) ? + caps->max_mb_slice_width : caps->max_bytes_slice_width; + max_height = (slice_mode == V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_MAX_MB) ? + caps->max_mb_slice_height : caps->max_bytes_slice_height; + min_width = (inst->codec == V4L2_PIX_FMT_HEVC) ? + caps->min_hevc_slice_width : caps->min_avc_slice_width; + min_height = 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, 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((bitrate / fps) / 8, + 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..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 @@ #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[] = { 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..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; }; 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, }; diff --git a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h b/drivers/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_qcs8300 = { .mb_cycles_fw_vpp = 44156, .max_frame_rate = MAXIMUM_FPS, .max_operating_rate = MAXIMUM_FPS, + .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, }; #endif diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8550.h b/drivers/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_sm8550 = { .mb_cycles_fw_vpp = 66234, .max_frame_rate = MAXIMUM_FPS, .max_operating_rate = MAXIMUM_FPS, + .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, }; #endif diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/drivers/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 = { .mb_cycles_vpp = 200, .max_frame_rate = MAXIMUM_FPS, .max_operating_rate = MAXIMUM_FPS, + .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, }; static const struct icc_info iris_icc_info_vpu2[] = { -- 2.34.1