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 2356930CD81 for ; Fri, 16 Oct 2026 23:00:59 +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=1792191661; cv=none; b=YCMXcAy4nUKgnZV/Nl71c2r98d1a8/gCqJcLfKC1NktguUhLXzr4lkMg/tQsW60Lwghvl8pj1PGJ/Nd0P68HCzR06RMNNN5Oz7DJa/70o8T8dqZwibwQoTlo0uVn9cWFX7iXAv4Z/QXuC7viGYywFfW82fA6/Hhm2rHrj3TAIrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792191661; c=relaxed/simple; bh=wyc/gDvdVylTVh/DJplDeByFRAMVZ5kCTDl+3ybDrvI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=atmmZjVLKs0qN+VGUVngLccoTltE6P0hUi+h+ErVwjXtdF7nPvSFEi8kOzvGBqlbcA4Qa5wRDU61YmKof+rzPE6w/tQhGkwdHZpQKOI0Ge4o2FuODLl6+sxFTSeSYerSvwkUPI0Yfn5nkraHlm8SEyAGuY1xV9YTmB9SJcPh994= 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=LCH17X7R; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bG7xg/V1; 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="LCH17X7R"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bG7xg/V1" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69GJeq1A3636998 for ; Fri, 16 Oct 2026 23:00:58 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= IdPQaK1IkxsirGKxXTDIUcBt2ycmBMVNDLInrZiqFKQ=; b=LCH17X7RXzrJsmvD mSs70U0PvObfhuOvQlSRuv+ZptozawHd3iR+PXhE9Lm1TJLYzB3RdQ2yAA4zBwMt ksy3R2mu7Y7B+qc6SDlOgHJyMNuK943K8RI41aVEpKBr6wgoRYX/M2KjpECbvyxB Pi4iVbZQ8Tl8qGupphKxy7fSDgFRlQ4GCJNrBcpUlcxjzMAfRlGFBYV+cZiLQ75m KjAg3fE59unCTw7WOY7S2BL1m7pooAzE6/IFcEQpUtOArrk6qRSZTCZEysrVubUW hLz41bEF3Mj3/Hm27IOfFtHcgkl12giR1CECbW9+NZQuIKywxAzETXrVyNsfSPWb NErHIg== Received: from mail-dy1-f200.google.com (mail-dy1-f200.google.com [74.125.82.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4hbmmq214w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 16 Oct 2026 23:00:57 +0000 (GMT) Received: by mail-dy1-f200.google.com with SMTP id 5a478bee46e88-34e650cff93so48476eec.2 for ; Fri, 16 Oct 2026 16:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1792191657; x=1792796457; 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=IdPQaK1IkxsirGKxXTDIUcBt2ycmBMVNDLInrZiqFKQ=; b=bG7xg/V1F3soE1KVzKnsN4Tssvz3LTsSgKzFXdcLyOQ3R8l9VHURt1G4qqUFX8N56c g6qB5iaN+IECI7iFnAML+mt5sUHuj8doKfuXo7XvCF+1wsCRFjV7R0ig5EEsmxIQZLim 5dTgsj9mPZWdpjgqrjUgq6uPvwNf/vq5K3eb6g/tdSD7ZCNufjttv8Tkwl2Y7qBrVHxF bHfeEOTCY5Yu7oQagqIZuX+uN/VDapQ1KYeRiwn3jguk765Phf3CueRqFNeUMj94FgqZ xUB1jAwx+Mue+Gdw9VVNBvZUG4yqexUn9qJ3t3GiZD4OrSz5bjh1qf8PMvPXV7SqlHb2 3NAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792191657; x=1792796457; 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=IdPQaK1IkxsirGKxXTDIUcBt2ycmBMVNDLInrZiqFKQ=; b=BdzmHMGsHtsEVhPbrRjY6UuZ5XQJVuoouV/HIQUjwAnf5o2U6kBa9QCvqL4sbPbykk Fmw5M5RvwyucA/IT+SRLDREC/pQ3OA0Hm0mgWx2G9A+JfJHf3H92oRnYvqpeTqOVF3bA 3u1zf/mlAijEmVJ4qoQe7HyFacQ5fNRTkdGTpQfthzQ5n98Os2U9zrREEmieW16c5RE3 dKeNi3cCW1VY4NRAEPw/yRyTyDPgiGnefvVFs2ZycmlXLi9ZB+cuSqx8QssTlx/kG6io MX02oXbiVRLpM9qYqNDajehvaP5OIiUQ9u65CvgSPXv0hIciGyrExNvsCTj/RCAzOfZw tODQ== X-Forwarded-Encrypted: i=1; AKwUvBws12dHCUicT9QDMCzDOSqq3/OBkKnmkHKPGl2C+KDRkUXTDxMtum1y9AR9sVVl/DDk/ngPi9ZTnoWQi08=@vger.kernel.org X-Gm-Message-State: AFq9FYJknXPtXnVBsNUhoyHRtsFR9dRrUxDRN0TBxqda+aUEFdbuNtAi tYByKMCRm0QAEV5p0FpoEcsef1WDVl0INPK3NzIebcr7NPbQ7LeAmA+wmXRTtxc6oUfzHR8dLds Zm/QHw8ftc2iunDbuDE4RDHEVSE7BzJFCbroPQMNkj2nQrrpRI/c8mhKt3DywL30e/CME3VzN39 U= X-Gm-Gg: AYBFou20InXRKrycxYQr5b1cEcWy8hnAeTJ350ODoI42ioT2LhCmpIUN/o1714x87A3 O2s52cEHvYO5iN3wsprb5oyL8vwbCgLg9Xhye6JN4JKkO+/Z3Pen6wych3c7r1cS1TNRo6hk7bU 4Frfr6ZFjrt5V4NMnTgz7wfD8KPJN2U+e9O9hc8WKkHQJQnjhpO7cz609cRrmVFHUSDa5/l2cuz onHDy0YdQgHvKrQHMSVN81nRS2pTJaoV5P6wUivxj8liXOQcOPZzCOhNPY4YvVw+2eutdUETxHo fsoCq1rK6LzIKsqLjqyspP6aj9niiGvwft8tGbJifgPrrllktdrLvw+HGO0BBQ6pC0NPEOhQuG4 ryibPaaqHsf4qk/QJkLsfbvocbCT8AR2A15BJ6vhqIwZvumaBd80G795GFJE= X-Received: by 2002:a05:7301:da84:b0:351:7e15:9c59 with SMTP id 5a478bee46e88-3619b30919emr2408951eec.0.1792191656859; Fri, 16 Oct 2026 16:00:56 -0700 (PDT) X-Received: by 2002:a05:7301:da84:b0:351:7e15:9c59 with SMTP id 5a478bee46e88-3619b30919emr2408889eec.0.1792191656159; Fri, 16 Oct 2026 16:00:56 -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-360820a79c7sm9379101eec.18.2026.10.16.16.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2026 16:00:55 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Fri, 16 Oct 2026 16:00:36 -0700 Subject: [PATCH v10 5/5] media: iris: Add BUF_ROIMB_DELTAQP metadata buffer for ROI delta QP 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: <20261016-enc_roi_enable-v10-5-bc5bd37b6f3e@oss.qualcomm.com> References: <20261016-enc_roi_enable-v10-0-bc5bd37b6f3e@oss.qualcomm.com> In-Reply-To: <20261016-enc_roi_enable-v10-0-bc5bd37b6f3e@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 , Vishnu Reddy X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1792191637; l=13526; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=wyc/gDvdVylTVh/DJplDeByFRAMVZ5kCTDl+3ybDrvI=; b=j4pKd2LVKFx2f79XAsrcqkb1/+r5DbNG8ynh8C0tV/xp2AjUiOn/Eb9OJXRD0c7lKxBmSMxTx Xk2neQr9ExRB/1nDnCb6ooTxwJpsG47y9qOQw9Lx1ro/4C2HdMxhFlv X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE2MDA5MSBTYWx0ZWRfX+RwuaCgU6fmt crid5Bswc+eE3QvZ5AFSBDRhslmyrVzOkoXggJFe5D90twwX+9rRl1B/saXcCSVnMI2UPkWSU47 f3RVKElbqShT60ulF5jiUsXnyLM7UH8= X-Authority-Analysis: v=2.4 cv=P9uvFSAu c=1 sm=1 tr=0 ts=6ad2acaa cx=c_pps a=PfFC4Oe2JQzmKTvty2cRDw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=s8F71vpxD9iY_bj2qIcA:9 a=QEXdDO2ut3YA:10 a=6Ab_bkdmUrQuMsNx7PHu:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE2MDA5MSBTYWx0ZWRfX37IgpVb2bUQ8 sCpwlWUF2Kqk3FLVRpbowk57iKoA0A33qc2MWPc+5/Shg1AskwXgl8NiQ53BwOoHiWGRLYB622P uOx+KoK86WS5sBH9Od9G0c47kjoCg2Wuu4Yc1m+SJV2bNZIgeDrILg/JV/JG9Z5NkcGrzHmEdsF RKYeoeVAmhHvu8/HnRP/PaqHQj+Zg0RTic1LljeN1AJVEEuftdB87d6Rz7ZE0U5vjaHSxQkO7gl IHcmlX/j8ZJXTN72J+bYR6vFgCxV9/UPrtYRG8Ze//7Horrxk9AkTuUfMG/LE1WNfacF7CIvgyz rcwvo8XxSDEzZZ49BNCQ1oy+P4ZdYRPP3FkUgbNeAx+vi1dCqpRizZ2a5TEf5irRMMm/YgIN0wg 2oDylw2ZA2ajuxSy7qZ6m60OBk6rd3F8FCgn4QY68LE8mb29vrNShgFtC/7CuhQkrJtWZdqLCT+ LODPXb7RDX0wYwjs1vA== X-Proofpoint-GUID: d-RWmCYfUb5Wy04fahesl2yI795NwJT9 X-Proofpoint-ORIG-GUID: d-RWmCYfUb5Wy04fahesl2yI795NwJT9 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-10-16_03,2026-10-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610160091 - Introduce BUF_ROIMB_DELTAQP as a new internal buffer type to carry per-macroblock ROI delta QP data to the firmware. This buffer is allocated on demand when the application sets ROI parameters via V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP, and is queued alongside each raw input buffer as an HFI_BUFFER_METADATA packet on HFI_PORT_RAW. - The metadata buffer layout follows the firmware-defined metabuf_header and metapayload_header structures. The s8 per-MB delta QP values supplied by userspace are widened to s16 as required by the firmware. Reviewed-by: Vishnu Reddy Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/platform/qcom/iris/iris_buffer.c | 115 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_buffer.h | 4 + drivers/media/platform/qcom/iris/iris_ctrls.c | 28 +++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 1 + .../platform/qcom/iris/iris_hfi_gen2_command.c | 24 +++++ .../platform/qcom/iris/iris_hfi_gen2_response.c | 2 + drivers/media/platform/qcom/iris/iris_vidc.c | 2 + 8 files changed, 177 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media/platform/qcom/iris/iris_buffer.c index eb8de60c1177f5e1ab83b90a3c8c80e0b4d1f02e..fa73c382082443b90fbcce4fb955760416331380 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_buffer.c @@ -5,11 +5,13 @@ #include #include +#include #include "iris_buffer.h" #include "iris_instance.h" #include "iris_power.h" #include "iris_vpu_buffer.h" +#include "iris_hfi_gen2_defines.h" #define PIXELS_4K 4096 #define MAX_WIDTH 4096 @@ -705,6 +707,20 @@ int iris_destroy_dequeued_internal_buffers(struct iris_inst *inst, u32 plane) return iris_destroy_internal_buffers(inst, plane, false); } +int iris_destroy_roi_metadata_buffers(struct iris_inst *inst) +{ + struct iris_buffer *buf, *next; + struct iris_buffers *buffers; + + if (inst->domain == ENCODER) { + buffers = &inst->buffers[BUF_ROIMB_DELTAQP]; + list_for_each_entry_safe(buf, next, &buffers->list, list) + iris_destroy_internal_buffer(inst, buf); + } + + return 0; +} + static int iris_release_internal_buffers(struct iris_inst *inst, enum iris_buffer_type buffer_type) { @@ -928,3 +944,102 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf) return 0; } + +static int iris_fill_roi_data(struct iris_inst *inst, struct iris_buffer *buffer) +{ + s8 *p_array = (s8 *)inst->fw_caps[ROI_PARAMS].p_array; + u32 payload_offset, lcu_width, lcu_height, row_size; + u32 array_size = inst->fw_caps[ROI_PARAMS].elems; + struct metabuf_header *mbuf_hdr = buffer->kvaddr; + struct metapayload_header *mbuf_payload_hdr; + struct v4l2_format *f = inst->fmt_src; + s16 *p_16, *p_temp; + + memset(mbuf_hdr, 0, sizeof(struct metabuf_header) + + sizeof(struct metapayload_header)); + mbuf_hdr->count = 1; + mbuf_hdr->size = sizeof(struct metabuf_header) + + sizeof(struct metapayload_header); + mbuf_hdr->version = BIT(16); + mbuf_hdr++; + mbuf_payload_hdr = (struct metapayload_header *)(mbuf_hdr); + payload_offset = sizeof(struct metabuf_header) + + sizeof(struct metapayload_header); + + mbuf_payload_hdr->type = HFI_PROP_ROI_INFO; + mbuf_payload_hdr->version = BIT(16); + mbuf_payload_hdr->offset = ALIGN(payload_offset, 256); + + if (inst->codec == V4L2_PIX_FMT_HEVC) { + lcu_width = DIV_ROUND_UP(inst->enc_raw_width, 32); + lcu_height = DIV_ROUND_UP(inst->enc_raw_height, 32); + } else { + lcu_width = DIV_ROUND_UP(inst->enc_raw_width, 16); + lcu_height = DIV_ROUND_UP(inst->enc_raw_height, 16); + } + /* Firmware expects each row to align to 8 LCU */ + row_size = ALIGN(lcu_width, 8); + mbuf_payload_hdr->size = row_size * lcu_height * sizeof(s16) + 256; + + if (array_size != (lcu_width * lcu_height)) + return -EINVAL; + + /* Firmware expects 2bytes of delta_Qp, int16_t */ + p_16 = buffer->kvaddr + mbuf_payload_hdr->offset; + for (int j = 0; j < lcu_height; j++) { + p_temp = p_16 + j * row_size; + for (int i = 0; i < lcu_width; i++) + *p_temp++ = BIT(11) | ((p_array[j * lcu_width + i] + & 0x3F) << 4); + } + + return 0; +} + +int iris_hfi_gen2_session_alloc_roi_metadata_buffer(struct iris_inst *inst) +{ + struct iris_buffers *buffers = &inst->buffers[BUF_ROIMB_DELTAQP]; + struct iris_core *core = inst->core; + struct iris_buffer *buffer, *next; + bool found = false; + int ret = 0; + + if (!buffers->size) + return 0; + + list_for_each_entry_safe(buffer, next, &buffers->list, list) { + if (buffer->attr & BUF_ATTR_DEQUEUED) { + buffer->attr &= ~BUF_ATTR_DEQUEUED; + list_move(&buffer->list, &buffers->list); + found = true; + break; + } + } + if (!found) { + buffer = kzalloc_obj(*buffer); + if (!buffer) + return -ENOMEM; + + INIT_LIST_HEAD(&buffer->list); + buffer->type = BUF_ROIMB_DELTAQP; + buffer->buffer_size = buffers->size; + buffer->dma_attrs = DMA_ATTR_WRITE_COMBINE; + + buffer->kvaddr = dma_alloc_attrs(core->dev, buffer->buffer_size, + &buffer->device_addr, GFP_KERNEL, + buffer->dma_attrs); + + if (!buffer->kvaddr) { + kfree(buffer); + return -ENOMEM; + } + list_add(&buffer->list, &buffers->list); + } + + buffer = list_first_entry(&buffers->list, struct iris_buffer, list); + ret = iris_fill_roi_data(inst, buffer); + if (ret) + return ret; + + return ret; +} diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media/platform/qcom/iris/iris_buffer.h index ee2d24bb69c57220b0a735d9b4aae4434a33daf6..df9d018493f3ec37fd5e6b0ba049dba0b5ae76e9 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.h +++ b/drivers/media/platform/qcom/iris/iris_buffer.h @@ -28,6 +28,7 @@ struct iris_inst; * @BUF_SCRATCH_2: buffer to store encoding context data for HW * @BUF_VPSS: buffer to store VPSS context data for HW * @BUF_PARTIAL: buffer for AV1 IBC data + * @BUF_ROIMB_DELTAQP: metadata buffer for ROI MB DeltaQp * @BUF_TYPE_MAX: max buffer types */ enum iris_buffer_type { @@ -44,6 +45,7 @@ enum iris_buffer_type { BUF_SCRATCH_2, BUF_VPSS, BUF_PARTIAL, + BUF_ROIMB_DELTAQP, BUF_TYPE_MAX, }; @@ -139,5 +141,7 @@ int iris_queue_buffer(struct iris_inst *inst, struct iris_buffer *buf); int iris_queue_deferred_buffers(struct iris_inst *inst, enum iris_buffer_type buf_type); int iris_vb2_buffer_done(struct iris_inst *inst, struct iris_buffer *buf); void iris_vb2_queue_error(struct iris_inst *inst); +int iris_hfi_gen2_session_alloc_roi_metadata_buffer(struct iris_inst *inst); +int iris_destroy_roi_metadata_buffers(struct iris_inst *inst); #endif diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c index 8c02b4fec93b511d1d9bdd71a9038a7f7be5404f..91a3ec52d299e942fde18eafaf58ea6542afd0ec 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -1720,3 +1720,31 @@ int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane) return 0; } + +int iris_set_roi_params(struct iris_inst *inst, u32 plane) +{ + struct iris_buffers *buffers = &inst->buffers[BUF_ROIMB_DELTAQP]; + u32 height = inst->enc_raw_height; + u32 width = inst->enc_raw_width; + u32 metadata_header_bytes = 256; + u32 lcu_height = 0; + u32 lcu_width = 0; + u32 lcu_size = 16; + u32 n_shift = 0; + u32 size = 0; + + if (!inst->fw_caps[ROI_PARAMS].p_array) + return -EINVAL; + + if (inst->codec == V4L2_PIX_FMT_HEVC) + lcu_size = 32; + + n_shift = ilog2(lcu_size); + lcu_width = (width + (lcu_size - 1)) >> n_shift; + lcu_height = (height + (lcu_size - 1)) >> n_shift; + size = ALIGN(lcu_width, 8) * lcu_height * 2; + size += metadata_header_bytes; + buffers->size = ALIGN(size, 4096); + + return iris_hfi_gen2_session_alloc_roi_metadata_buffer(inst); +} diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/platform/qcom/iris/iris_ctrls.h index ef2c09485ad93719e4acc7f395899d7f67cb5b2d..d5fb33a8e2a19035a0ff5eb412ffb8167e6098f3 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -52,5 +52,6 @@ int iris_set_time_delta_based_rc(struct iris_inst *inst, enum platform_inst_fw_c 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); int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane); +int iris_set_roi_params(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 0f4c6f955f4f408c45c50796332b47c116f52982..36d2517140ce67821962c200093a9887e5b6b392 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -1822,6 +1822,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .hfi_id = HFI_PROP_ROI_INFO, .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_CUSTOM | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_roi_params, }, { .cap_id = MB_SIZE, 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 cf88dbe11e8e9faef826e661d8e9909fd7f16b94..a1b0c4982f0d789a807f22a1dffdf61decd20d28 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -134,6 +134,7 @@ static u32 iris_hfi_gen2_get_port_from_buf_type(struct iris_inst *inst, switch (buffer_type) { case BUF_INPUT: case BUF_VPSS: + case BUF_ROIMB_DELTAQP: return HFI_PORT_RAW; case BUF_OUTPUT: case BUF_BIN: @@ -1267,6 +1268,8 @@ static u32 iris_hfi_gen2_buf_type_from_driver(u32 domain, enum iris_buffer_type return HFI_BUFFER_VPSS; case BUF_PARTIAL: return HFI_BUFFER_PARTIAL_DATA; + case BUF_ROIMB_DELTAQP: + return HFI_BUFFER_METADATA; default: return 0; } @@ -1328,6 +1331,7 @@ static struct iris_buffer *iris_queue_metadata_buffers(struct iris_inst *inst, 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); + struct iris_hfi_buffer hfi_meta_buffer; struct iris_hfi_buffer hfi_buffer; u32 port; int ret; @@ -1349,6 +1353,26 @@ static int iris_hfi_gen2_session_queue_buffer(struct iris_inst *inst, struct iri &hfi_buffer, sizeof(hfi_buffer)); + /* check if any metadata buffer is available not queued, queue it */ + if (port == HFI_PORT_RAW) { + buffer = iris_queue_metadata_buffers(inst, BUF_ROIMB_DELTAQP, buffer->index); + if (buffer) { + iris_hfi_gen2_get_buffer(inst->domain, buffer, &hfi_meta_buffer); + port = iris_hfi_gen2_get_port_from_buf_type(inst, buffer->type); + iris_hfi_gen2_create_packet(inst_hfi_gen2->packet, + HFI_CMD_BUFFER, + HFI_HOST_FLAGS_INTR_REQUIRED, + HFI_PAYLOAD_STRUCTURE, + port, + inst->core->packet_id++, + &hfi_meta_buffer, + sizeof(hfi_meta_buffer)); + + buffer->attr |= BUF_ATTR_QUEUED; + buffer->attr &= ~BUF_ATTR_DEQUEUED; + } + } + return iris_hfi_queue_cmd_write(inst->core, inst_hfi_gen2->packet, inst_hfi_gen2->packet->size); } 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 ea1fc96077fdce83db9c6a6c1f753ec7978b0673..4f8f0b78f7b7559d985ea627f9a3224f36fb6f18 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c @@ -58,6 +58,8 @@ static u32 iris_hfi_gen2_buf_type_to_driver(struct iris_inst *inst, return BUF_PARTIAL; case HFI_BUFFER_VPSS: return BUF_VPSS; + case HFI_BUFFER_METADATA: + return BUF_ROIMB_DELTAQP; default: return 0; } diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c index 05aab6e3005d5c3788f5dfe5857f2d6b782e7a83..ba56aca5c0d102869dcf7ad6c050579283000cd7 100644 --- a/drivers/media/platform/qcom/iris/iris_vidc.c +++ b/drivers/media/platform/qcom/iris/iris_vidc.c @@ -199,6 +199,7 @@ int iris_open(struct file *filp) INIT_LIST_HEAD(&inst->buffers[BUF_SCRATCH_2].list); INIT_LIST_HEAD(&inst->buffers[BUF_VPSS].list); INIT_LIST_HEAD(&inst->buffers[BUF_PARTIAL].list); + INIT_LIST_HEAD(&inst->buffers[BUF_ROIMB_DELTAQP].list); init_completion(&inst->completion); init_completion(&inst->flush_completion); @@ -321,6 +322,7 @@ int iris_close(struct file *filp) iris_destroy_all_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); iris_check_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE); iris_check_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE); + iris_destroy_roi_metadata_buffers(inst); iris_remove_session(inst); mutex_unlock(&inst->lock); iris_inst_put(inst); -- 2.34.1