From nobody Tue Sep 29 06:11:02 2026 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 9B90637E5FF for ; Tue, 11 Aug 2026 18:30:13 +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=1786473015; cv=none; b=n0BHU1RXsgA2L16kXxOBonBd6cKVikhJbD51LukNoNTUhP8tkc63jiEcfcDcokAKHjyz2eu7v/SHSK99vrsP5VRwScroy6o1a3DIyVWED6Byd2k1a1l67aLJDplnObKypbI1lzW7n3/WWX9Rj6IxxgV9KPpwXQZ8NvNOOBY/1nQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786473015; c=relaxed/simple; bh=aYg1KsEO1BMPI1NvrP0QlCY+oFgndNkDbagsl25qYmI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gm9bBZoQuGujujvJT261MoIcI65D5oISDvZ2kR5ONFm5WkG+yMvFseGXuXJOqr77/cWj5NcO/BxIVtQeKqxQDkvbC0ymtpX6+0W0iBvqrDHQ2568ncs2zPVOouooW5ZELgPolmwaQdfxFtK9edBWReG58sUI+Dj2m9oCfCR0KxI= 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=Sjfr3C9C; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=X6Sk32x0; 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="Sjfr3C9C"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="X6Sk32x0" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BGPGFV1495099 for ; Tue, 11 Aug 2026 18:30:12 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= Wsd3AcTjBlyGfb//EcpMQsX1Atw/JeAXEdL+9Stg4F0=; b=Sjfr3C9CK2eDxFM/ jx0csmWfkjKcvcdAMtk5x4ke49I2fHXH7OM++sgLL46kf37t0oNX47Q9SvUkZwlP jH9dbT05ohfV0r4U+OVSC/ik15sEwyaYKu1wo/b0Ix0WjBOBjS6UbTg+XjXRhmw1 ooZQMLZ/Seqdmcq3FuYZ/NKq8H0Az5XZBVakZ/Unl54WvQQ56F9wVBwp21L9xnzM fQfJUBNYk+4dCQdDqY1GemA+cRQiVu+b32qHlDn/tJT5CGTQSlVY3k27bl8jf81p x30e/KEA3Q1cKBBl5r6ZBcNQ3EhfTN3tFu8Sh4D7/hw+ZkIeXhyIejtskl54DUMc sdzWLA== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g049esh86-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 18:30:12 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2cc98d6a88bso546145ad.0 for ; Tue, 11 Aug 2026 11:30:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786473011; x=1787077811; 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=Wsd3AcTjBlyGfb//EcpMQsX1Atw/JeAXEdL+9Stg4F0=; b=X6Sk32x0veEVsgphGG4g8kKtl+cnPHaTaWX+x9Mq5Lb1+X2ifJaQgmS2dp48obyWRZ ux6TJKw2oakHu+/lJ5nNDBJCfYPBWEVNV/uaTBpllO6gWSH4yQP//U5f7O62hGtSsMAH nxx2opY5dY+eRH2EqPPwBK6kat4bhtxX734eON4dXS8tPak2qQfgRhbGM64EECnISUxB uwdBVTr/Z+tu3ICCmBOnKmZWkC2MafOir8evOI/GyV2/5ZneJLxaI4OObIXOmlp9FsWu G3+QU6OesnMSkI1NrMV/yOUE7qArqAQU8payEl2zx8P0vpQdi2ZStBgjHSK7q79+FRtF +T5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786473011; x=1787077811; 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=Wsd3AcTjBlyGfb//EcpMQsX1Atw/JeAXEdL+9Stg4F0=; b=EZPK3Kla6w7kBjzpkS/9tZ9xuSu0kuofVnGerL1Sh9LH2hNcsO5w2tUG4Due0HKJQq o93AmuJHth5KH2BXlRRq+SCQkQAXskzOsGMwERjlEouQtQsOwaJYiMqwYrVXuWEfqU9F BT6evqV3oEQQC3PVNU4uSQj8+70aOR3cytY5Dt1CeXENi3TqpdNAMaY42bRIJ3Qso4c6 GujjWYY7AyM7FZQqfXvByRVY4XQt/PZU4G9T+345L7V0uypyQ18OU5WWUJPN3P15Qf1R 6jcoJDkX/e5p1AYZrg48EoZG4bd3qqG4EkIby6nyzfo8V5Ysj9T812QeGvgdXIBaY7aP /dzw== X-Forwarded-Encrypted: i=1; AHgh+RoVZpGrmCMRmo2FYcKox8TbxLqBMAcs50qqBCvuEJPoW2g7zJVLYFhV1ZEZGZvYdvNLLsrgPTeFsCw92XE=@vger.kernel.org X-Gm-Message-State: AOJu0Ywrlh8VYIvgy3NRVIXB8HDenqxbc4YigSQnApoffwvJ3PU5vhxl /buw2gfRdX/VNyldjslBRqGeHQ+A7KKDF25Wr9B2mh6ie7jYblz8cM0Va8CZRod0+2ImZoP+rCx 0vFVuSaiilLeUwJYKdcoMaTCtgRpuLiBylL7r0pdnLs1uVk58LtF3DfscblOHc2Kz8k+NLMRl5F 0= X-Gm-Gg: AR+sD11xKa8xiXc+21IVXVfAVJgeiyzr1pgMcRRirPmc0sV9/j3IuSvuNgaaAvmiyNl 7Xc4Veg9M9Q2U6yqrojjtpvfjX5SguZQcbKNanyiaTpCUcMDglqqFYIdjovgpPaYETWV6/EMGYs sWcHDDnd9E9JtrGQx787uoe61guGIlOajYc+l3FzakbzxZ8EPrlGD4uEyGszn4UBJATOOen/DFA Oi3zZOQXugkyDgcaBhZIqs3YSmvgKeYFrKrfMnJExt+2OUpTwHGCC/8R9CHTuyakNy2KDg8RVZc cmIhiRjCp+6JVMumCmQVfzv1+mG4HzcYchjyxY1DGjt7dHfTzqKT+qwZNpruaaqy4OghDgD8J0z rKXH+WXu4fYcY+qIwQc/d0A+Q1F9g+z/7REYhrS34S3JEBanfVBC8S3PtGtQZ X-Received: by 2002:a17:903:950:b0:2c7:ef84:c58e with SMTP id d9443c01a7336-2d317790400mr48625875ad.1.1786473011528; Tue, 11 Aug 2026 11:30:11 -0700 (PDT) X-Received: by 2002:a17:903:950:b0:2c7:ef84:c58e with SMTP id d9443c01a7336-2d317790400mr48625285ad.1.1786473010991; Tue, 11 Aug 2026 11:30:10 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315d829c4sm11759955ad.0.2026.08.11.11.30.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 11:30:10 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 11 Aug 2026 11:30:06 -0700 Subject: [PATCH v4 1/5] media: uapi: Introduce new control for video encoder ROI 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: quoted-printable Message-Id: <20260811-enc_roi_enable-v4-1-1c9ea2405bb8@oss.qualcomm.com> References: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@oss.qualcomm.com> In-Reply-To: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@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=1786473008; l=7406; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=aYg1KsEO1BMPI1NvrP0QlCY+oFgndNkDbagsl25qYmI=; b=dCcjUhAXR7ouv/YMKkVTKT2cLSFqH8cGBxmEqBQ5VyDGeYpg58JqHPfnW6n9A28Wwe/ABs+l7 TJWfJbq5owoC0xsjSpu6Ebp1y8mNHnbz0K9g+bqBg+ARo8b0TVpHtZT X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfX5VIFXRzVO4HZ x84hPsAPKMGCHGsfe1rmw7vlKzfDbMtnPmIoUqjZvS+8plMtJ8WFoHWA1qSy1+i+1lZIOEuiD6T mN/+uvv+yrMimI6RpPqSDYQMVbb2aME= X-Authority-Analysis: v=2.4 cv=DoFmPm/+ c=1 sm=1 tr=0 ts=6a7b6a34 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=o2p6THidDhOa5OcZzacA:9 a=QEXdDO2ut3YA:10 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-ORIG-GUID: qbxYxANKX7jq2Xp7CkyNaM92HULf1DzJ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfXxm8q8nGN338q 2+gyhe9eAGF9hbhgDhanJmuKpYSLIb0yHZ6Gu+AmL5t5a7zANMv43dNKHqyckUxqdmsQwcfP/jH 5yTdiIlabhbHBqVZGoFBpmSVQuXn8UOau3e2EUaJmSmETB9PCIN1ovEZu8A8K+0RCFCTh+DetSV 3hWJjfaGg74m4/dq82tl6J0SEvw/7AJgRN3X/V/OyDbKxUmg+VJ+XUhngU65983EYthZFOqwKH4 1WgAoEwXWwee6A9d+UU8fVpvlOIdXkp4YAX7dk416jccs2QNtjtIhz4AG9zZk3O1xOB5lcA5268 XELaF2FkrMOPU11k8cq7anSbwjaRlPN4XWbCNzr1LTiItQZXt9Ib/Jh/IMg1FuH0nlFttg+acOW t2mPkMlJVBPG3aW2m93EMeVFq220cGdhEuihyN8dnbe/ahVWPgSXxrmtwDc4P7S/XiEjJUIZPPv QxF2joVPuIiUO+Z87sw== X-Proofpoint-GUID: qbxYxANKX7jq2Xp7CkyNaM92HULf1DzJ 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-08-11_04,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 malwarescore=0 priorityscore=1501 phishscore=0 suspectscore=0 clxscore=1015 bulkscore=0 adultscore=0 lowpriorityscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110155 Add custom control, V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP for video encoder Region of Interest to allow applications to specify different quality levels for specific regions in video frames. Define V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE to retrieve supported MB size based on codec from the hardware encoder and set the corresponding ROI MB delta_qp map that adjusts quantization relative to the frame QP's base value. This enables use cases like prioritizing quality for faces in video conferencing or important objects in surveillance footage while reducing bitrate for less critical areas. Signed-off-by: Deepa Guthyappa Madivalara --- .../userspace-api/media/v4l/ext-ctrls-codec.rst | 19 +++++++++++++++= ++++ .../media/v4l/videodev2.h.rst.exceptions | 1 + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 4 ++++ .../userspace-api/media/v4l/vidioc-queryctrl.rst | 6 ++++++ include/media/v4l2-ctrls.h | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ include/uapi/linux/videodev2.h | 2 ++ 7 files changed, 35 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Do= cumentation/userspace-api/media/v4l/ext-ctrls-codec.rst index ab865a1a6ba929f1725ce2ab0fd3aeee4a69329a..c16b1c5cd1c02b7f66b5f13433e= b039eb615b35e 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -1674,6 +1674,25 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - Codecs need to always use the specified range, rather then a HW custom= range. Applicable to encoders =20 +``V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP (__s8)`` + This custom control is used to set ROI MB map delta_Qp for the whole f= rame. + The frame is divided into a grid of MB Size by MB Size pixels (MB Size= is + obtained from querying ``V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE``). Each block + is configured with delta_Qp in raster order. The valid range for delta= _Qp + is encoder dependent. + Applicable to encoders. + +``V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE`` (integer) + A read-only control that reports the MB Size used for the ROI delta_QP= map. + The supported MB Size depends on the encoder codec. + Only square MBs are supported. The value returned represents the + width and height of each block in pixels. The ROI delta_QP map provided + through the ROI control must use the MB Size reported by this control. + The number of entries in the ROI delta_QP array is determined by the + frame dimensions and the reported MB Size. For example, for a QCIF fra= me + (176x144) if reported MB Size is 16, the delta_QP array must contain + 99 entries (176 x 144 / 16 x 16). + .. raw:: latex =20 \normalsize diff --git a/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptio= ns b/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions index 6182b4e2d2ee002c0d3562e1cc3bc2fd9c4286d6..b036ed3ec2f0744175cad1cbc4e= 73fe828e0c955 100644 --- a/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions +++ b/Documentation/userspace-api/media/v4l/videodev2.h.rst.exceptions @@ -141,6 +141,7 @@ replace symbol V4L2_CTRL_TYPE_STRING :c:type:`V4L.v4l2_= ctrl_type` replace symbol V4L2_CTRL_TYPE_U16 :c:type:`V4L.v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_U32 :c:type:`V4L.v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_U8 :c:type:`V4L.v4l2_ctrl_type` +replace symbol V4L2_CTRL_TYPE_S8 :c:type:`V4L.v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_MPEG2_SEQUENCE :c:type:`V4L.v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_MPEG2_PICTURE :c:type:`V4L.v4l2_ctrl_type` replace symbol V4L2_CTRL_TYPE_MPEG2_QUANTISATION :c:type:`V4L.v4l2_ctrl_ty= pe` diff --git a/Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst b= /Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst index d78328152b7552f8f0d30a9e2f7c104bfd4b70d3..fe5f8992389c32d8f35f432229e= f2f734002644e 100644 --- a/Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst +++ b/Documentation/userspace-api/media/v4l/vidioc-g-ext-ctrls.rst @@ -188,6 +188,10 @@ still cause this situation. - ``p_u32`` - A pointer to a matrix control of unsigned 32-bit values. Valid if this control is of type ``V4L2_CTRL_TYPE_U32``. + * - __s8 * + - ``p_s8`` + - A pointer to a matrix control of signed 8-bit values. Valid if + this control is of type ``V4L2_CTRL_TYPE_S8``. * - __s32 * - ``p_s32`` - A pointer to a matrix control of signed 32-bit values. Valid if diff --git a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst b/D= ocumentation/userspace-api/media/v4l/vidioc-queryctrl.rst index 82c8b52e771ce9301491b3f752e501a8fe7e2434..57e1652ae72e0324742142446ac= f32a16b94941c 100644 --- a/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst +++ b/Documentation/userspace-api/media/v4l/vidioc-queryctrl.rst @@ -425,6 +425,12 @@ See also the examples in :ref:`control`. - any - An unsigned 32-bit valued control ranging from minimum to maximum inclusive. The step value indicates the increment between values. + * - ``V4L2_CTRL_TYPE_S8`` + - any + - any + - any + - A signed 8-bit valued control ranging from minimum to maximum + inclusive. The step value indicates the increment between values. * - ``V4L2_CTRL_TYPE_MPEG2_QUANTISATION`` - n/a - n/a diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index 327976b14d50b73a631e4d2ed95d9f4d146c45ab..a1806ddbc797efa52e83cd3f685= ef70d5b5483d2 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -64,6 +64,7 @@ union v4l2_ctrl_ptr { s32 *p_s32; s64 *p_s64; u8 *p_u8; + s8 *p_s8; u16 *p_u16; u32 *p_u32; char *p_char; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-c= ontrols.h index affec0ab4781507be761cb791ff737460acf9cb7..00a2c48630bd198faa9a2b833a9= aa346d8357555 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -920,6 +920,8 @@ enum v4l2_mpeg_video_av1_level { }; =20 #define V4L2_CID_MPEG_VIDEO_AVERAGE_QP (V4L2_CID_CODEC_BASE + 657) +#define V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP (V4L2_CID_CODEC_BASE + 658) +#define V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE (V4L2_CID_CODEC_BASE + 659) =20 /* MPEG-class control IDs specific to the CX2341x driver as defined by V4= L2 */ #define V4L2_CID_CODEC_CX2341X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 5373dba640fae3d19247ab1c74ba336e05dc0fe0..95d8369e0d3d1e434978b9e576e= 0ef122691c65c 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1884,6 +1884,7 @@ struct v4l2_ext_control { __s64 value64; char __user *string; __u8 __user *p_u8; + __s8 __user *p_s8; __u16 __user *p_u16; __u32 __user *p_u32; __s32 __user *p_s32; @@ -1961,6 +1962,7 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_U8 =3D 0x0100, V4L2_CTRL_TYPE_U16 =3D 0x0101, V4L2_CTRL_TYPE_U32 =3D 0x0102, + V4L2_CTRL_TYPE_S8 =3D 0x0103, V4L2_CTRL_TYPE_AREA =3D 0x0106, V4L2_CTRL_TYPE_RECT =3D 0x0107, =20 --=20 2.34.1 From nobody Tue Sep 29 06:11:02 2026 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 DA789381B0A for ; Tue, 11 Aug 2026 18:30:14 +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=1786473016; cv=none; b=DMJiLGy4DPHtMnYMFgAlzaaTvSSH+8lOyb5vyt7zxps833G9DpS0sm7voKecU1IBAfUlDdtcKpdbLTfu9OkHmIwRLHIoEa1eh0enoK483/j+R4J4ORjKo6eHjh+gtxPbT7G/QRJJA2WxQiux5Lt2FyGqe2KGZOEYXJf/LRuQ0t4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786473016; c=relaxed/simple; bh=h/hrq8tlOmQSxbosQzmao/buysKRFdIVJfpNMxLFuHU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uW/4j0lUr2DZhNHhrN+bK9pEuAVsNNhI0NV2oFc1Aw38rnsUwO6vMdFivHJkCnvf4RbVLAvPB8Kz2oA6RQxLg/tCWnzpb+rnWTxRa2DUVLLpdPyCEgP0QKcefhGPYnCXyWF4sPPmotqCNbYWqWUxZOmzuJ+E2mbY7mW6PYjdgoE= 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=ZRXfdPA+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Fv/tLewR; 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="ZRXfdPA+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Fv/tLewR" 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 67BGNmpN1164659 for ; Tue, 11 Aug 2026 18:30:13 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= kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=ZRXfdPA+QOYCT+A6 q3LXGrd1C4edZrFdNOf8js3IHTzu+5PCCT3Xu6IQAWkv6OwzUAcSDRfsh2G3wwak 8fWzmQcqdpeRoLE86xNxkuGwe7NGX0CHuLMP6OBnY9GcYBqUB25nv03AVwVCwty+ mtLLEHExeUaFkKgKkrQGLBE5UAqMYSl7BDYlVH1RzwriQrvDxc/hrbiE1z6vjofX 6WH+KAVbmaA0WEed8Zfbhc0op5mfZNUIH6UcnBMq5xmzqtkKEvOQlNK3BjfNVHzi X/9+hI/yKW7+1bKaZqn7luquFWUAakdyGgWrjJNJKKMM8PYRMa7GgsSb6rx2SlQV fQPg6A== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g01q123da-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 18:30:13 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2cf4b8ea6f1so416855ad.2 for ; Tue, 11 Aug 2026 11:30:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786473013; x=1787077813; 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=kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=Fv/tLewRewNIEV5mzfDZN5mEpuX3uYwwlpluQDaxFFO2cj1ZdcWu3nFuGDniMAWG8J YHM/FKOZhSxxAwPTH9twlW0ps4Ttz5Nd+Zzk90xyegeMghcwIfJ7TD0Wzts8gZLwxqhl MRFBwanTvn03O9B0v/lL6/1GUV6Mxq0iiivxOV2Ff4nm4rLeFHXgpnDVD8NSHuojJQ9y LINDtHPnvlI7Pmi+LEyqkmdLNUHaY0v8qOntEa2GMQeQ9oWQYxx7TVGIP7wh//AdLjFs 7z6lTHM5c9jB4597rSB97y/Ohwuq15FWkFSvuWsduyDw8LnzYzo0QpPRfDMyUbaEMj6a JtNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786473013; x=1787077813; 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=kynEncYcQcGr44kGwirSobo5ocnqiYKg4uPy9Ir/qM0=; b=RbHwrUfojiv21z5DYSs2M+uYTZ8il5KUwMWaPSbK326gEQ/1m2Zf3KPJVXQncRO3Xm oDEp7x+z4q/ygFdqwHQQ7w/XtkO5cynj1n0VlA2KzkRqM0LG6lqwOzOcm337GgT86H5f ni+3FQVkL9BAvNLC5DMz1Q5C+Vo4xSIrq88aHMtGOuAoBRIeibUWeGcoWyrnmelodVWw Q4FF+B8VIlnnU2z74cw5pUKhrPGyf6mjWFyc2keWsn233NG3WTmZduap5i8eASDl3vua F607RycYnco9iTU/BHoiOHGmvkQZa61P47QxfWX0d/A0xzLwhQtgUAvozfIT2puRWb67 Zj5w== X-Forwarded-Encrypted: i=1; AHgh+RqbtJJavNzys8XK6K1CTGWWJZcpddhMASJJdjcP0LsrXBKkLWhUnqWMEcHN6lwWGKpIQ+j86YCewms+GtM=@vger.kernel.org X-Gm-Message-State: AOJu0Yx7f8XJYsfvK/ccyIo20rTZjzAIamuzDcAkEslO0joPT78dhfOL ING1EpOKllB99iJHs41oGbKImFZq2k2gLIwtIm4fgZfwJ5sKjaYDdbjvmiWv57GX2udrHGpLEQd 74Y+HguE3h5/i3W3csQcmeyOBbtpnwfV3juekJJVzhGGBoBB4AVNTo3ZXKFr16npsNyc= X-Gm-Gg: AR+sD12++9pJAdhQ+I5Km3REKCR6S1vuiQE5bx+nH+g+IiCB4j5tHfjDHeDb5hjFHPz oWP2ZR0lDmBoIXqjchGFThbCzyqq5XIO2ppNrtSsnkB1K6IV79zqfYX+8j/j81t7FdFVwFktVX8 4sszDdwQ+8rxdRQZkuSSrqH6REuUJqJMkMaeCxRvI2wxHs1CiBWObGC+bVa3L3OO4qIBYeNVANS 7VRnU4Plpw0lqNQ3xwQA1MGD2Z7FB5Z0qwIvXdwCDTEPj7uMPDk96OeYj13aMUlu7MsoIMtdZ5U Bkrdu5sLpVAEzF7GcX9t5O32ZRDiVwuRUVQksYFPr36hmIlDXHWBebaCPfs97Hbro4m5M76AzN5 c32ATI7ytc0fhFuNvSFzjOp7ZAK/FORoRffjpch3mPR29MF0fB/Mk4E66RUBQ X-Received: by 2002:a17:902:d4c5:b0:2cf:ca85:57e2 with SMTP id d9443c01a7336-2d31778f048mr45284065ad.1.1786473012647; Tue, 11 Aug 2026 11:30:12 -0700 (PDT) X-Received: by 2002:a17:902:d4c5:b0:2cf:ca85:57e2 with SMTP id d9443c01a7336-2d31778f048mr45283635ad.1.1786473012237; Tue, 11 Aug 2026 11:30:12 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315d829c4sm11759955ad.0.2026.08.11.11.30.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 11:30:11 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 11 Aug 2026 11:30:07 -0700 Subject: [PATCH v4 2/5] media: v4l2-core: Add support for video encoder ROI control 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: quoted-printable Message-Id: <20260811-enc_roi_enable-v4-2-1c9ea2405bb8@oss.qualcomm.com> References: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@oss.qualcomm.com> In-Reply-To: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@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=1786473008; l=5504; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=h/hrq8tlOmQSxbosQzmao/buysKRFdIVJfpNMxLFuHU=; b=RkRExIDm2TKww9ONIRUdiuGU8rcAxn3HBYw5kBb37aI+yM0l5a8wp0mSenLaqjCWwmJfK3AZ/ ySuZDpckrfgASmvE9p0UwXeo56/2KX+zbUQjczTOswdFQQWJK1EQBuv X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-GUID: _mwNQYBMuxrU4IAKAAqMH-gLXdHoSa3u X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfXwdNrNxMOf398 9jV5melhO0mRN9A+Nx+UbmXENdFep1R+KPa5cxMR5WUsOGVOvAb33g01eCAenuInAUDOa3CyDSJ k3CLzsjvhydNEuztFKpu16wGzkNeh1E3/omz/jdrMeMZ1SXZv8vmYow7Sa93O51Co53LNwHPwvp AMwpATT4EGwrIUZ0Ix2DPZlR/ZtbGG5OzGY2Fgve3+KZWXJCPz64RDj1dlcKekatMLSNEuBiDsx SliBRKd0CR2dXHjupXET8uQL35M4tsK4ONvzp1I9qbTJn2JCjn45zJduCyxBjKI2ra+kgCdXbiY LSety5BrxzIWuPJTxjQfz5QpRKdfw2iuSVcHUl23Dlq+6d7bKzcC15mQVH3cSSo/hAK+Thi2cCo 2Pad/TDTYA+YeQpb9l730iIHcs6CMEQAhDFvLPTvHwdnpbjx1CEWIChkOfZZdzpZdU6YAU/TtJ5 MadGiE/uUU7SpAF94pg== X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfXzTwJ/0dLkMWn MjUKKyUEgKljF5rFAoPn9iEijzDX4VQwj7M79frVL/txxGWUmweiXBGvz7TnFwmUtfMYseQ9yZp A9/pwz6TLw1fiMxNGREHilS/KBdH4vY= X-Proofpoint-ORIG-GUID: _mwNQYBMuxrU4IAKAAqMH-gLXdHoSa3u X-Authority-Analysis: v=2.4 cv=brt8wkai c=1 sm=1 tr=0 ts=6a7b6a35 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=hEAr28SmMdMltZAvPKQA:9 a=QEXdDO2ut3YA:10 a=GvdueXVYPmCkWapjIL-Q: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-08-11_04,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 adultscore=0 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110155 Add necessary support for controls V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP and V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE. Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 + drivers/media/v4l2-core/v4l2-ctrls-core.c | 23 ++++++++++++++++++++++- drivers/media/v4l2-core/v4l2-ctrls-defs.c | 10 ++++++++++ include/media/v4l2-ctrls.h | 3 ++- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-= core/v4l2-ctrls-api.c index 93d8d4012d0f4fef004e417d0aee2ae44b1b30bd..7d41cfd7378baaa929d4da0266c= 45f731bb54285 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c @@ -980,6 +980,7 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl, case V4L2_CTRL_TYPE_U8: case V4L2_CTRL_TYPE_U16: case V4L2_CTRL_TYPE_U32: + case V4L2_CTRL_TYPE_S8: if (ctrl->is_array) return -EINVAL; ret =3D check_range(ctrl->type, min, max, step, def); diff --git a/drivers/media/v4l2-core/v4l2-ctrls-core.c b/drivers/media/v4l2= -core/v4l2-ctrls-core.c index 5b8a594fb9e24e16128c9c763a3b1dd311fad2ba..db6577070ebd2eb6a60599b3b23= 94fe128236705 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-core.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-core.c @@ -290,6 +290,14 @@ static void __v4l2_ctrl_type_op_init(const struct v4l2= _ctrl *ctrl, u32 from_idx, memset(ptr.p_u32 + from_idx, 0, elems * sizeof(u32)); } break; + case V4L2_CTRL_TYPE_S8: + if (value) { + for (i =3D from_idx; i < tot_elems; i++) + ptr.p_s8[i] =3D value; + } else { + memset(ptr.p_s8 + from_idx, 0, elems * sizeof(s8)); + } + break; default: for (i =3D from_idx; i < tot_elems; i++) { switch (which) { @@ -370,6 +378,9 @@ void v4l2_ctrl_type_op_log(const struct v4l2_ctrl *ctrl) case V4L2_CTRL_TYPE_U32: pr_cont("%u", (unsigned)*ptr.p_u32); break; + case V4L2_CTRL_TYPE_S8: + pr_cont("%d", *ptr.p_s8); + break; case V4L2_CTRL_TYPE_AREA: pr_cont("%ux%u", ptr.p_area->width, ptr.p_area->height); break; @@ -1397,6 +1408,8 @@ static int std_validate_compound(const struct v4l2_ct= rl *ctrl, u32 idx, return -EINVAL; break; =20 + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: + break; default: return -EINVAL; } @@ -1410,6 +1423,7 @@ static int std_validate_elem(const struct v4l2_ctrl *= ctrl, u32 idx, size_t len; u64 offset; s64 val; + s32 tmp; =20 switch ((u32)ctrl->type) { case V4L2_CTRL_TYPE_INTEGER: @@ -1435,7 +1449,11 @@ static int std_validate_elem(const struct v4l2_ctrl = *ctrl, u32 idx, return ROUND_TO_RANGE(ptr.p_u16[idx], u16, ctrl); case V4L2_CTRL_TYPE_U32: return ROUND_TO_RANGE(ptr.p_u32[idx], u32, ctrl); - + case V4L2_CTRL_TYPE_S8: + tmp =3D ptr.p_s8[idx]; + ROUND_TO_RANGE(tmp, s32, ctrl); + ptr.p_s8[idx] =3D (s8)tmp; + return 0; case V4L2_CTRL_TYPE_BOOLEAN: ptr.p_s32[idx] =3D !!ptr.p_s32[idx]; return 0; @@ -2030,6 +2048,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ct= rl_handler *hdl, case V4L2_CTRL_TYPE_U32: elem_size =3D sizeof(u32); break; + case V4L2_CTRL_TYPE_S8: + elem_size =3D sizeof(s8); + break; case V4L2_CTRL_TYPE_MPEG2_SEQUENCE: elem_size =3D sizeof(struct v4l2_ctrl_mpeg2_sequence); break; diff --git a/drivers/media/v4l2-core/v4l2-ctrls-defs.c b/drivers/media/v4l2= -core/v4l2-ctrls-defs.c index e062f2088490470c42d6c579ff7675be454a29b0..8f895060799ea13443143edd398= dfb97f4ba0085 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls-defs.c +++ b/drivers/media/v4l2-core/v4l2-ctrls-defs.c @@ -974,6 +974,8 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_MPEG_VIDEO_AVERAGE_QP: return "Average QP Value"; case V4L2_CID_FWHT_I_FRAME_QP: return "FWHT I-Frame QP Value"; case V4L2_CID_FWHT_P_FRAME_QP: return "FWHT P-Frame QP Value"; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: return "Encoder ROI MB Delta Q= P"; + case V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE: return "Encoder ROI MB Size"; =20 /* VPX controls */ case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS: return "VPX Number of Parti= tions"; @@ -1622,6 +1624,14 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum = v4l2_ctrl_type *type, case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY: *type =3D V4L2_CTRL_TYPE_HDR10_MASTERING_DISPLAY; break; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: + *type =3D V4L2_CTRL_TYPE_S8; + *flags |=3D V4L2_CTRL_FLAG_DYNAMIC_ARRAY; + break; + case V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE: + *type =3D V4L2_CTRL_TYPE_U8; + *flags |=3D V4L2_CTRL_FLAG_READ_ONLY; + break; default: *type =3D V4L2_CTRL_TYPE_INTEGER; break; diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h index a1806ddbc797efa52e83cd3f685ef70d5b5483d2..9a68a3555e349f1e55aa01af5c1= 0f08201d62bae 100644 --- a/include/media/v4l2-ctrls.h +++ b/include/media/v4l2-ctrls.h @@ -27,6 +27,7 @@ struct video_device; =20 /** * union v4l2_ctrl_ptr - A pointer to a control value. + * @p_s8: Pointer to a 8-bit signed value. * @p_s32: Pointer to a 32-bit signed value. * @p_s64: Pointer to a 64-bit signed value. * @p_u8: Pointer to a 8-bit unsigned value. @@ -61,10 +62,10 @@ struct video_device; * @p_const: Pointer to a constant compound value. */ union v4l2_ctrl_ptr { + s8 *p_s8; s32 *p_s32; s64 *p_s64; u8 *p_u8; - s8 *p_s8; u16 *p_u16; u32 *p_u32; char *p_char; --=20 2.34.1 From nobody Tue Sep 29 06:11:02 2026 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 8464E3806C9 for ; Tue, 11 Aug 2026 18:30:16 +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=1786473022; cv=none; b=QgjlqTtS1NP+/lRuMRnbrLrOp/0CX3sSftCQsqCD8dBRFAKFF7JrtH7LKrEHHj3tpB+4n/fFceSA4rNnWWDQ3vc5Ormkts3NtK8qNKdQYZ5HMjevG5BgzRsJv5N8I7p1QlB9bxO8uAj4X92LyAI47T/JGhULM2w1ZuwFsI0uaDE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786473022; c=relaxed/simple; bh=D7Sm8u1wdO3vrXIzbQAT3/Ga2Pt8dJOD+ZkS0vXQM+A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TiJOI82/TQLZSpFnOq1X7/Ism6RY91EqsjqVKReUkg2NkeNX3vcFeo4F6IpdTurOBxqFRZKBkinYbVxCzq30PacQfwSS4nJzjejA914HHQmeTetUJxGlhjE55OXvRdUavlbA+QSx5g41TMcBvvK2UdevkGmxh/Ko4duOnLRzxCs= 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=gqNrcyBb; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Ymc3BIdB; 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="gqNrcyBb"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Ymc3BIdB" 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 67BGNw3N4120816 for ; Tue, 11 Aug 2026 18:30:15 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= 09q0dR3veXeMDQfpze3k1OX0PRNKn2Y6YM/C5CUH7vA=; b=gqNrcyBbdrhF5Nmj suLY+Ys8uvsP8+avTH8isdstGQgjCPn8bNkK7qcAQqjMuC+pXEFsbUsQEin/fd63 vMTqUc6Bs79qxlg+rxraSb7fGYELBXi9/22IckoeTKtps3M70pUfSQFFroe2VU3z 76cDYQpk4Uhdwq9R38lANxzp9Nomgm3CvD6hOlqs01Y3gcQuXk2qsln3+sfR4gTu PNloJ/PZen81gpyLy49scFRaZ9vl+1r+hn0HGwu76ic5FkIm9CSUWzE3q3dYl292 4/0e4rIhopTSEJ77JNPnsKFudgKDTsMixYXmbC5HKOmh5rBiGgFk+JZPxu5jnyHh ycqIeg== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fyxwetstq-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 18:30:14 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2d0563db6bcso1010505ad.2 for ; Tue, 11 Aug 2026 11:30:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786473014; x=1787077814; 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=09q0dR3veXeMDQfpze3k1OX0PRNKn2Y6YM/C5CUH7vA=; b=Ymc3BIdBR4C2nwMwOn68l25nY4+UaZ2XYKz7IjFPBf0mSg8BLVjUWwxw5ecVk5/DyI EcaOQEh0G8mLk55YyzaY6qZNfu1XZBiXdwAAKLMIw20TmpeKbIWRgRVHogOgqspra7Xw dS/GwRepH/T5cIKU9ewBbeSVFENkmxHbfUsVqslv9DzK2fdUb0fzG2HmGOnOUZHDfPbq zhhHda6F6USp2GiF/9vPRxuVzZA7tXYyKgjyxJgndnJAI/jIIrYd0cK78twRBxX9gqyR TdZQOGKIX/dc04QvFHpccppg4zOJihu55kh66FPNGF9mIOojlR+ejRHHvmZ4IkgjZ6LP QDKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786473014; x=1787077814; 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=09q0dR3veXeMDQfpze3k1OX0PRNKn2Y6YM/C5CUH7vA=; b=ssATjwMb2JjjIqPAn6A1It0zc5I1TJ17oUqBC6z75ByNEz+7pM2pq3fWthc9XZBhwy 9xMf9S+jG51IEQi7MHW0yc9BE5t7ZGicnI/CpJ3rhO4KFbz3wQI5LaiPOvVS8P2Et3CO BKmwKvvbNZn1Lu2QUKWdi6h2Vb2fev+qBy1YG7Bd1EeIDb+CR0IEADf0q0INDPUbFQrI mEkgdSO3JDlWVUJrgJWcxjp52tZsRa66S5JydpeZwwsULt4XmXDTj5aEsE6aEe5PMr7s S79xlFJCGw0CWuJEE/mlXip9djKPYZQxex9yKfFsYdOelhOzWTQvxj5yEHSnRslj7P8r PouA== X-Forwarded-Encrypted: i=1; AHgh+RpbphBCTU+oYkdGJ7uqBq+HnqN2i6QhbT3aqc3R/Z8coMLGI6hEQdyZfjbaBbnCjJVhxgy4kOJA26+KRfE=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5QdbNBVErgwU1TlMC/fPzqn/xQBl8SPR62hRcWoi+QyYoo7xt ReXoJ5HuvoCLxkDCQGtEWaBQCDWk4M3pPHulVD3drPOLGRX3SUPF35docxCZgrzf9qJqglPNrsB a316iHoiOxh/PzcdVy1iF+4w6ywhhId40Nchcgf3JzAgLokSQ2pa/eMJ4xWM0o8mt7Uo= X-Gm-Gg: AR+sD13PqQZgM8oInDuj3Y0CEK1NqywpdcG+L0Y86cQ4vDcmdk+XByQIUiURt9Pn1uN dDrP7dLySn3mWcN4PVMOIIKdniNr3BKTMUOfEoAVt++Kz6zIQcMAs74bJyHVHVwqrrNw+oqsgLS ZOwNHRttetzm0397/bj6lqgCncTvjG/pe1vh/tzSHxYHVBQxCqWs05VHgzTtu6yvXR2QWAYCUcQ EhPQK79m+YBSL9t+4xrTLPYhLgFw6P32yHEKCX2MQixH8sn+v5Xpk7qy5tV2qP+bp87roTkDLhQ rSbzLsdownH+Xh3UKMcxsVLww3GX1FmDbXXmK9OWxLAbjOgJ1FFNLi56MgnFsUozh01w25G17X3 TfvwQrBVIMbEf63wO0y2yZKvleqkElIO15WnyNdmsxk5LUPjU/a7NCTBA1xNW X-Received: by 2002:a17:902:f791:b0:2ca:d803:5c8f with SMTP id d9443c01a7336-2d31776844emr48010215ad.1.1786473013823; Tue, 11 Aug 2026 11:30:13 -0700 (PDT) X-Received: by 2002:a17:902:f791:b0:2ca:d803:5c8f with SMTP id d9443c01a7336-2d31776844emr48009545ad.1.1786473013270; Tue, 11 Aug 2026 11:30:13 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315d829c4sm11759955ad.0.2026.08.11.11.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 11:30:12 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 11 Aug 2026 11:30:08 -0700 Subject: [PATCH v4 3/5] media: iris: Add ROI delta QP control support for HFI 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: quoted-printable Message-Id: <20260811-enc_roi_enable-v4-3-1c9ea2405bb8@oss.qualcomm.com> References: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@oss.qualcomm.com> In-Reply-To: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@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=1786473008; l=8860; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=D7Sm8u1wdO3vrXIzbQAT3/Ga2Pt8dJOD+ZkS0vXQM+A=; b=Q+/aNB1zVGfEXJdLmArq4OF/yG8GXHtQ1hEOucen6dZI2V5/nhtiSspJuJ2u3IvbAsdkuxJ+R sbJ5ir4fApKAc9URXV2Q6dJuRqMqfrTJMaru75HoP9Hi0xSOR25LH6J X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-GUID: gFz9nO97t68qc0AkO5AKdX9-GuZhi2E8 X-Authority-Analysis: v=2.4 cv=K8QS2SWI c=1 sm=1 tr=0 ts=6a7b6a36 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=UQCaeshRnrjKnXqCz0QA:9 a=QEXdDO2ut3YA:10 a=GvdueXVYPmCkWapjIL-Q:22 X-Proofpoint-ORIG-GUID: gFz9nO97t68qc0AkO5AKdX9-GuZhi2E8 X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfX62QfJAqfnbdN 6eugEYaslCuTTIZi1AVhGpwQxXvbLFUDatv4FuVSH74rpcMYa7oQl8Rv1X+3CFNIHKuhbzS5h70 AFZPma8AvKiCh4tZZFdjRhG3jS+jdO8= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfX1M2uYJnXyy/P pKRESqLW2zCqRLaSgkzENLE2e4/CeVjc72LQ6IWOxKk7c8IiJsC6KCUHwiwEsrSXxRtEaAzEEe4 mHb9b9Z5AeoD2RVq6sF1uipkdeOEOVsuX0hZ1dIImEaeRFUWHCenfiLaE/ROdLS2mdOUSDge5Yb CdVz8Nm3yA+MG+I1jKH0X75I46DbDDoCbTuJttmu36E2sP0cdJ2xNDn0cwSpbuz63SidHZavPuA 7ZD++asQUHPk2oOFcMKGHkWqKwpatx6v7agJuKpRTq7FW6jYCxSZRvQY+GE97IEesNPgQj/pknF mD8U4znDkmKXSB4NKIqHJ4OiMQ1XBYCLG87nCseV2A2efoiaezAY7ItB93qm301i8OEl9e1PRRq bonEHIQAqSkdAwmnW1utfgccHckWSdocBJSyfe2cBliOPtJEq5GL6w/2TUrrC1cQGeKqRcpTTJ7 PQthrq7elxCU1MZTpXQ== 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-08-11_04,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 malwarescore=0 spamscore=0 priorityscore=1501 bulkscore=0 clxscore=1015 phishscore=0 impostorscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110155 Add ROI support to the Iris encoder driver for HFI Gen2 based targets. - Add control infrastructure, ROI_PARAMS and MB_SIZE capability IDs to platform_inst_fw_cap_type. Extend struct platform_inst_fw_cap with p_array and elems fields to hold a pointer to the per-frame delta QP array and its element count, set during s_ctrl. - Register V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP as a dynamic S8 array control (max dims =3D 139264 entries, supporting resolution of 8192x4352 at 16x16 MB granularity). Register V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE as a read-only U8 control; g_volatile_ctrl returns 32 for HEVC and 16 for H.264. - Define HFI_PROP_ROI_INFO and hook ROI_PARAMS to iris_set_roi_params(). Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/platform/qcom/iris/iris_ctrls.c | 88 ++++++++++++++++++= +++- drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 14 ++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 1 + .../platform/qcom/iris/iris_platform_common.h | 5 ++ 5 files changed, 108 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/= platform/qcom/iris/iris_ctrls.c index bf17d310eac081ffd3a4ad4842c2255ad798d4d8..de48b6e65d2ef6c7939455d28c0= 8db88a8a0fda0 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -156,6 +156,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(= u32 id) return LAYER5_BITRATE_HEVC; case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: return REQUEST_SYNC_FRAME; + case V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP: + return ROI_PARAMS; + case V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE: + return MB_SIZE; default: return INST_FW_CAP_MAX; } @@ -301,6 +305,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_= type cap_id) return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_L5_BR; case REQUEST_SYNC_FRAME: return V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME; + case ROI_PARAMS: + return V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP; + case MB_SIZE: + return V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE; default: return 0; } @@ -327,6 +335,14 @@ static int iris_op_s_ctrl(struct v4l2_ctrl *ctrl) =20 inst->fw_caps[cap_id].value =3D ctrl->val; =20 + if (inst->fw_caps[cap_id].flags & CAP_FLAG_CUSTOM) { + if (cap_id =3D=3D ROI_PARAMS) { + inst->fw_caps[cap_id].p_array =3D + (const void *)ctrl->p_new.p; + inst->fw_caps[cap_id].elems =3D ctrl->new_elems; + } + } + if (vb2_is_streaming(q)) { if (cap[cap_id].set) cap[cap_id].set(inst, cap_id); @@ -335,8 +351,52 @@ static int iris_op_s_ctrl(struct v4l2_ctrl *ctrl) return 0; } =20 +static int iris_get_roi_mb_size(struct iris_inst *inst) +{ + return inst->codec =3D=3D V4L2_PIX_FMT_HEVC ? 32 : 16; +} + +static int iris_op_g_ctrl(struct v4l2_ctrl *ctrl) +{ + struct iris_inst *inst =3D container_of(ctrl->handler, struct iris_inst, = ctrl_handler); + enum platform_inst_fw_cap_type cap_id; + + cap_id =3D iris_get_cap_id(ctrl->id); + if (!iris_valid_cap_id(cap_id)) + return -EINVAL; + + if (cap_id =3D=3D MB_SIZE) + ctrl->val =3D iris_get_roi_mb_size(inst); + + return 0; +} + static const struct v4l2_ctrl_ops iris_ctrl_ops =3D { .s_ctrl =3D iris_op_s_ctrl, + .g_volatile_ctrl =3D iris_op_g_ctrl, +}; + +const struct v4l2_ctrl_config roi_mbqp_cfg =3D { + .ops =3D &iris_ctrl_ops, + .id =3D V4L2_CID_MPEG_VIDEO_ROI_MB_DELTA_QP, + .name =3D "Enc Mb ROI Delta QP", + .type =3D V4L2_CTRL_TYPE_S8, + .dims =3D {139264}, /* Max MBPF =3D 8192 * 4352 / 256 */ + .min =3D -31, + .max =3D 30, + .def =3D 0, + .step =3D 1, +}; + +static const struct v4l2_ctrl_config roi_mbqp_size =3D { + .ops =3D &iris_ctrl_ops, + .id =3D V4L2_CID_MPEG_VIDEO_ROI_MB_SIZE, + .name =3D "ROI Mb size", + .type =3D V4L2_CTRL_TYPE_U8, + .min =3D 16, + .max =3D 32, + .def =3D 16, + .step =3D 1, }; =20 int iris_ctrls_init(struct iris_inst *inst) @@ -361,7 +421,7 @@ int iris_ctrls_init(struct iris_inst *inst) return ret; =20 for (idx =3D 1; idx < INST_FW_CAP_MAX; idx++) { - struct v4l2_ctrl *ctrl; + struct v4l2_ctrl *ctrl =3D NULL; =20 v4l2_id =3D iris_get_v4l2_id(cap[idx].cap_id); if (!v4l2_id) @@ -379,6 +439,13 @@ int iris_ctrls_init(struct iris_inst *inst) cap[idx].max, ~(cap[idx].step_or_mask), cap[idx].value); + } else if (cap[idx].flags & CAP_FLAG_CUSTOM) { + if (cap[idx].cap_id =3D=3D ROI_PARAMS) + ctrl =3D v4l2_ctrl_new_custom(&inst->ctrl_handler, + &roi_mbqp_cfg, NULL); + if (cap[idx].cap_id =3D=3D MB_SIZE) + ctrl =3D v4l2_ctrl_new_custom(&inst->ctrl_handler, + &roi_mbqp_size, NULL); } else { ctrl =3D v4l2_ctrl_new_std(&inst->ctrl_handler, &iris_ctrl_ops, @@ -1540,3 +1607,22 @@ int iris_set_properties(struct iris_inst *inst, u32 = plane) =20 return 0; } + +int iris_set_roi_params(struct iris_inst *inst, u32 plane) +{ + struct iris_buffers *buffers =3D &inst->buffers[BUF_ROIMB_DELTAQP]; + u32 metadata_header_bytes =3D 256; + u32 size =3D 0; + int ret =3D 0; + + if (!inst->fw_caps[ROI_PARAMS].p_array) + return -EINVAL; + + size =3D inst->fw_caps[ROI_PARAMS].elems * 2 + metadata_header_bytes; + buffers->size =3D ALIGN(size, 4096); + ret =3D iris_hfi_gen2_session_alloc_roi_metadata_buffer(inst); + if (ret) + return ret; + + return 0; +} diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/= platform/qcom/iris/iris_ctrls.h index 5180d53d3c904cad460b2760913b475d0ff1bb55..4eb632c923e961de3679a8b049f= a264d0ad88621 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 p= latform_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_ins= t_fw_cap_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); +int iris_set_roi_params(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c b/drivers/med= ia/platform/qcom/iris/iris_hfi_gen2.c index 3b8fbefb8b93576962abd3850215f7b7fb364930..4d40d6733e5877a302ce63fb0b4= a61b8f284e6dc 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.c @@ -1782,6 +1782,20 @@ static const struct platform_inst_fw_cap inst_fw_cap= _sm8550_enc[] =3D { .flags =3D CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set =3D iris_set_req_sync_frame, }, + { + .cap_id =3D ROI_PARAMS, + .step_or_mask =3D 1, + .p_array =3D NULL, + .hfi_id =3D HFI_PROP_ROI_INFO, + .flags =3D CAP_FLAG_INPUT_PORT | CAP_FLAG_CUSTOM | + CAP_FLAG_DYNAMIC_ALLOWED, + .set =3D iris_set_roi_params, + }, + { + .cap_id =3D MB_SIZE, + .step_or_mask =3D 1, + .flags =3D CAP_FLAG_OUTPUT_PORT | CAP_FLAG_CUSTOM, + }, }; =20 static const u32 sm8550_vdec_input_config_params_default[] =3D { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index f43aea10090d8f1d6ae5c20547e5f6321b2ca203..08fc1036013de29e51747a6425a= e7bb805ca3e0f 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -133,6 +133,7 @@ enum hfi_flip { #define HFI_PROP_DEC_START_FROM_RAP_FRAME 0x03000169 #define HFI_PROP_NO_OUTPUT 0x0300016a #define HFI_PROP_BUFFER_MARK 0x0300016c +#define HFI_PROP_ROI_INFO 0x03000173 #define HFI_PROP_WORST_COMPRESSION_RATIO 0x03000174 #define HFI_PROP_WORST_COMPLEXITY_FACTOR 0x03000175 #define HFI_PROP_RAW_RESOLUTION 0x03000178 diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 9748095091461ba13443c63955a42906fa4f050c..9910eb5514b3ae0a6b5349adb07= 1d0a56375102c 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -186,6 +186,8 @@ enum platform_inst_fw_cap_type { LAYER5_BITRATE_HEVC, REQUEST_SYNC_FRAME, TIME_DELTA_BASED_RC, + ROI_PARAMS, + MB_SIZE, INST_FW_CAP_MAX, }; =20 @@ -197,6 +199,7 @@ enum platform_inst_fw_cap_flags { CAP_FLAG_CLIENT_SET =3D BIT(4), CAP_FLAG_BITMASK =3D BIT(5), CAP_FLAG_VOLATILE =3D BIT(6), + CAP_FLAG_CUSTOM =3D BIT(7), }; =20 struct platform_inst_fw_cap { @@ -206,6 +209,8 @@ struct platform_inst_fw_cap { s64 step_or_mask; s64 value; u32 hfi_id; + const void *p_array; + u32 elems; enum platform_inst_fw_cap_flags flags; int (*set)(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id); --=20 2.34.1 From nobody Tue Sep 29 06:11:02 2026 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 43600389DE3 for ; Tue, 11 Aug 2026 18:30:17 +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=1786473024; cv=none; b=ZNZ7D4Htaq4KSPW9w47lKDeT3trrWCPePEILgOXG8jar3emsBWxpRC9EL8VJGt8qpt9xWHgu3XhhLxNsa7w+4nhbks2Hf6+gxb45b6LWqFHl0r2NgNk4JRmYkAH/jyXLo/bMdgKzHCWPupUWwV8gMwpGqitfEIdgx72AaRC0yy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786473024; c=relaxed/simple; bh=pQeZtimMHqJPExLAmSEyBS1Afbv4KJbY1bYUloUTAkc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Sitw2LxddKq/yvY+OD/UAT1w7WJJsDxtAlYGCrQh7O3dOvM+GHKIKcBhyBlcQ3RvXjSfZ9YaHnRYsMfJnVXxZ2dhYn4fRPhYcZsL17dq0R5R1wpq2/YVk58M+hgzreVGj67NPoYH4gFnjKRf+LjWADRAkJDjk3x0qp11L17yzJg= 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=YSTpCz1b; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KFG0i/2m; 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="YSTpCz1b"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KFG0i/2m" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BGOGxW1094015 for ; Tue, 11 Aug 2026 18:30:17 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= yuLRsnML95fTSfbhKUc8uKyLGWmwAzwh/IZnRiZkzLU=; b=YSTpCz1bnpW2a9Ak 3spWtUsyklxncj2A8zdFhB7ok0ugZLElLtIZrGLTJtl66ZX64reCv3VAOXcRh3pJ +wt64hIyyqzuWWe9sQqvS/Pa/44aHgukiV42fO6//C7c9eC1RshgT+/1fnrDk8Mj yQysItNaS0r9gabz1HKrbEtvXQVaLu4hYbHYa4oF8vr2duWZGRI/z5GaixQYzkiX GTrb+N0F5haM/Cwe4lwEFutZgpnElhxYVjxkn/GDmmdk5MRnWTOYG6Nfp7ZsqM10 +VMzS9lDTrHZaW3KGhcLfXyPEj1qGP/js0XUbOhTmBjvTwygLcZmAN+7KZg1FH1N YwP/cQ== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g049gshk8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 18:30:16 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cae7a8b9easo364485ad.3 for ; Tue, 11 Aug 2026 11:30:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786473016; x=1787077816; 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=yuLRsnML95fTSfbhKUc8uKyLGWmwAzwh/IZnRiZkzLU=; b=KFG0i/2mOB4HB9uLz4vNkSVRgLasakZZbNkQwbcXxXh5UP3VVToP1kOAoJntuO551J iqLS4kvRPbHb93zcHhLtYygrYsYLN0RO4QxCuj9XGVvuGkqah9Wn98wFNUbnUeBB7Qpe Nky9OHBxyo6H237jkT2bM5/sii8HElhlAvN3mtYk8Mz+vftzJNo7dQlkrzXjgqanmauG cQ0XG0FURMh/B+Edu0GfYOf+gaam0OEDaomFcPGrggeETBJyufFQKy2G5u/lJxK2Ow2S BwHU6vOSuwy+b8Wkxm9RHvybF2K4POfw1uKFHo5oV7nQXtJjEKg/UNVuJv9deKURDj62 pW7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786473016; x=1787077816; 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=yuLRsnML95fTSfbhKUc8uKyLGWmwAzwh/IZnRiZkzLU=; b=V0Xc4VJn05sfWebW9pMfZIzZGZ5tsQNM/SSeUaH/aOW4yty7jZObrM/Py/sAOFX28v SR9Xd5aoEwYW++L39LNAtNH0Z2cefBPLJWvIOSepar4RqsMeMfadKaXRv9b2mr3/5gjj tStqG7IYXrwO+efikQ8UM26eRqJyc6M2tFQxXeBkBHp3VuUfxF/gQFTTzCr+iZKtlfJz KQAtbLpHe6TSON+Y4SIeViuQZPHU37HVsgi+tKzEsWBK9QkzAy7RWFRvjts3vK1W0Dc4 DdobYtzaFB8rKGBUu2Xdnw7ZU2xhw7VkX6wg12p9gBE7aQp8vLFSkos5ZZ26YN/fH3m5 EhEw== X-Forwarded-Encrypted: i=1; AHgh+RoKYFTON7vvy9TgVYzDCVKLJTlfnkoC6kYs1iLQ/cdwaUNVIlx2tqHvIT1g1EofJKWnhHtvor+VyrXHl1M=@vger.kernel.org X-Gm-Message-State: AOJu0YwA5vuDCwp5oBb7F1qosAQ/wt+ioGpW/M1wnqGA+aKMR3KtTaKG 5jrddsm/mrQlrVYZcR1Dgmtl0qZaDKIR0InnVwEXi9BKJCeBqz6CEOU1LpAUEbSyjPDZDHS5vMu uwCumhfe2SRWObWLSmHbrf7HM0zy/TkOQvb+ADECD1MJdosdOj/wuO0NrSNoA66NhcPdL2J4xFS c= X-Gm-Gg: AR+sD12GkiXtvb7vfbgIe0C5ZESOADVnoJct3llxJZZWzSeGZ2eBSKuzr+YWkdsY1i7 LjbuwacZbM60fwtLD1fkZ71M8psGbKzWfy54glCLzZubAh2phI1eEUCM4J1Hs0XSqhnU50hWK94 fu618jk+lni2AcjaKsXUfXw8s2mzhKMvLLI6MhxBJlx7yEVOINzX06vYWkKbDSdjMAjXSRr/YBp DaEyABRXb/76LPd8iCsPQ7nG2Z1iNxHig98QTyT4ommLfKyVF7LeNlK2IGIYEGSdG+z7aQ9q0QU 28tj/ZXMnAjy5lqJVm8vX1twdxzYZGFXBObE3072SQnkm+NJk3CwaSQxh0BvX6zTkaXSdcNgD82 +W80JMlfwiVx55xkYm83jRJeJXbNaDKjzXlOjSkDTUe0H6Hq/Muib3zynamXB X-Received: by 2002:a17:902:e80d:b0:2cf:9e90:8be with SMTP id d9443c01a7336-2d317ab0841mr47385605ad.4.1786473015561; Tue, 11 Aug 2026 11:30:15 -0700 (PDT) X-Received: by 2002:a17:902:e80d:b0:2cf:9e90:8be with SMTP id d9443c01a7336-2d317ab0841mr47385205ad.4.1786473015091; Tue, 11 Aug 2026 11:30:15 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315d829c4sm11759955ad.0.2026.08.11.11.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 11:30:13 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 11 Aug 2026 11:30:09 -0700 Subject: [PATCH v4 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: quoted-printable Message-Id: <20260811-enc_roi_enable-v4-4-1c9ea2405bb8@oss.qualcomm.com> References: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@oss.qualcomm.com> In-Reply-To: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@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=1786473008; l=14338; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=pQeZtimMHqJPExLAmSEyBS1Afbv4KJbY1bYUloUTAkc=; b=tmRivfiFrWKf5QAR0EvhgSSyXvKihELkxBqJ5MrqRWf/0XRsn4Yahw32ry0ZN70p/+ySykaNU MT60fBRCqmWBe1HVIlOThFxdLHP88hU1d+GYaY7+ny/xKXv2R+1aoDk X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfX094csOFBFPQl vPYmmym6AcIXSmDKI7QONvOFBp+Gt9QefzqghdEGnttqOhl2GscAffr9QsEOk751kCLRZcYPLY9 ZxRz5efFnqmg6mdCI9Ege2CKLOvWoEI= X-Proofpoint-ORIG-GUID: BmRbAdtQxRNR_Zf7O-CtDp4Onzp90coZ X-Proofpoint-GUID: BmRbAdtQxRNR_Zf7O-CtDp4Onzp90coZ X-Authority-Analysis: v=2.4 cv=cvarVV4i c=1 sm=1 tr=0 ts=6a7b6a38 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=HXZOsHZbktv8MLOhIAwA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfX6uNqpz+TKioL amTNjmS4te39b3wP1uPdkohUkDyjawvwtmfDWI+YxStYKRzJG46VJ3yUcUUEwvkgl82X5ZSGBo3 e/GlqmmgHq8JsZKsTYXdmnELBvmTRXBLpN6xG1M/XJIBasGrR0xoSLkgDzIUKN/48ye3jFzP4/T I2jFSMotCveB3euFPdtMkX2QlPmyxMWzSHQ4w7GwuNT/dt5j6Ws5uy189DMsMtxYo/z7hf/Fbj1 zwWxw6wfML1vX3koVc4tTrAhKD+jLpgdobwjVuwdDSA8AP18DYYa7n7T9CoSPmwya1GiLHlezIv ejWNdrxM9bEUcVHmZBLiNG+23ngvPUDSEONEE4fHcamGKuxukbTctrmyTKLjQUEYSRSFuWQqs3t uP30H47J03hpRC2WNIWgPSw5kjnUvXKn/YIFGV1Jwnytfp6gyN09T9z5KM+yh18i8CvWVF8TSA/ scjvKWUvaaoFHNl/+iw== 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-08-11_04,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 impostorscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110155 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 | 16 +++++++++ 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 | 42 ++++++++++++++++++= +++- .../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 +++ drivers/media/platform/qcom/iris/iris_venc.h | 2 ++ 11 files changed, 118 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.h b/drivers/media= /platform/qcom/iris/iris_buffer.h index ab8e5d953101a786ade20540ee3c3ed226160cbe..ee2d24bb69c57220b0a735d9b4a= ae4434a33daf6 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; }; =20 +/* 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 buf= fer_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 de48b6e65d2ef6c7939455d28c08db88a8a0fda0..c450ea5068eb400f347336fe279= 92f7d2b9a44c6 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -1626,3 +1626,19 @@ int iris_set_roi_params(struct iris_inst *inst, u32 = plane) =20 return 0; } + +int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane) +{ + const struct iris_hfi_session_ops *hfi_ops =3D inst->hfi_session_ops; + int ret =3D 0; + + /*subscribe to metadata delivery only if ROI is enabled */ + if (!inst->fw_caps[ROI_PARAMS].p_array) + return ret; + + ret =3D hfi_ops->session_subscribe_metadata_delivery(inst, plane); + if (ret) + return ret; + + return ret; +} diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.h b/drivers/media/= platform/qcom/iris/iris_ctrls.h index 4eb632c923e961de3679a8b049fa264d0ad88621..2f047553a75833d39e5d0b7c14a= fd4a3fce8a04e 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.h +++ b/drivers/media/platform/qcom/iris/iris_ctrls.h @@ -51,5 +51,6 @@ int iris_set_req_sync_frame(struct iris_inst *inst, enum = platform_inst_fw_cap_ty int iris_set_time_delta_based_rc(struct iris_inst *inst, enum platform_ins= t_fw_cap_type cap_id); int iris_set_properties(struct iris_inst *inst, u32 plane); int iris_set_roi_params(struct iris_inst *inst, u32 plane); +int iris_set_metadata_delivery(struct iris_inst *inst, u32 plane); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/m= edia/platform/qcom/iris/iris_hfi_common.h index a27447eb2519962cb958b0e330a6d018310c3450..5692375cdd357f9b00760053fff= f5af4bd9cce9c 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 pl= ane); }; =20 struct hfi_subscription_params { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 388a36ff2b07b7bcd8db21d4345bc900356b4ec3..c08926609a3b7f5bb63df369da5= 19accdd490121 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -1307,10 +1307,29 @@ static void iris_hfi_gen2_get_buffer(u32 domain, st= ruct iris_buffer *buffer, buf->timestamp =3D buffer->timestamp; } =20 +static struct iris_buffer *iris_queue_metadata_buffers(struct iris_inst *i= nst, + enum iris_buffer_type buffer_type, u32 index) +{ + struct iris_buffers *buffers =3D &inst->buffers[buffer_type]; + struct iris_buffer *buffer =3D NULL; + + if (list_empty(&buffers->list)) + return NULL; + + buffer =3D list_first_entry(&buffers->list, typeof(*buffer), list); + if ((buffer->attr & BUF_ATTR_QUEUED) || (buffer->attr & BUF_ATTR_DEQUEUED= )) + return NULL; + + buffer->index =3D index; + + return buffer; +} + static int iris_hfi_gen2_session_queue_buffer(struct iris_inst *inst, stru= ct iris_buffer *buffer) { struct iris_inst_hfi_gen2 *inst_hfi_gen2 =3D to_iris_inst_hfi_gen2(inst); struct iris_hfi_buffer hfi_buffer; + struct iris_hfi_buffer hfi_meta_buffer; u32 port; int ret; =20 @@ -1330,7 +1349,7 @@ static int iris_hfi_gen2_session_queue_buffer(struct = iris_inst *inst, struct iri HFI_PAYLOAD_STRUCTURE, &hfi_buffer, sizeof(hfi_buffer)); - + } return iris_hfi_queue_cmd_write(inst->core, inst_hfi_gen2->packet, inst_hfi_gen2->packet->size); } @@ -1359,6 +1378,26 @@ static int iris_hfi_gen2_session_release_buffer(stru= ct iris_inst *inst, struct i inst_hfi_gen2->packet->size); } =20 +static int iris_hfi_gen2_subscribe_metadata_delivery(struct iris_inst *ins= t, u32 plane) +{ + struct iris_inst_hfi_gen2 *inst_hfi_gen2 =3D to_iris_inst_hfi_gen2(inst); + u32 port =3D iris_hfi_gen2_get_port(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLA= NE); + u32 payload[2] =3D {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 =3D { .session_open =3D iris_hfi_gen2_session_open, .session_set_config_params =3D iris_hfi_gen2_session_set_config_params, @@ -1372,6 +1411,7 @@ static const struct iris_hfi_session_ops iris_hfi_gen= 2_session_ops =3D { .session_drain =3D iris_hfi_gen2_session_drain, .session_resume_drain =3D iris_hfi_gen2_session_resume_drain, .session_close =3D iris_hfi_gen2_session_close, + .session_subscribe_metadata_delivery =3D iris_hfi_gen2_subscribe_metadata= _delivery, }; =20 static struct iris_inst *iris_hfi_gen2_get_instance(void) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index 08fc1036013de29e51747a6425ae7bb805ca3e0f..d0661f5fe6a6f39295dad8950ed= b2f1a85893216 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 =3D 0x00000001, HFI_MODE_PROPERTY =3D 0x00000002, + HFI_MODE_METADATA =3D 0x00000004, }; =20 enum hfi_color_format { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.c b/driv= ers/media/platform/qcom/iris/iris_hfi_gen2_packet.c index 0d05dd2afc07d830cc8502ab5f28001312991ba8..aeb0426a05694f219f82145cd84= a28287ed3075e 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 =3D 0; } =20 -static void iris_hfi_gen2_create_packet(struct iris_hfi_header *hdr, u32 p= kt_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 =3D (struct iris_hfi_packet *)((u8 *)hdr + hd= r->size); u32 pkt_size =3D sizeof(*pkt) + payload_size; diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_packet.h b/driv= ers/media/platform/qcom/iris/iris_hfi_gen2_packet.h index 25b9582349ca1a0ce6efc0b146a3abb798485c45..613eb500609f745daebdcbdf9a2= 5b85cb9465a79 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 *c= ore, 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); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_response.c b/dr= ivers/media/platform/qcom/iris/iris_hfi_gen2_response.c index 8c2644c7f6e85983d7ad7584fc0cb570e4813ae4..84b629b957442c024dccc18b354= ac9a7e541abaa 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 bu= ffer_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_buffe= r(struct iris_inst *inst, return 0; } =20 +static int iris_hfi_gen2_handle_output_metadata_buffer(struct iris_inst *i= nst, + struct iris_hfi_buffer *buffer) +{ + u32 buf_type =3D iris_hfi_gen2_buf_type_to_driver(inst, HFI_BUFFER_METADA= TA); + struct iris_buffers *buffers =3D &inst->buffers[buf_type]; + struct iris_buffer *buf, *iter; + bool found =3D false; + + list_for_each_entry(iter, &buffers->list, list) { + if (iter->device_addr =3D=3D buffer->base_address) { + found =3D true; + buf =3D iter; + break; + } + } + if (!found) + return -EINVAL; + + buf->attr &=3D ~BUF_ATTR_QUEUED; + buf->attr |=3D 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 i= ris_inst *inst, return iris_hfi_gen2_handle_input_buffer(inst, buffer); else if (buffer->type =3D=3D HFI_BUFFER_BITSTREAM) return iris_hfi_gen2_handle_output_buffer(inst, buffer); + else if (buffer->type =3D=3D 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/p= latform/qcom/iris/iris_venc.c index a945992f63aa8a0c40b8d6bc473d0bc90270e6cd..21ba9639d17b2c64e8fa33b4aac= bd1946fc4dae2 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; =20 + ret =3D iris_set_metadata_delivery(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLA= NE); + if (ret) + goto error; + ret =3D iris_alloc_and_queue_persist_bufs(inst, BUF_ARP); if (ret) return ret; diff --git a/drivers/media/platform/qcom/iris/iris_venc.h b/drivers/media/p= latform/qcom/iris/iris_venc.h index 00c1716b2747c7e840c2a3317800d83663744bf0..df97011636740be6cdfe5867f27= 3c5f93408f570 100644 --- a/drivers/media/platform/qcom/iris/iris_venc.h +++ b/drivers/media/platform/qcom/iris/iris_venc.h @@ -22,5 +22,7 @@ int iris_venc_streamon_output(struct iris_inst *inst); int iris_venc_qbuf(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf); int iris_venc_start_cmd(struct iris_inst *inst); int iris_venc_stop_cmd(struct iris_inst *inst); +struct iris_buffer *iris_queue_metadata_buffers(struct iris_inst *inst, + enum iris_buffer_type buffer_type, u32 index); =20 #endif --=20 2.34.1 From nobody Tue Sep 29 06:11:02 2026 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 7B5AD37FF6A for ; Tue, 11 Aug 2026 18:30:19 +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=1786473021; cv=none; b=lMaKxSsXLDkjmW9OH4wkG/9NITQsZ7h/l6j35XpaR1OvO3md/OnMPvFtOYNkTrbrklrBcbyVEXVuyt3Ewu14gjuyA8UdQwBpDt+CmQaE2YDo8M0BxyDCFSVH5nr5wqWuyfxwld/HgfZIJXLL8V3LtQovTWEsPPNMiaXF9aoG0N4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786473021; c=relaxed/simple; bh=7/mfk8byDdoQBxxoyQQHHh1kxMA3Od9D3QpJFrj3Mjk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OP46rjnCJhiriDr7QBmJ6hVtnpIdJtLc3uIDt3jcnqm72+h8COLPLHo3iPCz9gKdaeSBCwIp61tyT5RuRXuSm4CHZNlL4V1j/NCoeeiQSfBXbgvALhYvgTyBI/oIuwbtf9+co3A4ZGeRR/VCieE8AkLJRuD+6cEYHSy2yo4nu5E= 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=OteIXH4R; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=LxJTtkUY; 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="OteIXH4R"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="LxJTtkUY" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67BGOHw91094027 for ; Tue, 11 Aug 2026 18:30:18 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= J3fqy9f93f6DrZhjxQqNdKYqt5gbpVbD4h+k+ApYKkA=; b=OteIXH4RDKQy60RR O+VIu+2vM6GuS7islSDiN6kL/0UK4eR1QUg4db3ekJfHq8f8LK7lbAOPuyjj5rvB tbOwoOifcnN7X7jbs6y1DZ/fxtB+O41MQpDcaCcSVX9hcSvyuH5ifavK9M6VuQpq su7L44j8ojuz9f66ovcGJGqMwBU59y2Su37y+vfLs35zzE9c2oqmJc5eum1PnNcC zD/Qs32P91zcmh1XN9BzhwzNhgIiy5/qHkvaZHnz/JGsUNMrT3cuyhMz9qOi53bJ sykM8aJtsDWztyyACzWvB+MVRNrk2y15ZPoigmh9MoH9Lx0VOpjf+QXSPc75D2HD 40Na3Q== Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4g049gshkd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 11 Aug 2026 18:30:17 +0000 (GMT) Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2cf2308ef97so411175ad.0 for ; Tue, 11 Aug 2026 11:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1786473017; x=1787077817; 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=J3fqy9f93f6DrZhjxQqNdKYqt5gbpVbD4h+k+ApYKkA=; b=LxJTtkUYVzhDYYKbDs9b8TIZQ2lSE+U5x9hf2ozT48DgjzFsge6R/XhXEGSLHvJHzQ y87N7sx15mI21y9kxSqAelzzmmaIanXJjh2wGhgdvm4yH2KMPGJUdXsLY63ZWfn4gLXU igxBov/JNGV+5Wa+InzZgDr0eIxIPlqw559j03TAwQTpORXCkIaVAL0XDHYAdkmrw9uY Bb1O/C5O32ASLaO+VDBdTQNowdjtBcoTjXC62zdZYFzUXDGj1DKo3pCjNcMbIT5cm1KO dt2e+LwRTRFqM4ronJKEBIrQYD5Dl/fabomPgJ06Uo8nRFgTYLl4f8bCyMIoVcWVU2j4 Wr+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786473017; x=1787077817; 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=J3fqy9f93f6DrZhjxQqNdKYqt5gbpVbD4h+k+ApYKkA=; b=KRqFRhgeia0NybM2UzUvjtRiN23patjTMPtyIGzRrMKE5qfQ+2y93fI6P0hSQC2MBj lRosFaI9nL4vMlhLVI3clB5EaVMEunHa+ngjkRSzl7354Y/O0FDqWFtJCnKsnQwzI6Vk 5/Qj6sv4zjCXI+8zOKDj3yo/Suveaae9+KPKmQdvU52P7tKmdID4Omrs1WQhzlGfwkWT v3pnNNyM44qIm3WIQUbvwqEOzXEdc6pudKg5hGmIF0UoYtbe/MjK7v3l/zfDLekXYDdi 4cjhJ5a8GCOMLToNNVv85F1EkcvE98b08VUZEpca7eAFDNXAjYDSiyYN2y/fjqengUI7 WqwQ== X-Forwarded-Encrypted: i=1; AHgh+Rrwx4pLgL2AUrvwPgH8PAYsrtjGj0HHKERmHM6+xtFoANjOw4xo8tlMoTxUikF6ix9wZiV7n184yKYsUyM=@vger.kernel.org X-Gm-Message-State: AOJu0YzTTHTdP0Zc951sfFh7C2ELKBr7OG1MOJvOVsp82zzDtEfI63Jv Io12YfduTT+n3qHKP9g+8HKCg3ZIC7sCRB5esPGDXv1Ydyo8NlXMbs4mKReBOLvHHQNnOtDKZEd F+fWqJOsYG4MbiLRTyPwk3GWhLzCLXc8l7yNSSeCMoe1pDVYvEK1fe8e0ceLpPpy9q8U= X-Gm-Gg: AR+sD111uF+7KNn5mQxniJoaPYnMA23YgaO6hKtBteckuiza5HXOax4b8qosy8eOUc+ sF985/RJSKQyr7bd3pQWBp2eF3iorKQSmnOACFkkd/OFTOw/ZEYjrW9oi+fEBOxOIbTHe+hNvYQ FxKvbgEM6p1cL8CBKbWZmlfX6cKIFnwDpMQSGWkJ5YBVTfD3f+Xt92j19SVz1ujzV8ohE2xoQ1P C8EcHriALhnbpNKvlK0orVXnOTkkCHZbgGhym1ToCHNOUfSx5DQKUsTNFH6FySzlZpxo+AZhy0z BzoXpPWUpGSB8icE74OrG05YpKmWA+GGkdLKzCu03FMl3LzLDQfS3TOd7eXQXdiBgfXYFhDuPZY sTBYKZ7M7z3t0W7ME0RPFEFa15x3QsE5usjQ9UxAZcyj/2yRiknhZzq2BOXHx X-Received: by 2002:a17:903:b0e:b0:2d0:2741:f31b with SMTP id d9443c01a7336-2d31794d71dmr42995415ad.4.1786473016703; Tue, 11 Aug 2026 11:30:16 -0700 (PDT) X-Received: by 2002:a17:903:b0e:b0:2d0:2741:f31b with SMTP id d9443c01a7336-2d31794d71dmr42994895ad.4.1786473016222; Tue, 11 Aug 2026 11:30:16 -0700 (PDT) Received: from gu-dmadival-lv.qualcomm.com (Global_NAT1.qualcomm.com. [129.46.96.20]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d315d829c4sm11759955ad.0.2026.08.11.11.30.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 11:30:15 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Tue, 11 Aug 2026 11:30:10 -0700 Subject: [PATCH v4 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: quoted-printable Message-Id: <20260811-enc_roi_enable-v4-5-1c9ea2405bb8@oss.qualcomm.com> References: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@oss.qualcomm.com> In-Reply-To: <20260811-enc_roi_enable-v4-0-1c9ea2405bb8@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=1786473008; l=9821; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=7/mfk8byDdoQBxxoyQQHHh1kxMA3Od9D3QpJFrj3Mjk=; b=u7AlKPiMf94/M6iq+kqrs3oR4+6Lj5m2zEnculNAt3GJptsHvVtXjf6pfFkMS2OgrdK+BsiOF QQ46VK25QKxDSUsVDzVTbLwA6CwdqfviQ8s2OnYUo8YAJtVhdMRsV1z X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Info: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfXyfodiDlxwRFB P0ZXFRjeO4Ss3yd/S3GY4HAKdw8R0NFLX8wP9ThOp9/oiBwj0A9R8tb1LAcnhdqcViBarKbz4yN /1KX7QYXpqRNms6M6Gjnax8F8k7K9dg= X-Proofpoint-ORIG-GUID: sgWpXu-wa14VeJvhXmoGRhAcrasB-seu X-Proofpoint-GUID: sgWpXu-wa14VeJvhXmoGRhAcrasB-seu X-Authority-Analysis: v=2.4 cv=cvarVV4i c=1 sm=1 tr=0 ts=6a7b6a39 cx=c_pps a=cmESyDAEBpBGqyK7t0alAg==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=JBFbhGGVFNGgHyVnUDYA:9 a=QEXdDO2ut3YA:10 a=1OuFwYUASf3TG4hYMiVC:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODExMDE1NSBTYWx0ZWRfXyqtd2NVAxkpH n7OlPVSStlr80SKyQP9RXYFvBx31nKjcw+Rva0TqgxPpQ0YOGXq/sdi39jaypQq0Nxoe59cZH/U efK5zJRmO4eqzcdgjsvXf1govn2VzS+MX5iFaKtjThbuoEkVryDip+61p52Jy4i/ZLH2CMvqATh 71DIBVeeqEkMFCsnJ0mKSKE0f5qmKCEgGZ0Iu0TMHrOb6nVUqqp9FUjp+8tvUIGVecJcHmXljGs IRvq3oW9/ySq/j0EcLB4Bg10eanevmtMMk/AU1CH19ECiCxxBLOL89j6lzmz0z71AArUoiGScM1 PDOoAxIdEjR4IOtiuAGDvoelMJp7X+ZyaXa+pmdOhw4pQ4kJD7qWlDiS3HZTR5LtBJ3Qv5EmI5K 9FSanFrSk5Pd0ihvCORgVBNhJ8LgJRG/K9mfSiTIZ8GqsVJAgWeJOJ7/JurkCSYLoiYRNVS3kwy hczB8A84XWVMBzTR30Q== 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-08-11_04,2026-08-10_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 clxscore=1015 suspectscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=0 impostorscore=0 adultscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608110155 - 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. Signed-off-by: Deepa Guthyappa Madivalara --- drivers/media/platform/qcom/iris/iris_buffer.c | 98 ++++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_buffer.h | 4 + .../platform/qcom/iris/iris_hfi_gen2_command.c | 23 +++++ .../platform/qcom/iris/iris_hfi_gen2_response.c | 2 + drivers/media/platform/qcom/iris/iris_vidc.c | 2 + 5 files changed, 129 insertions(+) diff --git a/drivers/media/platform/qcom/iris/iris_buffer.c b/drivers/media= /platform/qcom/iris/iris_buffer.c index eb8de60c1177f5e1ab83b90a3c8c80e0b4d1f02e..e7283a5054f685741bb55d5545a= 6c11188861b5d 100644 --- a/drivers/media/platform/qcom/iris/iris_buffer.c +++ b/drivers/media/platform/qcom/iris/iris_buffer.c @@ -5,11 +5,13 @@ =20 #include #include +#include =20 #include "iris_buffer.h" #include "iris_instance.h" #include "iris_power.h" #include "iris_vpu_buffer.h" +#include "iris_hfi_gen2_defines.h" =20 #define PIXELS_4K 4096 #define MAX_WIDTH 4096 @@ -705,6 +707,19 @@ int iris_destroy_dequeued_internal_buffers(struct iris= _inst *inst, u32 plane) return iris_destroy_internal_buffers(inst, plane, false); } =20 +int iris_destroy_roi_metadata_buffers(struct iris_inst *inst) +{ + struct iris_buffer *buf, *next; + struct iris_buffers *buffers; + + if (inst->domain =3D=3D ENCODER) { + buffers =3D &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 +943,86 @@ int iris_vb2_buffer_done(struct iris_inst *inst, struc= t iris_buffer *buf) =20 return 0; } + +static int iris_fill_roi_data(struct iris_inst *inst, struct iris_buffer *= buffer) +{ + s8 *p_array =3D (s8 *)inst->fw_caps[ROI_PARAMS].p_array; + u32 array_size =3D inst->fw_caps[ROI_PARAMS].elems; + struct metabuf_header *mbuf_hdr =3D buffer->kvaddr; + struct metapayload_header *mbuf_payload_hdr; + s16 *p_16; + u32 payload_offset; + + memset(mbuf_hdr, 0, sizeof(struct metabuf_header)); + mbuf_hdr->count =3D 1; + mbuf_hdr->size =3D sizeof(struct metabuf_header) + + sizeof(struct metapayload_header); + mbuf_hdr->version =3D BIT(16); + mbuf_hdr++; + mbuf_payload_hdr =3D (struct metapayload_header *)(mbuf_hdr); + payload_offset =3D sizeof(struct metabuf_header) + + sizeof(struct metapayload_header); + + memset(mbuf_payload_hdr, 0, sizeof(struct metapayload_header)); + mbuf_payload_hdr->type =3D HFI_PROP_ROI_INFO; + mbuf_payload_hdr->size =3D array_size * sizeof(s16); + mbuf_payload_hdr->version =3D 1 << 16; + mbuf_payload_hdr->offset =3D ALIGN(payload_offset, (u32)256); + mbuf_payload_hdr->flags =3D 0; + + /* Firmware expects 2bytes of delta_Qp, int16_t */ + p_16 =3D buffer->kvaddr + mbuf_payload_hdr->offset; + for (int i =3D 0; i < array_size; i++) + p_16[i] =3D p_array[i]; + + return 0; +} + +int iris_hfi_gen2_session_alloc_roi_metadata_buffer(struct iris_inst *inst) +{ + struct iris_buffers *buffers =3D &inst->buffers[BUF_ROIMB_DELTAQP]; + struct iris_core *core =3D inst->core; + struct iris_buffer *buffer, *first_buffer, *next; + bool found =3D false; + int ret =3D 0; + + if (!buffers->size) + return 0; + + list_for_each_entry_safe(buffer, next, &buffers->list, list) { + if (buffer->attr & BUF_ATTR_DEQUEUED) { + buffer->attr &=3D ~BUF_ATTR_DEQUEUED; + list_move(&buffer->list, &buffers->list); + found =3D true; + break; + } + } + if (!found) { + buffer =3D kzalloc_obj(*buffer); + if (!buffer) + return -ENOMEM; + + INIT_LIST_HEAD(&buffer->list); + buffer->type =3D BUF_ROIMB_DELTAQP; + buffer->index++; + buffer->buffer_size =3D buffers->size; + buffer->dma_attrs =3D DMA_ATTR_WRITE_COMBINE; + + buffer->kvaddr =3D 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); + } + + first_buffer =3D list_first_entry(&buffers->list, struct iris_buffer, lis= t); + ret =3D iris_fill_roi_data(inst, first_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..df9d018493f3ec37fd5e6b0ba04= 9dba0b5ae76e9 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, }; =20 @@ -139,5 +141,7 @@ int iris_queue_buffer(struct iris_inst *inst, struct ir= is_buffer *buf); int iris_queue_deferred_buffers(struct iris_inst *inst, enum iris_buffer_t= ype 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); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index c08926609a3b7f5bb63df369da519accdd490121..070335dba173231c191d0e5842d= 6e226a057aeaf 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 dom= ain, 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; } @@ -1349,7 +1352,27 @@ static int iris_hfi_gen2_session_queue_buffer(struct= iris_inst *inst, struct iri HFI_PAYLOAD_STRUCTURE, &hfi_buffer, sizeof(hfi_buffer)); + + /* check if any metadata buffer is available not queued, queueit */ + if (port =3D=3D HFI_PORT_RAW) { + buffer =3D iris_queue_metadata_buffers(inst, BUF_ROIMB_DELTAQP, buffer->= index); + if (buffer) { + iris_hfi_gen2_get_buffer(inst->domain, buffer, &hfi_meta_buffer); + port =3D 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 |=3D BUF_ATTR_QUEUED; + buffer->attr &=3D ~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/dr= ivers/media/platform/qcom/iris/iris_hfi_gen2_response.c index 84b629b957442c024dccc18b354ac9a7e541abaa..f63e0a7723e8583da818c2b004e= 367c1dd3d94f7 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_i= nst *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/p= latform/qcom/iris/iris_vidc.c index fcbc60016beec693f2ce27927a09a2d51494bc38..fae3d113a9dc990f06167ee0b7f= b8fab24a0552c 100644 --- a/drivers/media/platform/qcom/iris/iris_vidc.c +++ b/drivers/media/platform/qcom/iris/iris_vidc.c @@ -180,6 +180,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); =20 @@ -299,6 +300,7 @@ int iris_close(struct file *filp) iris_destroy_all_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLAN= E); iris_check_num_queued_internal_buffers(inst, V4L2_BUF_TYPE_VIDEO_OUTPUT_M= PLANE); 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); mutex_destroy(&inst->ctx_q_lock); --=20 2.34.1