From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3034F439349 for ; Thu, 23 Jul 2026 10:21:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784802104; cv=none; b=mN1xT7bnhaWmFAEzs98843SLbqR7Cq5/0dvTH1QE9mhVmPI6vrDW/2Wvhl244keE7zxGNIaKjIV/KPC61BH7O9zlJmmFQeCbjahg6NtZ2xvoAmbD5B6v1sWGZhkLLPyinBPcYokh1Bb2VlcIjnrPw4krkkZ4bYXFweCO97aNS7s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784802104; c=relaxed/simple; bh=Jrmp4oYllEsqyN2JsTQx+3qPkNleZgGlTzp8V8q5ivc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hs9yJPI9/kch8ternIiE7CyCZZ0Gph5cia/y8odUAh25oR/WdmQGaoKTHdzixmf23o965j/gd85rQnxlWW/7RMOcJiUTKfSAcykbU/mTmpWutjNfUDdyUX13gP6+8eu1uOO1/SRu5GXWZ/OKFfJ+NxQ9SvOJJguMPiTaqzjYPSI= 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=CuAzjlmf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=L7F+2pP0; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="CuAzjlmf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="L7F+2pP0" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66N8qUWO3260948 for ; Thu, 23 Jul 2026 10:21:41 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= 8GLR1CneDZmYyQyMh23eDtFtUTycwoEAiCoN5g9oI4s=; b=CuAzjlmfAQiBmdgD YWXZlBSwVaiRXWiNr8emYSr7oVeZXR1A2JDFO7LrVzQDHRpjWwZSKy2LMCIM7C96 VSnYaQIts1xZklS+37XGLkMHfDbf7AcsOy0gGdPszDN9+g0gjkRcAI143NzbjMXm HaKDXasZrAV3uShbm1PNhg/ifLU1G5QLV0t5QNDIsi4CK48xQD4x8UPZEmBLo2HZ +8MUQrGiZ6QNoqOcexqUuFxnvfwggFOvsyVk8wK+pkHGmUSiwa0oWMdjlKbhGVX8 +0Uzq9c0e/L+RmWBPZPJ2AZDGRO4ITkavxp2GLJfFBCo8iA9F7/AL48drgbbrZx0 VsENFA== Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fkafw1nes-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 23 Jul 2026 10:21:41 +0000 (GMT) Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-84857446424so1044290b3a.1 for ; Thu, 23 Jul 2026 03:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1784802101; x=1785406901; 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=8GLR1CneDZmYyQyMh23eDtFtUTycwoEAiCoN5g9oI4s=; b=L7F+2pP0RjuZtFVrPtLT5l/QL6MubsNtg/pn2Y5uzLL0GuTzB4Q48cylHIjBDt5lj0 G18KcSKD+PuOB2AwcSSuVWAxMnrG8miFCMl13jLxNjUC51HDBMQwwmeEdIPqD3jgyqjH kHOukYs8XQTFCsOPqJ5SLqlFAnzZ9+WOniDlSh/Mc4E2ygzDVSheOD4MkaTpMZ+9UAz5 isDlaI5QbrHbBIfLeR6ckx4YZWGDIYRotpkgZIAyieF2zc30b/EysF+z/UJPpcT5Ny1J VTolJBHoTMg+wT91M60xO3L5ktCbWVoWBGyGRIgqWqDGuxoc/Ii1bUbtsQoFBNi5jlPu TsCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784802101; x=1785406901; 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=8GLR1CneDZmYyQyMh23eDtFtUTycwoEAiCoN5g9oI4s=; b=sAptoXu+jQ580Lhv75ATBSYqaEQxwKCE6EhQfvSGQYuwwaLqXgo5KTaaLQJmkGzz9c TMLNGuwbYqMTdmneyM8FMlftBn8dmXHYI3eN8QqLNJLTGkbbKpkOOeJCYqJL/tvqlPXA Db4amGOkjeh3buoG+eWrGv04wjd57t48AqvT+cbNFQhhId7JmVNYnFSJGhkULu7gK+TO Be635ccY6p8qZAsy7o6T0Y8k9rjKcBqf9ra0Wk2KBbnixvWMVSRtwcjgWPcNIm0XFBXO zX7r5rAfdVm6ik86Zm1lrLCDcM5P+zuyCg4Ks00q0FZntHQ18WQucP8HNFkjMWSD5Gt1 kNzw== X-Gm-Message-State: AOJu0Yx3W6agdEURVwhxreNeaqNELyr/QhfUFg+YfGOk65CMzfyJhNGp F2XHoqnrhu13boW2qTk5LKuxEb8zqH1R2qASsUaufbrSrufY1URgH2F3y3sTBXFP0ZypUipn4jr 83YMkRrxVkr5r7yOj+suL2PeZiReTYoJpPebvYp9DZD2i+6gbqQmdczHqbCiAt4St9A== X-Gm-Gg: AR+sD13mie5EzoyMYAqAaNrCbmb8wnVYxujFYPNlqJ2GfteNy4DSjVYFnfuT2LsyUu8 C/+6s56Yt/DsDlgdTqBD8gpoxOCnMGjvPwpSjz7FWuT16O1sUFWZzMbXjf9xvY4aLTbcI/lx8hK 7GFUuBC0c9f7sAab2xjDrmHWI9Y1XatzjT2w7BedD5q3t+1pRGGFcCkscEdvw06w7Zo8EbH2AuY ap3kb9Qny8frTo3xNNijd4ObsaEoj1WxnQ8lktKU5zYgddgpWMgwmBDlhSTz+/DZcKMz/CaSEQF 7/e1Lefbo1zSJO5YiTNyVVlReHPFUnWXpkCtAMWuHihMNLnqjOmN2WL9TzrYDs47cgj5EadSx1E bTpB2q6p0dUPFCD8WBL7dn6vA3HwD2F8= X-Received: by 2002:a05:6a00:439a:b0:848:2f2c:b2c8 with SMTP id d2e1a72fcca58-84e2b84ab87mr2853985b3a.24.1784802100650; Thu, 23 Jul 2026 03:21:40 -0700 (PDT) X-Received: by 2002:a05:6a00:439a:b0:848:2f2c:b2c8 with SMTP id d2e1a72fcca58-84e2b84ab87mr2853950b3a.24.1784802100186; Thu, 23 Jul 2026 03:21:40 -0700 (PDT) Received: from hu-sachinku-hyd.qualcomm.com ([202.46.22.19]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84e17285662sm2781395b3a.20.2026.07.23.03.21.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2026 03:21:39 -0700 (PDT) From: Sachin Kumar Garg Date: Thu, 23 Jul 2026 15:51:15 +0530 Subject: [PATCH v4 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: <20260723-iris_multi_slice-v4-3-45f0a3fe7fce@oss.qualcomm.com> References: <20260723-iris_multi_slice-v4-0-45f0a3fe7fce@oss.qualcomm.com> In-Reply-To: <20260723-iris_multi_slice-v4-0-45f0a3fe7fce@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=1784802081; l=12410; i=sachin.garg@oss.qualcomm.com; s=20260211; h=from:subject:message-id; bh=Jrmp4oYllEsqyN2JsTQx+3qPkNleZgGlTzp8V8q5ivc=; b=QMJOyYlRHhaImA5GEyjgh7J30faVqwsw1QylkAeNrQqbnuc7A/iMwiKI2ZGfLwziizNbBqirs La3wvISzwP3AKKmEsaAEzKuIF8t/+BdV1UZzL8oWJBfjw0ZD22m9k9d X-Developer-Key: i=sachin.garg@oss.qualcomm.com; a=ed25519; pk=KcRhp4CP9cR1V2tg6xSNRnB2STYaU0vVigdUF4Actu0= X-Authority-Analysis: v=2.4 cv=XNkAjwhE c=1 sm=1 tr=0 ts=6a61eb35 cx=c_pps a=mDZGXZTwRPZaeRUbqKGCBw==:117 a=fChuTYTh2wq5r3m49p7fHw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=ZIa84HXPZlRSj4Il7NUA:9 a=QEXdDO2ut3YA:10 a=zc0IvFSfCIW2DFIPzwfm:22 X-Proofpoint-ORIG-GUID: sa58C6LF949nMhrLj7P0dNNX2vKT4uSI X-Proofpoint-GUID: sa58C6LF949nMhrLj7P0dNNX2vKT4uSI X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIzMDEwMiBTYWx0ZWRfXz9sL54zEgbeP 3UQ8xYRPpmY7SJaqrhchGyuBOnOLV+YSbQPpq36QfCF51SO3TQGzOxwUpzSkN5t9s4xXkAMoGBu was1heif5PTEuwjS7knlPHiejQ3gwgQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIzMDEwMiBTYWx0ZWRfXyC0bEigtkMl3 +dm3BPevogUiOQ5p5tmjP2hL33LgBzQEhKeetwLzoqLQciScwegl8x8dzuVoKZ9fnUPNGLdyJzh Uvr4TSwtQskS/GktNJYTN8TKtBuHuNgLbMwFR+U4lyuqIByT04M5YnrCmL2R0nEVDfL6cj2BUPd L9ehwCVKZzQ2Vcsde1AVOsRWz9/gOZlUOYB2ZxY91NXGOOQJvUbXpiZ2+/luiQ1z4m3RxS2R3Eq iaJghlp+Zb4qzI/toBg7czZGQrnNss/AbdqSWQh00uUsC+eqsNVHAk+5uCKHD86oQ0I9KbSSu17 gDnab1SrX+XMSQTuL3FCuZkcr/6DSTr6XpsV0dD3iDSTrVFAaxXSIxJyv5bM/TIwVYx8rIKhl5u 8p6JjK6m9tq4qOLVqtwRb+lNaLNBf8giWNksCgzuCz9gDodG2CPdFZcE/z9bb1KYuBh3nQqJ0ZD XLEj1LDow9AUo3PQdUA== 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-23_03,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 suspectscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607230102 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 | 79 ++++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 33 ++++++++- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 + .../platform/qcom/iris/iris_platform_common.h | 16 +++++ .../media/platform/qcom/iris/iris_platform_vpu3x.c | 17 +++++ 6 files changed, 147 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..ed7ed4b89a5a 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,73 @@ 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; + const struct platform_inst_slice_caps *slice_caps = + inst->core->iris_platform_data->slice_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 > slice_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) ? + 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((bitrate / fps) / 8, + 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..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..ad9f2b20cd90 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -88,6 +88,18 @@ struct tz_cp_config { u32 cp_nonpixel_size; }; +struct platform_inst_slice_caps { + u32 max_slices_per_frame; + u32 max_slice_frame_rate; + u32 max_mb_slice_width; + u32 max_mb_slice_height; + u32 max_bytes_slice_width; + u32 max_bytes_slice_height; + u32 min_hevc_slice_width; + u32 min_avc_slice_width; + u32 min_slice_height; +}; + struct platform_inst_caps { u32 min_frame_width; u32 max_frame_width; @@ -183,6 +195,9 @@ enum platform_inst_fw_cap_type { LAYER3_BITRATE_HEVC, LAYER4_BITRATE_HEVC, LAYER5_BITRATE_HEVC, + SLICE_MODE, + SLICE_MAX_BYTES, + SLICE_MAX_MB, INST_FW_CAP_MAX, }; @@ -315,6 +330,7 @@ struct iris_platform_data { const u32 *inst_iris_fmts; u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; + const struct platform_inst_slice_caps *slice_caps; const struct tz_cp_config *tz_cp_config_data; u32 tz_cp_config_data_size; u32 num_vpp_pipe; diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c index 2c63adbc5579..6e44bed5ebff 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c @@ -12,6 +12,18 @@ #include "iris_vpu_buffer.h" #include "iris_vpu_common.h" +static const struct platform_inst_slice_caps default_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, +}; + #include "iris_platform_qcs8300.h" #include "iris_platform_sm8550.h" #include "iris_platform_sm8650.h" @@ -110,6 +122,7 @@ const struct iris_platform_data qcs8300_data = { .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 = &default_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 +152,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 = &default_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 +190,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 = &default_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 +220,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 = &default_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 +256,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 = &default_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