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 75A3B215766; Thu, 14 Aug 2025 15:05:55 +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=1755183958; cv=none; b=CvH9DYrEUs0NfDIidb39PMi4M/ZtF0ThRspmGuW7qh8YkK8NuR/VVKU5hyHqSugIfifc4w0M3yLvm5PpuOQaBr+r1RvG6+jiQZPWbg0EdmJ9t4/gA6tVE8lSmQ4r2i4piRoj11bdNFiH22jGUjCdzahCKY1N8F0lPBpFg7mgfew= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755183958; c=relaxed/simple; bh=BOGDuD1hNU/uEaZsXAdgld016ZNMWot6hRzAXWrlDFQ=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=FgYVm9C5fKQ9pUdFjS9zVE8C0Bka97PFEJR0xOFtFeVEnyhxM7Ss2vN7bXjNAqIxiygS/hzwLEJXp5S7p6GrSffPWlkLk4D8epea93OkxZyJurNGjTeydidaBsyvVw9zhRs/3fw6u64nGquAwZ1Q5nkpfKP111qX7169TDRGc8U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=HlmJyQWq; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="HlmJyQWq" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57E9SElx012988; Thu, 14 Aug 2025 15:05:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= xX75bkHzNl6B8WlzItSzvqNa2TM+jLYt8Td1ha+9Pdo=; b=HlmJyQWqrGrx5iXe sNyeo/CB5lQMhVN/j27gZooL9lHqG2pvl8QmdOzfCSq8w6E80RzgmZYDr7rA76qE qLBroldOWKvcXk9hEVN4uoNHjCxzUNuT1MK561/xcCObkdbTkca8Q6Sc7VrzpH4V N9mQ5I9VyF0tPYFzqA3RGrsi0vvNyHXJzmDdxW7fuutPiW40wRRPi/5I8xvmdhUi QnRhqOhZAxwYTRZKvb3xZGza59sNVPPXoxxTZqI+K6110B1VgoHdB8f13GlUEKTK B6PxihUTk9wkGhM4urSG4UjC1KuHMq27AjLyzkrbgXnYF9hYMLe+njfgCHfZzeb9 /CEK6Q== Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 48ffq6v0qm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Aug 2025 15:05:47 +0000 (GMT) Received: from nasanex01a.na.qualcomm.com (nasanex01a.na.qualcomm.com [10.52.223.231]) by NASANPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 57EF5kXh025905 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 14 Aug 2025 15:05:46 GMT Received: from [10.216.25.245] (10.80.80.8) by nasanex01a.na.qualcomm.com (10.52.223.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.10; Thu, 14 Aug 2025 08:05:42 -0700 Message-ID: <4848990e-7c57-1369-93a3-ecbed5e92f1b@quicinc.com> Date: Thu, 14 Aug 2025 20:35:38 +0530 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH v2 19/24] media: iris: Add platform-specific capabilities for encoder video device Content-Language: en-US To: Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Hans Verkuil , Stefan Schmidt , "Vedang Nagar" CC: , , , Renjiang Han , Wangao Wang References: <20250813-iris-video-encoder-v2-0-c725ff673078@quicinc.com> <20250813-iris-video-encoder-v2-19-c725ff673078@quicinc.com> From: Vikash Garodia In-Reply-To: <20250813-iris-video-encoder-v2-19-c725ff673078@quicinc.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01a.na.qualcomm.com (10.52.223.231) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODExMDA3NSBTYWx0ZWRfX3Se0dEirSz2O 9MMTvcVv+3a7Ac3ZF9PUnUcVyygb4A2Fav8JRbJ42Vow+ioJCaj3/HerIggq7IOQDDdPD1iJ6ol LKhaf9XBrZ4tMhoXAsyUnX4IH48j5RZwr+f0hu2iYXx22RduYva6kQijNufxO/EjAdC66x22u/I BAcJy85eMp3WczLYNIy9mxljccz8DeqIQnOdsOYEp0pf0/g7U8c2awLoF7QUsP5z4bQcq8go7Tz EFJ0RFaw+xuQs5Fpy3Aa/iWKySudncScTxI7vCTsevdGsP4WBUzK6cfU3a9yl6ory0oCKgZ94iF rkPzWmd06tvsaIj2xGIDISOs+VRewnEFZvMSBQW/xM2Atqd+3SawPf0cbqeeB1aPvRaO+lsKnw6 70f/k/hP X-Authority-Analysis: v=2.4 cv=TLZFS0la c=1 sm=1 tr=0 ts=689dfb4b cx=c_pps a=JYp8KDb2vCoCEuGobkYCKw==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=2OwXVqhp2XgA:10 a=COk6AnOGAAAA:8 a=hBiz4rfltoB2CK49gi8A:9 a=QEXdDO2ut3YA:10 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: dj3GF9MK6X9NaQkprWuFEdfCAas6ew4G X-Proofpoint-ORIG-GUID: dj3GF9MK6X9NaQkprWuFEdfCAas6ew4G X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-13_02,2025-08-14_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 phishscore=0 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 adultscore=0 impostorscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508110075 On 8/13/2025 3:08 PM, Dikshita Agarwal wrote: > Add platform-specific capabilities for the encoder video device and > initialize the corresponding controls in the control handler. > > This enables proper configuration and handling of encoder-specific > features based on platform requirements. > > Co-developed-by: Wangao Wang > Signed-off-by: Wangao Wang > Tested-by: Vikash Garodia # X1E80100 > Signed-off-by: Dikshita Agarwal > --- > drivers/media/platform/qcom/iris/iris_core.h | 7 +- > drivers/media/platform/qcom/iris/iris_ctrls.c | 175 +++++++++- > .../platform/qcom/iris/iris_hfi_gen1_defines.h | 7 + > .../platform/qcom/iris/iris_hfi_gen2_defines.h | 9 + > .../platform/qcom/iris/iris_platform_common.h | 43 ++- > .../media/platform/qcom/iris/iris_platform_gen2.c | 385 ++++++++++++++++++++- > .../platform/qcom/iris/iris_platform_qcs8300.h | 350 ++++++++++++++++++- > .../platform/qcom/iris/iris_platform_sm8250.c | 185 +++++++++- > drivers/media/platform/qcom/iris/iris_vdec.c | 2 +- > drivers/media/platform/qcom/iris/iris_venc.c | 7 +- > 10 files changed, 1140 insertions(+), 30 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h > index 827aee8dcec3ee17af5a90f5594b9315f663c0b3..fb194c967ad4f9b5e00cd74f0d41e0b827ef14db 100644 > --- a/drivers/media/platform/qcom/iris/iris_core.h > +++ b/drivers/media/platform/qcom/iris/iris_core.h > @@ -71,7 +71,8 @@ enum domain_type { > * @intr_status: interrupt status > * @sys_error_handler: a delayed work for handling system fatal error > * @instances: a list_head of all instances > - * @inst_fw_caps: an array of supported instance capabilities > + * @inst_fw_caps_dec: an array of supported instance capabilities by decoder > + * @inst_fw_caps_enc: an array of supported instance capabilities by encoder > */ > > struct iris_core { > @@ -113,7 +114,9 @@ struct iris_core { > u32 intr_status; > struct delayed_work sys_error_handler; > struct list_head instances; > - struct platform_inst_fw_cap inst_fw_caps[INST_FW_CAP_MAX]; > + /* encoder and decoder have overlapping caps, so two different arrays are required */ > + struct platform_inst_fw_cap inst_fw_caps_dec[INST_FW_CAP_MAX]; > + struct platform_inst_fw_cap inst_fw_caps_enc[INST_FW_CAP_MAX]; > }; > > int iris_core_init(struct iris_core *core); > diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c > index 9136b723c0f2a3d5833af32ae2735ccdb244f60f..797386cb96ab1d24be6cc1819e2f9202ab4cc224 100644 > --- a/drivers/media/platform/qcom/iris/iris_ctrls.c > +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c > @@ -31,6 +31,68 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id) > return LEVEL_VP9; > case V4L2_CID_MPEG_VIDEO_HEVC_TIER: > return TIER; > + case V4L2_CID_MPEG_VIDEO_HEADER_MODE: > + return HEADER_MODE; > + case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR: > + return PREPEND_SPSPPS_TO_IDR; > + case V4L2_CID_MPEG_VIDEO_BITRATE: > + return BITRATE; > + case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK: > + return BITRATE_PEAK; > + case V4L2_CID_MPEG_VIDEO_BITRATE_MODE: > + return BITRATE_MODE; > + case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE: > + return FRAME_SKIP_MODE; > + case V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE: > + return FRAME_RC_ENABLE; > + case V4L2_CID_MPEG_VIDEO_GOP_SIZE: > + return GOP_SIZE; > + case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE: > + return ENTROPY_MODE; > + case V4L2_CID_MPEG_VIDEO_H264_MIN_QP: > + return MIN_FRAME_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP: > + return MIN_FRAME_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_MAX_QP: > + return MAX_FRAME_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP: > + return MAX_FRAME_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP: > + return I_FRAME_MIN_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP: > + return I_FRAME_MIN_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP: > + return P_FRAME_MIN_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP: > + return P_FRAME_MIN_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP: > + return B_FRAME_MIN_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP: > + return B_FRAME_MIN_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP: > + return I_FRAME_MAX_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP: > + return I_FRAME_MAX_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP: > + return P_FRAME_MAX_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP: > + return P_FRAME_MAX_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP: > + return B_FRAME_MAX_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP: > + return B_FRAME_MAX_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP: > + return I_FRAME_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP: > + return I_FRAME_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP: > + return P_FRAME_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP: > + return P_FRAME_QP_HEVC; > + case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP: > + return B_FRAME_QP_H264; > + case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP: > + return B_FRAME_QP_HEVC; > default: > return INST_FW_CAP_MAX; > } > @@ -56,6 +118,68 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id) > return V4L2_CID_MPEG_VIDEO_VP9_LEVEL; > case TIER: > return V4L2_CID_MPEG_VIDEO_HEVC_TIER; > + case HEADER_MODE: > + return V4L2_CID_MPEG_VIDEO_HEADER_MODE; > + case PREPEND_SPSPPS_TO_IDR: > + return V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR; > + case BITRATE: > + return V4L2_CID_MPEG_VIDEO_BITRATE; > + case BITRATE_PEAK: > + return V4L2_CID_MPEG_VIDEO_BITRATE_PEAK; > + case BITRATE_MODE: > + return V4L2_CID_MPEG_VIDEO_BITRATE_MODE; > + case FRAME_SKIP_MODE: > + return V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE; > + case FRAME_RC_ENABLE: > + return V4L2_CID_MPEG_VIDEO_FRAME_RC_ENABLE; > + case GOP_SIZE: > + return V4L2_CID_MPEG_VIDEO_GOP_SIZE; > + case ENTROPY_MODE: > + return V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE; > + case MIN_FRAME_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_MIN_QP; > + case MIN_FRAME_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP; > + case MAX_FRAME_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_MAX_QP; > + case MAX_FRAME_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP; > + case I_FRAME_MIN_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP; > + case I_FRAME_MIN_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MIN_QP; > + case P_FRAME_MIN_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP; > + case P_FRAME_MIN_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MIN_QP; > + case B_FRAME_MIN_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MIN_QP; > + case B_FRAME_MIN_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MIN_QP; > + case I_FRAME_MAX_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MAX_QP; > + case I_FRAME_MAX_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_MAX_QP; > + case P_FRAME_MAX_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MAX_QP; > + case P_FRAME_MAX_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_MAX_QP; > + case B_FRAME_MAX_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_B_FRAME_MAX_QP; > + case B_FRAME_MAX_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_MAX_QP; > + case I_FRAME_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_I_FRAME_QP; > + case I_FRAME_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP; > + case P_FRAME_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_P_FRAME_QP; > + case P_FRAME_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP; > + case B_FRAME_QP_H264: > + return V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP; > + case B_FRAME_QP_HEVC: > + return V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP; > default: > return 0; > } > @@ -101,7 +225,10 @@ int iris_ctrls_init(struct iris_inst *inst) > num_ctrls++; > } > > - /* Adding 1 to num_ctrls to include V4L2_CID_MIN_BUFFERS_FOR_CAPTURE */ > + /* Adding 1 to num_ctrls to include > + * V4L2_CID_MIN_BUFFERS_FOR_CAPTURE for decoder and > + * V4L2_CID_MIN_BUFFERS_FOR_OUTPUT for encoder > + */ > > ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, num_ctrls + 1); > if (ret) > @@ -143,8 +270,13 @@ int iris_ctrls_init(struct iris_inst *inst) > ctrl_idx++; > } > > - v4l2_ctrl_new_std(&inst->ctrl_handler, NULL, > - V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 32, 1, 4); > + if (inst->domain == DECODER) { > + v4l2_ctrl_new_std(&inst->ctrl_handler, NULL, > + V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 32, 1, 4); > + } else { > + v4l2_ctrl_new_std(&inst->ctrl_handler, NULL, > + V4L2_CID_MIN_BUFFERS_FOR_OUTPUT, 1, 32, 1, 4); > + } > > ret = inst->ctrl_handler.error; > if (ret) > @@ -162,22 +294,39 @@ void iris_session_init_caps(struct iris_core *core) > struct platform_inst_fw_cap *caps; > u32 i, num_cap, cap_id; > > - caps = core->iris_platform_data->inst_fw_caps; > - num_cap = core->iris_platform_data->inst_fw_caps_size; > + caps = core->iris_platform_data->inst_fw_caps_dec; > + num_cap = core->iris_platform_data->inst_fw_caps_dec_size; > + > + for (i = 0; i < num_cap; i++) { > + cap_id = caps[i].cap_id; > + if (!iris_valid_cap_id(cap_id)) > + continue; > + > + core->inst_fw_caps_dec[cap_id].cap_id = caps[i].cap_id; > + core->inst_fw_caps_dec[cap_id].min = caps[i].min; > + core->inst_fw_caps_dec[cap_id].max = caps[i].max; > + core->inst_fw_caps_dec[cap_id].step_or_mask = caps[i].step_or_mask; > + core->inst_fw_caps_dec[cap_id].value = caps[i].value; > + core->inst_fw_caps_dec[cap_id].flags = caps[i].flags; > + core->inst_fw_caps_dec[cap_id].hfi_id = caps[i].hfi_id; > + core->inst_fw_caps_dec[cap_id].set = caps[i].set; > + } > + > + caps = core->iris_platform_data->inst_fw_caps_enc; > + num_cap = core->iris_platform_data->inst_fw_caps_enc_size; > > for (i = 0; i < num_cap; i++) { > cap_id = caps[i].cap_id; > if (!iris_valid_cap_id(cap_id)) > continue; > > - core->inst_fw_caps[cap_id].cap_id = caps[i].cap_id; > - core->inst_fw_caps[cap_id].min = caps[i].min; > - core->inst_fw_caps[cap_id].max = caps[i].max; > - core->inst_fw_caps[cap_id].step_or_mask = caps[i].step_or_mask; > - core->inst_fw_caps[cap_id].value = caps[i].value; > - core->inst_fw_caps[cap_id].flags = caps[i].flags; > - core->inst_fw_caps[cap_id].hfi_id = caps[i].hfi_id; > - core->inst_fw_caps[cap_id].set = caps[i].set; > + core->inst_fw_caps_enc[cap_id].cap_id = caps[i].cap_id; > + core->inst_fw_caps_enc[cap_id].min = caps[i].min; > + core->inst_fw_caps_enc[cap_id].max = caps[i].max; > + core->inst_fw_caps_enc[cap_id].step_or_mask = caps[i].step_or_mask; > + core->inst_fw_caps_enc[cap_id].value = caps[i].value; > + core->inst_fw_caps_enc[cap_id].flags = caps[i].flags; > + core->inst_fw_caps_enc[cap_id].hfi_id = caps[i].hfi_id; > } > } > > diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h > index 5b7c641b727a16c3aa7196a6d49786133653279f..a7f4379c5973fdc4366969139bef25472e8f11a5 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h > @@ -121,6 +121,13 @@ > #define HFI_UNUSED_PICT 0x10000000 > #define HFI_BUFFERFLAG_DATACORRUPT 0x00000008 > #define HFI_BUFFERFLAG_DROP_FRAME 0x20000000 > +#define HFI_PROPERTY_PARAM_VENC_H264_ENTROPY_CONTROL 0x2005002 > +#define HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL 0x2005003 > +#define HFI_PROPERTY_PARAM_VENC_RATE_CONTROL 0x2005004 > +#define HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2 0x2005009 > +#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020 > +#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 > +#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 > > struct hfi_pkt_hdr { > u32 size; > 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 5f13dc11bea532600cc9b15db57e8981a1f3eb93..fb6724d7f95ff8858aa9ba093fefb642e89de279 100644 > --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h > +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h > @@ -55,12 +55,21 @@ > #define HFI_PROP_BUFFER_HOST_MAX_COUNT 0x03000123 > #define HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT 0x03000124 > #define HFI_PROP_PIC_ORDER_CNT_TYPE 0x03000128 > +#define HFI_PROP_RATE_CONTROL 0x0300012a > +#define HFI_PROP_QP_PACKED 0x0300012e > +#define HFI_PROP_MIN_QP_PACKED 0x0300012f > +#define HFI_PROP_MAX_QP_PACKED 0x03000130 > +#define HFI_PROP_TOTAL_BITRATE 0x0300013b > +#define HFI_PROP_MAX_GOP_FRAMES 0x03000146 > +#define HFI_PROP_MAX_B_FRAMES 0x03000147 > #define HFI_PROP_QUALITY_MODE 0x03000148 > +#define HFI_PROP_SEQ_HEADER_MODE 0x03000149 > #define HFI_PROP_SIGNAL_COLOR_INFO 0x03000155 > #define HFI_PROP_PICTURE_TYPE 0x03000162 > #define HFI_PROP_DEC_DEFAULT_HEADER 0x03000168 > #define HFI_PROP_DEC_START_FROM_RAP_FRAME 0x03000169 > #define HFI_PROP_NO_OUTPUT 0x0300016a > +#define HFI_PROP_TOTAL_PEAK_BITRATE 0x0300017C > #define HFI_PROP_COMV_BUFFER_COUNT 0x03000193 > #define HFI_PROP_END 0x03FFFFFF > > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h > index d0b84c93aef409b51a767ba11f91c6ce2533f27f..6d6a8f3b38271d928d753dd180e6e9a991991d24 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h > @@ -23,6 +23,11 @@ struct iris_inst; > #define DEFAULT_FPS 30 > #define MAXIMUM_FPS 480 > #define NUM_MBS_8K ((8192 * 4352) / 256) > +#define MIN_QP_8BIT 1 > +#define MAX_QP 51 > +#define MAX_QP_HEVC 63 > +#define DEFAULT_QP 20 > +#define BITRATE_DEFAULT 20000000 > > enum stage_type { > STAGE_1 = 1, > @@ -91,6 +96,7 @@ enum platform_inst_fw_cap_type { > LEVEL_HEVC, > LEVEL_VP9, > INPUT_BUF_HOST_MAX_COUNT, > + OUTPUT_BUF_HOST_MAX_COUNT, > STAGE, > PIPE, > POC, > @@ -98,6 +104,37 @@ enum platform_inst_fw_cap_type { > BIT_DEPTH, > RAP_FRAME, > TIER, > + HEADER_MODE, > + PREPEND_SPSPPS_TO_IDR, > + BITRATE, > + BITRATE_PEAK, > + BITRATE_MODE, > + FRAME_SKIP_MODE, > + FRAME_RC_ENABLE, > + GOP_SIZE, > + ENTROPY_MODE, > + MIN_FRAME_QP_H264, > + MIN_FRAME_QP_HEVC, > + MAX_FRAME_QP_H264, > + MAX_FRAME_QP_HEVC, > + I_FRAME_MIN_QP_H264, > + I_FRAME_MIN_QP_HEVC, > + P_FRAME_MIN_QP_H264, > + P_FRAME_MIN_QP_HEVC, > + B_FRAME_MIN_QP_H264, > + B_FRAME_MIN_QP_HEVC, > + I_FRAME_MAX_QP_H264, > + I_FRAME_MAX_QP_HEVC, > + P_FRAME_MAX_QP_H264, > + P_FRAME_MAX_QP_HEVC, > + B_FRAME_MAX_QP_H264, > + B_FRAME_MAX_QP_HEVC, > + I_FRAME_QP_H264, > + I_FRAME_QP_HEVC, > + P_FRAME_QP_H264, > + P_FRAME_QP_HEVC, > + B_FRAME_QP_H264, > + B_FRAME_QP_HEVC, > INST_FW_CAP_MAX, > }; > > @@ -172,8 +209,10 @@ struct iris_platform_data { > const char *fwname; > u32 pas_id; > struct platform_inst_caps *inst_caps; > - struct platform_inst_fw_cap *inst_fw_caps; > - u32 inst_fw_caps_size; > + struct platform_inst_fw_cap *inst_fw_caps_dec; > + u32 inst_fw_caps_dec_size; > + struct platform_inst_fw_cap *inst_fw_caps_enc; > + u32 inst_fw_caps_enc_size; > struct tz_cp_config *tz_cp_config_data; > u32 core_arch; > u32 hw_response_timeout; > diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c > index e047fb75a99a6372dac4ad029baea16034cac633..1bf289d322c86a8f8c03c80697c08af5d9067769 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c > +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c > @@ -14,8 +14,9 @@ > #include "iris_platform_sm8650.h" > > #define VIDEO_ARCH_LX 1 > +#define BITRATE_MAX 245000000 > > -static struct platform_inst_fw_cap inst_fw_cap_sm8550[] = { > +static struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = { > { > .cap_id = PROFILE_H264, > .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, > @@ -199,6 +200,370 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8550[] = { > }, > }; > > +static struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { > + { > + .cap_id = PROFILE_H264, > + .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, > + .max = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH), > + .value = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, > + .hfi_id = HFI_PROP_PROFILE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = PROFILE_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10), > + .value = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .hfi_id = HFI_PROP_PROFILE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_H264, > + .min = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, > + .max = V4L2_MPEG_VIDEO_H264_LEVEL_6_0, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_6_0), > + .value = V4L2_MPEG_VIDEO_H264_LEVEL_5_0, > + .hfi_id = HFI_PROP_LEVEL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_LEVEL_1, > + .max = V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2), > + .value = V4L2_MPEG_VIDEO_HEVC_LEVEL_5, > + .hfi_id = HFI_PROP_LEVEL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = STAGE, > + .min = STAGE_1, > + .max = STAGE_2, > + .step_or_mask = 1, > + .value = STAGE_2, > + .hfi_id = HFI_PROP_STAGE, > + }, > + { > + .cap_id = HEADER_MODE, > + .min = V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE, > + .max = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) | > + BIT(V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME), > + .value = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .hfi_id = HFI_PROP_SEQ_HEADER_MODE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = PREPEND_SPSPPS_TO_IDR, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 0, > + }, > + { > + .cap_id = BITRATE, > + .min = 1, > + .max = BITRATE_MAX, > + .step_or_mask = 1, > + .value = BITRATE_DEFAULT, > + .hfi_id = HFI_PROP_TOTAL_BITRATE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = BITRATE_PEAK, > + .min = 1, > + .max = BITRATE_MAX, > + .step_or_mask = 1, > + .value = BITRATE_DEFAULT, > + .hfi_id = HFI_PROP_TOTAL_PEAK_BITRATE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = BITRATE_MODE, > + .min = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .max = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) | > + BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_CBR), > + .value = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .hfi_id = HFI_PROP_RATE_CONTROL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_SKIP_MODE, > + .min = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .max = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) | > + BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT) | > + BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT), > + .value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_RC_ENABLE, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 1, > + }, > + { > + .cap_id = GOP_SIZE, > + .min = 0, > + .max = INT_MAX, > + .step_or_mask = 1, > + .value = 2 * DEFAULT_FPS - 1, > + .hfi_id = HFI_PROP_MAX_GOP_FRAMES, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = ENTROPY_MODE, > + .min = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC, > + .max = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC) | > + BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC), > + .value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC, > + .hfi_id = HFI_PROP_CABAC_SESSION, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = MIN_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROP_MIN_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MIN_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROP_MIN_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + .hfi_id = HFI_PROP_MAX_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + .hfi_id = HFI_PROP_MAX_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = I_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = I_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = P_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = P_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = B_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = B_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = I_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = I_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = P_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = P_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = B_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = B_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = I_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = I_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = P_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = P_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = B_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = B_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = INPUT_BUF_HOST_MAX_COUNT, > + .min = DEFAULT_MAX_HOST_BUF_COUNT, > + .max = DEFAULT_MAX_HOST_BURST_BUF_COUNT, > + .step_or_mask = 1, > + .value = DEFAULT_MAX_HOST_BUF_COUNT, > + .hfi_id = HFI_PROP_BUFFER_HOST_MAX_COUNT, > + .flags = CAP_FLAG_INPUT_PORT, > + }, > + { > + .cap_id = OUTPUT_BUF_HOST_MAX_COUNT, > + .min = DEFAULT_MAX_HOST_BUF_COUNT, > + .max = DEFAULT_MAX_HOST_BURST_BUF_COUNT, > + .step_or_mask = 1, > + .value = DEFAULT_MAX_HOST_BUF_COUNT, > + .hfi_id = HFI_PROP_BUFFER_HOST_MAX_COUNT, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > +}; > + > static struct platform_inst_caps platform_inst_cap_sm8550 = { > .min_frame_width = 96, > .max_frame_width = 8192, > @@ -347,8 +712,10 @@ struct iris_platform_data sm8550_data = { > .fwname = "qcom/vpu/vpu30_p4.mbn", > .pas_id = IRIS_PAS_ID, > .inst_caps = &platform_inst_cap_sm8550, > - .inst_fw_caps = inst_fw_cap_sm8550, > - .inst_fw_caps_size = ARRAY_SIZE(inst_fw_cap_sm8550), > + .inst_fw_caps_dec = inst_fw_cap_sm8550_dec, > + .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec), > + .inst_fw_caps_enc = inst_fw_cap_sm8550_enc, > + .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8550_enc), > .tz_cp_config_data = &tz_cp_config_sm8550, > .core_arch = VIDEO_ARCH_LX, > .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, > @@ -423,8 +790,10 @@ struct iris_platform_data sm8650_data = { > .fwname = "qcom/vpu/vpu33_p4.mbn", > .pas_id = IRIS_PAS_ID, > .inst_caps = &platform_inst_cap_sm8550, > - .inst_fw_caps = inst_fw_cap_sm8550, > - .inst_fw_caps_size = ARRAY_SIZE(inst_fw_cap_sm8550), > + .inst_fw_caps_dec = inst_fw_cap_sm8550_dec, > + .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec), > + .inst_fw_caps_enc = inst_fw_cap_sm8550_enc, > + .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8550_enc), > .tz_cp_config_data = &tz_cp_config_sm8550, > .core_arch = VIDEO_ARCH_LX, > .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, > @@ -495,8 +864,10 @@ struct iris_platform_data qcs8300_data = { > .fwname = "qcom/vpu/vpu30_p4_s6.mbn", > .pas_id = IRIS_PAS_ID, > .inst_caps = &platform_inst_cap_qcs8300, > - .inst_fw_caps = inst_fw_cap_qcs8300, > - .inst_fw_caps_size = ARRAY_SIZE(inst_fw_cap_qcs8300), > + .inst_fw_caps_dec = inst_fw_cap_qcs8300_dec, > + .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_qcs8300_dec), > + .inst_fw_caps_enc = inst_fw_cap_qcs8300_enc, > + .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_qcs8300_enc), > .tz_cp_config_data = &tz_cp_config_sm8550, > .core_arch = VIDEO_ARCH_LX, > .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, > diff --git a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h > index 22e485b0b2ae8f110d2f3b817e202d1aa7d227fd..624e3a442b06aabf3241d0b364b1d12fe937d6be 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_qcs8300.h > @@ -3,7 +3,9 @@ > * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved. > */ > > -static struct platform_inst_fw_cap inst_fw_cap_qcs8300[] = { > +#define BITRATE_MAX 245000000 > + > +static struct platform_inst_fw_cap inst_fw_cap_qcs8300_dec[] = { > { > .cap_id = PROFILE_H264, > .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, > @@ -187,6 +189,352 @@ static struct platform_inst_fw_cap inst_fw_cap_qcs8300[] = { > }, > }; > > +static struct platform_inst_fw_cap inst_fw_cap_qcs8300_enc[] = { > + { > + .cap_id = PROFILE_H264, > + .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, > + .max = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH), > + .value = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, > + .hfi_id = HFI_PROP_PROFILE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = PROFILE_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10), > + .value = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .hfi_id = HFI_PROP_PROFILE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_H264, > + .min = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, > + .max = V4L2_MPEG_VIDEO_H264_LEVEL_6_0, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_6_0), > + .value = V4L2_MPEG_VIDEO_H264_LEVEL_5_0, > + .hfi_id = HFI_PROP_LEVEL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_LEVEL_1, > + .max = V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2), > + .value = V4L2_MPEG_VIDEO_HEVC_LEVEL_5, > + .hfi_id = HFI_PROP_LEVEL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = STAGE, > + .min = STAGE_1, > + .max = STAGE_2, > + .step_or_mask = 1, > + .value = STAGE_2, > + .hfi_id = HFI_PROP_STAGE, > + }, > + { > + .cap_id = HEADER_MODE, > + .min = V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE, > + .max = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) | > + BIT(V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME), > + .value = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .hfi_id = HFI_PROP_SEQ_HEADER_MODE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = PREPEND_SPSPPS_TO_IDR, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 0, > + }, > + { > + .cap_id = BITRATE, > + .min = 1, > + .max = BITRATE_MAX, > + .step_or_mask = 1, > + .value = BITRATE_DEFAULT, > + .hfi_id = HFI_PROP_TOTAL_BITRATE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = BITRATE_PEAK, > + .min = 1, > + .max = BITRATE_MAX, > + .step_or_mask = 1, > + .value = BITRATE_DEFAULT, > + .hfi_id = HFI_PROP_TOTAL_PEAK_BITRATE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = BITRATE_MODE, > + .min = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .max = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) | > + BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_CBR), > + .value = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .hfi_id = HFI_PROP_RATE_CONTROL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_SKIP_MODE, > + .min = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .max = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) | > + BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_LEVEL_LIMIT) | > + BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT), > + .value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_RC_ENABLE, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 1, > + }, > + { > + .cap_id = GOP_SIZE, > + .min = 0, > + .max = INT_MAX, > + .step_or_mask = 1, > + .value = 2 * DEFAULT_FPS - 1, > + .hfi_id = HFI_PROP_MAX_GOP_FRAMES, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = ENTROPY_MODE, > + .min = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC, > + .max = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC) | > + BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC), > + .value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC, > + .hfi_id = HFI_PROP_CABAC_SESSION, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = MIN_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROP_MIN_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MIN_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROP_MIN_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + .hfi_id = HFI_PROP_MAX_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + .hfi_id = HFI_PROP_MAX_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = I_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = I_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = P_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = P_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = B_FRAME_MIN_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = B_FRAME_MIN_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + }, > + { > + .cap_id = I_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = I_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = P_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = P_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = B_FRAME_MAX_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = B_FRAME_MAX_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + }, > + { > + .cap_id = I_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = I_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = P_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = P_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = B_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = B_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = DEFAULT_QP, > + .hfi_id = HFI_PROP_QP_PACKED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > +}; > + > static struct platform_inst_caps platform_inst_cap_qcs8300 = { > .min_frame_width = 96, > .max_frame_width = 4096, > diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c > index 5d59a5a3172a510b3a38f7c9c29dffd919fafce7..b1ed6a140980ab6ca27f372f6f5851569a93ceed 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c > +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c > @@ -11,7 +11,12 @@ > #include "iris_hfi_gen1_defines.h" > #include "iris_vpu_common.h" > > -static struct platform_inst_fw_cap inst_fw_cap_sm8250[] = { > +#define BITRATE_MIN 32000 > +#define BITRATE_MAX 160000000 > +#define BITRATE_PEAK_DEFAULT (BITRATE_DEFAULT * 2) > +#define BITRATE_STEP 100 > + > +static struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = { > { > .cap_id = PIPE, > .min = PIPE_1, > @@ -32,6 +37,178 @@ static struct platform_inst_fw_cap inst_fw_cap_sm8250[] = { > }, > }; > > +static struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { > + { > + .cap_id = PROFILE_H264, > + .min = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE, > + .max = V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH) | > + BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH), > + .value = V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, > + .hfi_id = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = PROFILE_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .max = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_STILL_PICTURE) | > + BIT(V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN_10), > + .value = V4L2_MPEG_VIDEO_HEVC_PROFILE_MAIN, > + .hfi_id = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_H264, > + .min = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, > + .max = V4L2_MPEG_VIDEO_H264_LEVEL_5_1, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_2) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_0) | > + BIT(V4L2_MPEG_VIDEO_H264_LEVEL_5_1), > + .value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, > + .hfi_id = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = LEVEL_HEVC, > + .min = V4L2_MPEG_VIDEO_HEVC_LEVEL_1, > + .max = V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_2_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_3_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_4_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_5_2) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1) | > + BIT(V4L2_MPEG_VIDEO_HEVC_LEVEL_6_2), > + .value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0, Fix the default value to V4L2_MPEG_VIDEO_HEVC_LEVEL_1 > + .hfi_id = HFI_PROPERTY_PARAM_PROFILE_LEVEL_CURRENT, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = HEADER_MODE, > + .min = V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE, > + .max = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) | > + BIT(V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME), > + .value = V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME, > + .hfi_id = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = BITRATE, > + .min = BITRATE_MIN, > + .max = BITRATE_MAX, > + .step_or_mask = BITRATE_STEP, > + .value = BITRATE_DEFAULT, > + .hfi_id = HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT | > + CAP_FLAG_DYNAMIC_ALLOWED, > + }, > + { > + .cap_id = BITRATE_MODE, > + .min = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .max = V4L2_MPEG_VIDEO_BITRATE_MODE_CBR, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_VBR) | > + BIT(V4L2_MPEG_VIDEO_BITRATE_MODE_CBR), > + .value = V4L2_MPEG_VIDEO_BITRATE_MODE_VBR, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_RATE_CONTROL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_SKIP_MODE, > + .min = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .max = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED) | > + BIT(V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT), > + .value = V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = FRAME_RC_ENABLE, > + .min = 0, > + .max = 1, > + .step_or_mask = 1, > + .value = 1, > + }, > + { > + .cap_id = GOP_SIZE, > + .min = 0, > + .max = (1 << 16) - 1, > + .step_or_mask = 1, > + .value = 30, > + }, > + { > + .cap_id = ENTROPY_MODE, > + .min = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC, > + .max = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC, > + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC) | > + BIT(V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CABAC), > + .value = V4L2_MPEG_VIDEO_H264_ENTROPY_MODE_CAVLC, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_H264_ENTROPY_CONTROL, > + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, > + }, > + { > + .cap_id = MIN_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MIN_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP_HEVC, > + .step_or_mask = 1, > + .value = MIN_QP_8BIT, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_H264, > + .min = MIN_QP_8BIT, > + .max = MAX_QP, > + .step_or_mask = 1, > + .value = MAX_QP, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > + { > + .cap_id = MAX_FRAME_QP_HEVC, > + .min = MIN_QP_8BIT, > + .max = MAX_QP_HEVC, > + .step_or_mask = 1, > + .value = MAX_QP_HEVC, > + .hfi_id = HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2, > + .flags = CAP_FLAG_OUTPUT_PORT, > + }, > +}; > + > static struct platform_inst_caps platform_inst_cap_sm8250 = { > .min_frame_width = 128, > .max_frame_width = 8192, > @@ -123,8 +300,10 @@ struct iris_platform_data sm8250_data = { > .fwname = "qcom/vpu-1.0/venus.mbn", > .pas_id = IRIS_PAS_ID, > .inst_caps = &platform_inst_cap_sm8250, > - .inst_fw_caps = inst_fw_cap_sm8250, > - .inst_fw_caps_size = ARRAY_SIZE(inst_fw_cap_sm8250), > + .inst_fw_caps_dec = inst_fw_cap_sm8250_dec, > + .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8250_dec), > + .inst_fw_caps_enc = inst_fw_cap_sm8250_enc, > + .inst_fw_caps_enc_size = ARRAY_SIZE(inst_fw_cap_sm8250_enc), > .tz_cp_config_data = &tz_cp_config_sm8250, > .hw_response_timeout = HW_RESPONSE_TIMEOUT_VALUE, > .num_vpp_pipe = 4, > diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c > index 6afbd2f89260a233d75d7a0cdf3647236216c9ec..fcefd7c36335efd4154159d8a7fab31fae33a2fe 100644 > --- a/drivers/media/platform/qcom/iris/iris_vdec.c > +++ b/drivers/media/platform/qcom/iris/iris_vdec.c > @@ -54,7 +54,7 @@ int iris_vdec_inst_init(struct iris_inst *inst) > inst->buffers[BUF_OUTPUT].min_count = iris_vpu_buf_count(inst, BUF_OUTPUT); > inst->buffers[BUF_OUTPUT].size = f->fmt.pix_mp.plane_fmt[0].sizeimage; > > - memcpy(&inst->fw_caps[0], &core->inst_fw_caps[0], > + memcpy(&inst->fw_caps[0], &core->inst_fw_caps_dec[0], > INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap)); > > return iris_ctrls_init(inst); > diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c > index 11666f40a4d1c34e1b6eca0b5e40e0f09eeb2b67..4630ba12349a62a37515e93ed5efa2df197bce17 100644 > --- a/drivers/media/platform/qcom/iris/iris_venc.c > +++ b/drivers/media/platform/qcom/iris/iris_venc.c > @@ -7,12 +7,14 @@ > #include > > #include "iris_buffer.h" > +#include "iris_ctrls.h" > #include "iris_instance.h" > #include "iris_venc.h" > #include "iris_vpu_buffer.h" > > int iris_venc_inst_init(struct iris_inst *inst) > { > + struct iris_core *core = inst->core; > struct v4l2_format *f; > > inst->fmt_src = kzalloc(sizeof(*inst->fmt_src), GFP_KERNEL); > @@ -61,7 +63,10 @@ int iris_venc_inst_init(struct iris_inst *inst) > inst->operating_rate = DEFAULT_FPS << 16; > inst->frame_rate = DEFAULT_FPS << 16; > > - return 0; > + memcpy(&inst->fw_caps[0], &core->inst_fw_caps_enc[0], > + INST_FW_CAP_MAX * sizeof(struct platform_inst_fw_cap)); > + > + return iris_ctrls_init(inst); > } > > void iris_venc_inst_deinit(struct iris_inst *inst) >