From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2BEAC397694 for ; Wed, 24 Jun 2026 08:51:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782291118; cv=none; b=ejOCs6gCPkR9an/UrOXpGz0Whzwr/Hjlmu1e7WZdU9Mi1T1fLQerLXrA3N6HbMP5AIekDEbcAc3173IJqK58CXeubaQnbLzbObhRPBKiEqsGx+3sidLdMx/q/15CTg1MCzJ2TUPNefG4MVIUbOCIYQOmeBe8b9iwCWE1ivqAjrI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782291118; c=relaxed/simple; bh=T20Hc/5VIww09a3QDg5vOTm8F29YjwiaOI4aLL9iMyk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GRGbcxhUA3WHko03avUHdYagJE7NmS0IwOvy4HxBAGxhx2aSgLxYQC6KvvASAUOxzOu1Zn1tBGvugecrtdp1yqBw2GNgsQY5thK1XznIyeUx5ghe5qny3qDDLgmx3u/Kj18FHeV59pZfv6HZnPu3PocZCpZEijek5uS+JnH0hL4= 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=HQ+iWxxE; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=TCMyS09p; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="HQ+iWxxE"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TCMyS09p" Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65O5tvdE1892223 for ; Wed, 24 Jun 2026 08:51:56 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= 00UbssjuVOsBPXnO6ymPAgptrJrUzp+IBusclHnO1RI=; b=HQ+iWxxE7CMJgKxD WrKFAL5RvOgJnGwquOBTTPxOvNwy4OYJ5N1a06S6qs4Xr9RqOTVqWmuTyafoUNDE vr14iq9ptFMPcmLQ7j+mwja6xXxee6MfwrubueHgS4SNYtOBwCj9UK58S+Y66YAA 21OwhLKK6/+yfwPkxpdzbmaeazrA95cgwn6BRfEepfeDKPtJufI5EPKQgPrr/qOo /MNHU4ie+2W6vnGTTUIYMCvUS5OC05CgLd1zZ3cW/7yYk19hC0tl48LJzzJwqOki kleigu9P4NKwSCVQpIxfnARkdHO4S3lDsUaxIg87DCwi8IQl9CTOjipMjTYMIznL 2HPuOw== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f05bf9bxy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 24 Jun 2026 08:51:55 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c88aab7c1fcso540778a12.3 for ; Wed, 24 Jun 2026 01:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1782291115; x=1782895915; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=00UbssjuVOsBPXnO6ymPAgptrJrUzp+IBusclHnO1RI=; b=TCMyS09p956QiC0DDbTFm+PraVbGTjeQ6qYN/l1HXwL5rVVbt3yAF4/ckGcSDaI175 oFgBMjFHWsu/69lUVJr5OKRmP24dR8YEgVC2XFazFDUd2ymfYaxI7DKD/JoReXW10Roq 4czG2o7nEaAeiu9p3yveJthE9SXLPwrbY8hwvwyXFMgK8mX99cz3FIKKVRNbnBEI23en gI/UDajR5Ct70SqnWaQ5yC7kDo+MqCsPJlnTS7aq7rRDR1I/oBw2syhNQNan6IvFU8ht xdKhPl4FqryuI38M9xiYM0GGt8A/yHEeJGGbJilrErM/co8HymtFtzBVTsQcYEMMj4FB t7Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782291115; x=1782895915; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=00UbssjuVOsBPXnO6ymPAgptrJrUzp+IBusclHnO1RI=; b=XT5iwWTK4lI8qAB4N6+ncgkPWYOluHmfSVEYXBPpOoMRrwoTw0dA9n6prZvD3+t4bE WWPD5xYCVQrbaaF47562+/Xl66jJqswgZtn20y5AI0ETrWsePCX1Wmv2EuRiZo8fxOfC 86rUqoQADOQ7EpdqZZ7Mi/NlDVgaj2MwkEmHy0J3cexcu8c1rOFnKw09w8Pprz0jk1jV aliayiop2WZ9YG0W10xvj5GpUZ5I6n8IQSlMjkDfFU4dBTUY8rYJiSY6IwADOc2aI9kI sJI2EL1ZviORRFlLVTF5uPAhkJCn3qRwDb5yYz3u18Px5tiCN80D+AjnJVbNv8WKmBFd K97Q== X-Forwarded-Encrypted: i=1; AFNElJ+WpHgBvwMtbILpbVz+qP8imtGPaSc1p5hOoFEdKBHLBjmO4++xBMaXZfMoaRXgkp6u2sgWhw2C1bd0gg==@vger.kernel.org X-Gm-Message-State: AOJu0YxQHvv+EzmDeOt7hMMjlwctdC5QAPD6G7YhhBTinqR239HlTBCw cah8ndh38PnnbKA0HabKH5aBpv70/a1uU1kcBaQDPxBE3Wnb/qPS0p9gMjXyst5AWOvWwuwCWnV oICLYdIwJLcjpx967UA1KbGlR8Dx/zy8QC3qd7P8UHs4Od83F7gtYiiUyjPM1h0U+Xg== X-Gm-Gg: AfdE7claof/WC+nxR7K/L5ArRQzC9ktHWyyXCCmR8hScu29O7Y7fIm3NWKlqzHK/nQT 38PVrqPTRXm4JQc/OVcOzPn8LG2kdMIu54blME4eAUOP++QdAF7VVn2SpBgw2M56y2wN48yHDA+ ONViS1hIRDdhdTZzrp9K9CW/bxCW6GtnHk5GjUGOr9UI6dLjBWTEiKd9/pP29UUg+slW5MGEKfe 6qKvj8z88dR4lAd/dMqgwGjn21Zt0XOPUju7yx8YJwRBu+pcpg1M+we04LDdeL/g0J5l5tZbYi3 s+E+KJvespViAIKQdkdv4v50jT3KaRJ3H9ZsXovH2Wrpmnknt+ghZ7pueU3mtKIQd+kTIGi1+/X dR6YYGFkz3g3CXy0/iX+algWm/JzJFDAhBvsuE8vCkikMsu9+YiBvUkr0MKZhQvRyCSmp8CPVrJ dISCCkEtftqw== X-Received: by 2002:a05:6a20:9f96:b0:3b3:10e1:a870 with SMTP id adf61e73a8af0-3bd151fd3f5mr8323288637.32.1782291114987; Wed, 24 Jun 2026 01:51:54 -0700 (PDT) X-Received: by 2002:a05:6a20:9f96:b0:3b3:10e1:a870 with SMTP id adf61e73a8af0-3bd151fd3f5mr8323262637.32.1782291114551; Wed, 24 Jun 2026 01:51:54 -0700 (PDT) Received: from WANGAOW-LAB01.ap.qualcomm.com (tpe-colo-wan-fw-bordernet.qualcomm.com. [103.229.16.4]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c8bc563c406sm11926464a12.19.2026.06.24.01.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2026 01:51:53 -0700 (PDT) From: Wangao Wang Date: Wed, 24 Jun 2026 16:51:44 +0800 Subject: [PATCH v3 1/2] media: qcom: iris: improve gop size support for gen1 encoder Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260624-dynamic_encode-v3-1-f2a2db0ac2af@oss.qualcomm.com> References: <20260624-dynamic_encode-v3-0-f2a2db0ac2af@oss.qualcomm.com> In-Reply-To: <20260624-dynamic_encode-v3-0-f2a2db0ac2af@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: quic_qiweil@quicinc.com, Renjiang Han , linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Wangao Wang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1782291107; l=3333; i=wangao.wang@oss.qualcomm.com; s=20251021; h=from:subject:message-id; bh=T20Hc/5VIww09a3QDg5vOTm8F29YjwiaOI4aLL9iMyk=; b=vKMyrWAfFzt/0DREubdOPRHels2Hv+N5DUfck7CbGyIU/tsXH7osPkUfBdssaPnNIvbt3M+C9 Gnov/9QGuzWD9ay8PrMy9uW0AfJ33MdCf/0JigNeOMXxWLv37yrPih5 X-Developer-Key: i=wangao.wang@oss.qualcomm.com; a=ed25519; pk=bUPgYblBUAsoPyGfssbNR7ZXUSGF8v1VF4FJzSO6/aA= X-Authority-Analysis: v=2.4 cv=X8Bi7mTe c=1 sm=1 tr=0 ts=6a3b9aab cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=nuhDOHQX5FNHPW3J6Bj6AA==:17 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=pGpWkYCgaWylbXxf8R4A:9 a=QEXdDO2ut3YA:10 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-GUID: UcKlmLLixn7Sj6MmI96LgHnZzm9_hBUK X-Proofpoint-ORIG-GUID: UcKlmLLixn7Sj6MmI96LgHnZzm9_hBUK X-Proofpoint-Spam-Info: AW1haW4tMjYwNjI0MDA3MiBTYWx0ZWRfX3CuXq6dI4mCr 8x2BkNlhRopp2BqIO+9g7WajaI/sfqWSJ5neyTifGYZtkN3cawa4WTJMBdsgmq2eEX0UNKYPlJ2 qTPor+5iefy41lvrFSYKlUUhM+aKGjQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjI0MDA3MiBTYWx0ZWRfX8oZLmZ1oRXTQ F/uEw9UHJKtsuxwI6XWvVRcovJn+2TPHJ/wpMMknstUTUHj3v0czvmpRqtpqc1SjV1k4EiwwNP7 HHKOObpsGmC7h9CZ4fc0kbK5/hl5lt2Y4RvGaJc5g6EKqSe4HB4eb9lNv19oxsbsRAc7r30TAcy x8GrpB7DNT8t0GcD2PUlwl0G5dS8B21LnKYVp6VlBtJcvP2oE1Hczz0blgqX9GWqFf58svesTKI fa42ajgjxbBeqBzHGWEue93Wygy0utC7WlAScG3XVZTvhZp8bKCDHn6fxYFFUfUvqOCCJ0s4i+b jGEUaOZagtH+/WbUIER8wRP9IE0ST7SK0DN2No9Wb8Cr7AC3ybmuRQzA6udD6wTWxocbH+Yfjvw Lz3t8zPkJEnT5LoA7tU8VMwU72Dpuw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-24_02,2026-06-23_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 phishscore=0 malwarescore=0 adultscore=0 spamscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2606240072 The GOP_SIZE cap was missing an hfi_id, so it would not interact with the firmware but could still save the parameter passed by the client. INTRA_PERIOD was acting as GOP_SIZE here. The code was redundant, so the two caps have been merged. Signed-off-by: Wangao Wang --- drivers/media/platform/qcom/iris/iris_ctrls.c | 2 +- drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 16 ++++------------ drivers/media/platform/qcom/iris/iris_platform_common.h | 1 - 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_ctrls.c b/drivers/media/platform/qcom/iris/iris_ctrls.c index 10e33b8a73f60759c4f1cb17b5c95897f0e1468f..391e1fc5f6e2ec8e9cf5ba4e0f76b2d1da3e2a35 100644 --- a/drivers/media/platform/qcom/iris/iris_ctrls.c +++ b/drivers/media/platform/qcom/iris/iris_ctrls.c @@ -1293,7 +1293,7 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) { const struct iris_hfi_session_ops *hfi_ops = inst->hfi_session_ops; - u32 gop_size = inst->fw_caps[GOP_SIZE].value; + u32 gop_size = inst->fw_caps[cap_id].value; u32 b_frame = inst->fw_caps[B_FRAME].value; u32 hfi_id = inst->fw_caps[cap_id].hfi_id; struct hfi_intra_period intra_period; diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c index ca1545d28b5310d8c45a905287dcb69f6184d9cc..eff9216bb50143c0d752051a6400605bbaf3803e 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.c @@ -171,7 +171,9 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .max = (1 << 16) - 1, .step_or_mask = 1, .value = 30, - .set = iris_set_u32 + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_intra_period, }, { .cap_id = ENTROPY_MODE, @@ -240,7 +242,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .step_or_mask = 1, .value = 0, .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, - .flags = CAP_FLAG_OUTPUT_PORT, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_ir_period_gen1, }, { @@ -281,16 +283,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .value = 0, .flags = CAP_FLAG_OUTPUT_PORT, }, - { - .cap_id = INTRA_PERIOD, - .min = 0, - .max = 1, - .step_or_mask = 1, - .value = 0, - .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, - .flags = CAP_FLAG_OUTPUT_PORT, - .set = iris_set_intra_period, - }, { .cap_id = LAYER_ENABLE, .min = 0, diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index c9256f2323dc4521f9eacaeffb0fc08a180de3ff..ff48333ad089894c3393e8ad45903c2603288eb9 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -165,7 +165,6 @@ enum platform_inst_fw_cap_type { USE_LTR, MARK_LTR, B_FRAME, - INTRA_PERIOD, LAYER_ENABLE, LAYER_TYPE_H264, LAYER_TYPE_HEVC, -- 2.43.0