From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EFBDF51D530 for ; Wed, 30 Sep 2026 18:30:53 +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=1790793055; cv=none; b=DPQ3qytSwkv/NBj0afi7ucw++eDadIbPX1eNFbXXzHL6bZhyZgOXs84s6WfUyYVNSO9V3gtL+zJ5CvCAxhM+qyZWf91TcLwwFhfrHJjw2fCih6MPPnxPTEJo41CXEzGDK2Ccmugx3x/rKReyeSCVRSjZtP+ttmdVrXgYe4yWTJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790793055; c=relaxed/simple; bh=mAxOAlMMRkWh1yh8LfLmlNQ4kbcNvHcavtV14azCbiw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PxqgkDJPZk3l5Ie0FJyRZd8zA+shqXf4go/Cns+kA+7v9lG/AtESGXSwRnqWT5LC149FYJ2ZxXmNC0jfUPeGTDXyh309qk6/rjyGzl35gDuWuVJL+8UoSWlLIBPHlEYxtnKfPGXn2nadjQdkSBJFp6Z79b8i9RMIcfFM7+EvN0k= 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=A4OyhP+t; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=N0nho+6E; 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="A4OyhP+t"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="N0nho+6E" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68UHeieE4160500 for ; Wed, 30 Sep 2026 18:30:53 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= pHIpVSipQbHA6RS8sQq95y3zDqwaWvxYiVGvhk4FKck=; b=A4OyhP+tz0bf0Ibi GwME16BrHV0nPizwyZ4wiQa0CXfP0iEXyEpkHxNEyAYBaEzxA4hpxwzMIMhObDFp dniCasylvCcOe/8gIqAaPF4aZWtdFYnM8Kuy03x7T1Yilvvzthk7P6jlhkEJ9iNb UJnj9GiFRJ2oNVXOd9WJy15AJtxKqyKOQxcPBvmTFQ3qjDo8SQkeKpLytdtnmBgy gtVwYYWzPWX3uS1AXRYlQwQu2pholyJH1pwwWuBtiJH+HpyMWoD74zFeqNf4TNgg zPkSGl69FoEQhAI0PE3nWSWoueReYp8aAaCxQn88xjDsonRdq+SkeFyRJkakU6Px Cj5cPA== Received: from mail-dy1-f198.google.com (mail-dy1-f198.google.com [74.125.82.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4h167pgh0m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 30 Sep 2026 18:30:52 +0000 (GMT) Received: by mail-dy1-f198.google.com with SMTP id 5a478bee46e88-313c7315becso910365eec.2 for ; Wed, 30 Sep 2026 11:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790793052; x=1791397852; 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=pHIpVSipQbHA6RS8sQq95y3zDqwaWvxYiVGvhk4FKck=; b=N0nho+6EHskRVmPsdMrgbEEZwYNWayOFnd+MkMC4k1QkSVB0nIRujt2YnDLe/J7/AT yqXx3J+9g+DoxQ2WWXBSYylAkAPk9KqddXBQNO4Y7ZtvpiTfQd/B9eduL5W0s/+KWxMY OjVevPUpTAsaqZl7tsaDwe84AV+pltdgPX2P9I7oOWxzoeeiI1nM3IlGLluRxFeJiC1e bsW5NpcZ845y1QkSu3sWlCgGr0WsMVg2GvO2ORoQhAMPmsfXq+ePbOvtRxEc6zp8i25g fgR5it5+2w9PSo0GssYu4ep9j0C9YEBlJ9caBM7UUaGfbFxeKtELay8YJJoGY/TY6WAH OArA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790793052; x=1791397852; 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=pHIpVSipQbHA6RS8sQq95y3zDqwaWvxYiVGvhk4FKck=; b=OMnf8PHVrpqIJykMNr1nU6FWDt0r/bvIN+NMCg4CDHs/KvF9LMnslv49Ly6P8HZxd/ jF76xcYQnwKfK3KgH4n/Jpe2YNtL6S9xck2Ep6G1AQEQcLJBbDAryumqgBg1fo9wo4Pw B7kMXKevl/P+CojuoDmTwney/akmYQDDp9WRvIPd00alShB1jR4Os4KipTDj3RXHyucH E8OKsZ5K1MUBNg37QcqrHHS2NI6OZvEZO/FYC5b/Pfp2ay54iZEOZN6wfK7beSbE8us8 w5c90KV8DXi2xwt0rSg3VYqsZwkLxw7GSKAhmiRADei9j9aBh9/o8UyMsxCUJcLfC9qo v+Dg== X-Forwarded-Encrypted: i=1; AKwUvBwmLPVmBe/59PjtpBm+vfpz2mL+f69otK0diRg22OiW/I8VukWd4YzBufx+Uvtb07S4uW4ocxVDLWlU9gk=@vger.kernel.org X-Gm-Message-State: AFq9FYL8Hp1JjpfDLnKhzpsnbDk2jc88Hjq+7lR89Kmseh+LFMURSZoi rVyJoxJ2MCjjmBK+XBoYhRlSdN8ztC7ZB3XhSikvVyCcs+Q5h28Z/Amt/uxXa1xQgxXlZTqhadw e5oEhVyk76uTvqkBdGlUw9lcjzXPthPOakCDjlrdlVzRRTW1Y9QfW5wEZjm4lpCbC4dA= X-Gm-Gg: AYBFou2ypowys4pWKbGvW72zdUdSoZ9hGmNL8lD0gzshFv3CR+vIW4v6Whq2vx37VcF OYKKlcGvJrZ3NU01Y70diVGikNNlzPPanhKE9ZyO34zdM5/bUVKv8+zXPRzP9PKPrlDnkdVCFVk gwtb1rOtK2LaSbDJgPmHrxI9S/K6l+d88+GTxfTyOayjhl7OWv7WRUBMt4wOdfD8o/mBOtSDTkA wuMIe1ByMk2zkUEpJYO/YsM0B3LD3Ax4YM6A0gpokgRX7YqltTlQ6STF8UgevvM4MbvAqH6NtzU uG7Euqr9I4rkf+Hc7yu6FiCHZfRwQVenweHMXRddjkowD9rvH+JvrrjxWAMWgQbddHGz+X68T3g OiLLPXLUkH9CG8rPJKxMqkDh9tLvq5/Gk59XE/Lb0fOHSQ//2E4nbdpplUy+1 X-Received: by 2002:a05:7301:1295:b0:33e:4e49:d08d with SMTP id 5a478bee46e88-34cdac15d06mr5456879eec.1.1790793051349; Wed, 30 Sep 2026 11:30:51 -0700 (PDT) X-Received: by 2002:a05:7301:1295:b0:33e:4e49:d08d with SMTP id 5a478bee46e88-34cdac15d06mr5456822eec.1.1790793050539; Wed, 30 Sep 2026 11:30:50 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-34db491fae1sm750926eec.24.2026.09.30.11.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2026 11:30:43 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Wed, 30 Sep 2026 11:30:27 -0700 Subject: [PATCH v8 4/5] media: iris: Add HFI metadata buffer delivery support for Gen2 encoders Precedence: bulk X-Mailing-List: linux-kernel@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: <20260930-enc_roi_enable-v8-4-2c908f30e963@oss.qualcomm.com> References: <20260930-enc_roi_enable-v8-0-2c908f30e963@oss.qualcomm.com> In-Reply-To: <20260930-enc_roi_enable-v8-0-2c908f30e963@oss.qualcomm.com> To: Mauro Carvalho Chehab , Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Deepa Guthyappa Madivalara , kernel test robot X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1790793031; l=13114; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=mAxOAlMMRkWh1yh8LfLmlNQ4kbcNvHcavtV14azCbiw=; b=Fs9hXVzg4UWrRGnAaoTjshg048W7kRAaYFsAf76jaDaKGkU/TEESNpvjgxobE58EDVYK/lPDk xTObyvHlvbPD7r4cZHwXoLRvEC4ZNMqvbdLmTndw2VQiLWMgJujPsF+ X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-ORIG-GUID: n5TMyQDUtUyr7k_zZxMpGdQGLvd1Kjnk X-Proofpoint-Spam-Info: AW1haW4tMjYwOTMwMDA3NSBTYWx0ZWRfX8RPcfZQJcXR9 jA+5Es+dSE71mGZteavGmAZBq2NfUJr7fwSIgX3NWwZYRM9pC0s5FWaCpSp9mL1WDiev4dam0Ht OJ3eub5fiBQWKsdV6x5/iIs/xO+eIaM= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTMwMDA3NSBTYWx0ZWRfX0xhFW4nlPIUS Z79a+883CEK1b36fzO/0ZSxhOKfG4duy/Sm+yfMEmopPQaIvgdYRIG2ZLfbp2XLleSY/D5sl4Py fx2UNyc9/uYkQgEniYf1X4soWbRlLIB4XMBbpHp3iojZeVmX6DbMYik9KL7gztg/dwYImwzaPAV +bKhVqEAoS6WsIMfyjWayqNSzlY+QCyqgH6WPmbCnBoXAFr+SyBlMRcoLIanPfJTEAl0Woh6NLF WPuwKxjqpRTza9uLY9o54Y3lqbOi2xPC7dMtCnezHgz+COeabYWNpR4DqvpBcZBsOFFVZL8gEnz RKD/q0wz1HAro+qncOqJpU3zLNIKMFtZC9sYT3A4MYAnxcYiYlEI4nIeHEhFj6UM4wbBIRCsAMU lTWjZI5EQtXYkqSLIApxbdMds3CSUfGnHijOqPfstLzZITic/HhcHP2b/nmnIYda+u+nr1gVnAU vb7So2j3T/rp6fxuUhw== X-Proofpoint-GUID: n5TMyQDUtUyr7k_zZxMpGdQGLvd1Kjnk X-Authority-Analysis: v=2.4 cv=WpC+otfv c=1 sm=1 tr=0 ts=6abd555c cx=c_pps a=wEP8DlPgTf/vqF+yE6f9lg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=gkYz9yhuOFcMo22kqTsA:9 a=QEXdDO2ut3YA:10 a=bBxd6f-gb0O0v-kibOvt:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-30_04,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 phishscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 malwarescore=0 impostorscore=0 adultscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609300075 Add the infrastructure to deliver metadata buffers to the HFI firmware on HFI Gen2 based encoders, used to carry per-frame ROI delta QP data. Metadata buffer structures (iris_buffer.h): - Add metabuf_header and metapayload_header structs describing the metadata buffer layout as expected by the firmware. HFI defines (iris_hfi_gen2_defines.h): - Add HFI_CMD_DELIVERY_MODE (0x0100000A). - Add HFI_MODE_METADATA (0x00000004) to hfi_property_mode_type. HFI command side (iris_hfi_gen2_command.c): - In iris_hfi_gen2_session_queue_buffer(), after queuing a RAW (input) buffer, check for an available BUF_ROIMB_DELTAQP metadata buffer and, if found, append a second HFI_CMD_BUFFER packet for the metadata buffer in the same command, tagged with the same buffer index. - Add iris_hfi_gen2_subscribe_metadata_delivery(): sends HFI_CMD_DELIVERY_MODE with HFI_MODE_METADATA and HFI_PROP_ROI_INFO to instruct the firmware to expect metadata on the input port. HFI response side (iris_hfi_gen2_response.c): - Add iris_hfi_gen2_handle_output_metadata_buffer(): locate the metadata buffer by device address and transition it from QUEUED to DEQUEUED so it can be reused. Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/platform/qcom/iris/iris_buffer.h | 18 ++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.c | 12 +++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_common.h | 1 + .../platform/qcom/iris/iris_hfi_gen2_command.c | 39 ++++++++++++++++++++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 ++ .../platform/qcom/iris/iris_hfi_gen2_packet.c | 6 ++-- .../platform/qcom/iris/iris_hfi_gen2_packet.h | 3 ++ .../platform/qcom/iris/iris_hfi_gen2_response.c | 27 +++++++++++++++ drivers/media/platform/qcom/iris/iris_venc.c | 4 +++ 10 files changed, 110 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h index ab8e5d953101a786ade20540ee3c3ed226160cbe..ee2d24bb69c57220b0a735d9b4aae4434a33daf6 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.h +++ b/drivers/media/platform/qcom/iris/iris_buffer.h @@ -107,6 +107,24 @@ struct iris_buffers { u32 size; }; +/* Metadata buffer header */ +struct metabuf_header { + u32 count; + u32 size; + u32 version; + u32 reserved[5]; +}; + +/* Metadata buffer payload header */ +struct metapayload_header { + u32 type; + u32 size; + u32 version; + u32 offset; + u32 flags; + u32 reserved[3]; +}; + int iris_get_buffer_size(struct iris_inst *inst, enum iris_buffer_type buffer_type); void iris_get_internal_buffers(struct iris_inst *inst, u32 plane); int iris_create_internal_buffers(struct iris_inst *inst, u32 plane); diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c index 9f84d28d00ab25555f1d2259f7ef0ed0786a0271..142c9712bb0b05bea2cf656be636e7449e361512 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -1608,3 +1608,15 @@ int iris_set_properties(struct iris_inst *inst, u32 plane) return 0; } + +int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane) +{ + const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; + int ret = 0; + + /*subscribe to metadata delivery only if ROI is enabled */ + if (!inst->fw_caps[ROI_PARAMS].p_array) + return ret; + + return hfi_ops->session_subscribe_metadata_delivery(inst, plane); +} diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h index 5180d53d3c904cad460b2760913b475d0ff1bb55..9957b69366f50310338a0c1470d9744592655c33 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -50,5 +50,6 @@ int iris_set_layer_bitrate(struct iris_inst *inst, enum platform_inst_fw_cap_typ int iris_set_req_sync_frame(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_time_delta_based_rc(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); +int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h index a27447eb2519962cb958b0e330a6d018310c3450..5692375cdd357f9b00760053ffff5af4bd9cce9c 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_common.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h @@ -131,6 +131,7 @@ struct iris_hfi_session_ops { int (*session_drain)(struct iris_inst *inst, u32 plane); int (*session_resume_drain)(struct iris_inst *inst, u32 plane); int (*session_close)(struct iris_inst *inst); + int (*session_subscribe_metadata_delivery)(struct iris_inst *inst, u32 plane); }; struct hfi_subscription_params { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 388a36ff2b07b7bcd8db21d4345bc900356b4ec3..cf88dbe11e8e9faef826e661d8e9909fd7f16b94 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -1307,6 +1307,24 @@ static void iris_hfi_gen2_get_buffer(u32 domain, struct iris_buffer *buffer, buf->timestamp = buffer->timestamp; } +static struct iris_buffer *iris_queue_metadata_buffers(struct iris_inst *inst, + enum iris_buffer_type buffer_type, u32 index) +{ + struct iris_buffers *buffers = &inst->buffers[buffer_type]; + struct iris_buffer *buffer = NULL; + + if (list_empty(&buffers->list)) + return NULL; + + buffer = list_first_entry(&buffers->list, typeof(*buffer), list); + if ((buffer->attr & BUF_ATTR_QUEUED) || (buffer->attr & BUF_ATTR_DEQUEUED)) + return NULL; + + buffer->index = index; + + return buffer; +} + static int iris_hfi_gen2_session_queue_buffer(struct iris_inst *inst, struct iris_buffer *buffer) { struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst); @@ -1359,6 +1377,26 @@ static int iris_hfi_gen2_session_release_buffer(struct iris_inst *inst, struct i inst_hfi_gen2->packet->size); } +static int iris_hfi_gen2_subscribe_metadata_delivery(struct iris_inst *inst, u32 plane) +{ + struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst); + u32 port = iris_hfi_gen2_get_port(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); + u32 payload[2] = {HFI_MODE_METADATA, HFI_PROP_ROI_INFO}; + + iris_hfi_gen2_packet_session_command(inst, + HFI_CMD_DELIVERY_MODE, + (HFI_HOST_FLAGS_RESPONSE_REQUIRED | + HFI_HOST_FLAGS_INTR_REQUIRED), + port, + inst->session_id, + HFI_PAYLOAD_U32_ARRAY, + &payload, + sizeof(u32) * 2); + + return iris_hfi_queue_cmd_write(inst->core, inst_hfi_gen2->packet, + inst_hfi_gen2->packet->size); +} + static const struct iris_hfi_session_ops iris_hfi_gen2_session_ops = { .session_open = iris_hfi_gen2_session_open, .session_set_config_params = iris_hfi_gen2_session_set_config_params, @@ -1372,6 +1410,7 @@ static const struct iris_hfi_session_ops iris_hfi_gen2_session_ops = { .session_drain = iris_hfi_gen2_session_drain, .session_resume_drain = iris_hfi_gen2_session_resume_drain, .session_close = iris_hfi_gen2_session_close, + .session_subscribe_metadata_delivery = iris_hfi_gen2_subscribe_metadata_delivery, }; static struct iris_inst *iris_hfi_gen2_get_instance(void) 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 08fc1036013de29e51747a6425ae7bb805ca3e0f..d0661f5fe6a6f39295dad8950edb2f1a85893216 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -20,6 +20,7 @@ #define HFI_CMD_DRAIN 0x01000007 #define HFI_CMD_RESUME 0x01000008 #define HFI_CMD_BUFFER 0x01000009 +#define HFI_CMD_DELIVERY_MODE 0x0100000A #define HFI_CMD_SUBSCRIBE_MODE 0x0100000B #define HFI_CMD_SETTINGS_CHANGE 0x0100000C #define HFI_CMD_PAUSE 0x01000011 @@ -175,6 +176,7 @@ enum hfi_flip { enum hfi_property_mode_type { HFI_MODE_PORT_SETTINGS_CHANGE = 0x00000001, HFI_MODE_PROPERTY = 0x00000002, + HFI_MODE_METADATA = 0x00000004, }; enum hfi_color_format { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c index 0d05dd2afc07d830cc8502ab5f28001312991ba8..aeb0426a05694f219f82145cd84a28287ed3075e 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c @@ -100,9 +100,9 @@ static void iris_hfi_gen2_create_header(struct iris_hfi_header *hdr, hdr->num_packets = 0; } -static void iris_hfi_gen2_create_packet(struct iris_hfi_header *hdr, u32 pkt_type, - u32 pkt_flags, u32 payload_type, u32 port, - u32 packet_id, void *payload, u32 payload_size) +void iris_hfi_gen2_create_packet(struct iris_hfi_header *hdr, u32 pkt_type, + u32 pkt_flags, u32 payload_type, u32 port, + u32 packet_id, void *payload, u32 payload_size) { struct iris_hfi_packet *pkt = (struct iris_hfi_packet *)((u8 *)hdr + hdr->size); u32 pkt_size = sizeof(*pkt) + payload_size; diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h index 25b9582349ca1a0ce6efc0b146a3abb798485c45..613eb500609f745daebdcbdf9a25b85cb9465a79 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h @@ -121,5 +121,8 @@ void iris_hfi_gen2_packet_session_property(struct iris_inst *inst, void iris_hfi_gen2_packet_sys_interframe_powercollapse(struct iris_core *core, struct iris_hfi_header *hdr); void iris_hfi_gen2_packet_sys_pc_prep(struct iris_core *core, struct iris_hfi_header *hdr); +void iris_hfi_gen2_create_packet(struct iris_hfi_header *hdr, u32 pkt_type, + u32 pkt_flags, u32 payload_type, u32 port, + u32 packet_id, void *payload, u32 payload_size); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c index 8c2644c7f6e85983d7ad7584fc0cb570e4813ae4..84b629b957442c024dccc18b354ac9a7e541abaa 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c @@ -77,6 +77,7 @@ static bool iris_hfi_gen2_is_valid_hfi_buffer_type(u32 buffer_type) case HFI_BUFFER_PERSIST: case HFI_BUFFER_VPSS: case HFI_BUFFER_PARTIAL_DATA: + case HFI_BUFFER_METADATA: return true; default: return false; @@ -452,6 +453,30 @@ static int iris_hfi_gen2_handle_release_internal_buffer(struct iris_inst *inst, return 0; } +static int iris_hfi_gen2_handle_output_metadata_buffer(struct iris_inst *inst, + struct iris_hfi_buffer *buffer) +{ + u32 buf_type = iris_hfi_gen2_buf_type_to_driver(inst, HFI_BUFFER_METADATA); + struct iris_buffers *buffers = &inst->buffers[buf_type]; + struct iris_buffer *buf, *iter; + bool found = false; + + list_for_each_entry(iter, &buffers->list, list) { + if (iter->device_addr == buffer->base_address) { + found = true; + buf = iter; + break; + } + } + if (!found) + return -EINVAL; + + buf->attr &= ~BUF_ATTR_QUEUED; + buf->attr |= BUF_ATTR_DEQUEUED; + + return 0; +} + static int iris_hfi_gen2_handle_session_stop(struct iris_inst *inst, struct iris_hfi_packet *pkt) { @@ -499,6 +524,8 @@ static int iris_hfi_gen2_handle_session_buffer(struct iris_inst *inst, return iris_hfi_gen2_handle_input_buffer(inst, buffer); else if (buffer->type == HFI_BUFFER_BITSTREAM) return iris_hfi_gen2_handle_output_buffer(inst, buffer); + else if (buffer->type == HFI_BUFFER_METADATA) + return iris_hfi_gen2_handle_output_metadata_buffer(inst, buffer); else return iris_hfi_gen2_handle_release_internal_buffer(inst, buffer); } diff --git a/drivers/media/platform/qcom/iris/iris_venc.c b/drivers/media/platform/qcom/iris/iris_venc.c index a945992f63aa8a0c40b8d6bc473d0bc90270e6cd..21ba9639d17b2c64e8fa33b4aacbd1946fc4dae2 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.c +++ b/drivers/media/platform/qcom/iris/iris_venc.c @@ -498,6 +498,10 @@ int iris_venc_streamon_output(struct iris_inst *inst) if (ret) goto error; + ret = iris_set_metadata_delivery(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); + if (ret) + goto error; + ret = iris_alloc_and_queue_persist_bufs(inst, BUF_ARP); if (ret) return ret; -- 2.34.1