From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF6B52D8DA6 for ; Wed, 1 Oct 2025 19:00:20 +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=1759345222; cv=none; b=TCbTdSAxS7ak8sfvuq0vppVqRhJi3gqGIebZw5HmjnaTMdJSsm6iecYfac54pi34cvZXM4AQnCVa0nGInb5I0pAe/LwGiaO+ROkzS37j3/DkFrYtrNFy6ppQNfi+MrRecek9I7ZzndMhs143KCSdXJaxlhx3AoCr6JVUY6n/IFY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759345222; c=relaxed/simple; bh=xajVi5vqoMHc3VXshBVlzP89xG7cEyxxNOEl071BXq8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EQwMtZcP3i8j8WoX0pqs6V5l3IxNgGSuQBOVJcXUuUwsIIvAdJY+HaubN2Hr0V8tXVuY2sjnZJofsMf8+qKIkEVyJqFVUlNAFkxq7ICiaPUut++MX1SBHh19MDQkGKTJ/uaAj1Y6r+6xqEiG9tlHsYhy6tL4v1tipicbJS53SGg= 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=XMt/QjtS; 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="XMt/QjtS" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 591IbxFV008317 for ; Wed, 1 Oct 2025 19:00:19 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= JOfmN+HRrnAEIwEBsGixSCQhow/LIwqmVCM2LlbTh88=; b=XMt/QjtSmPKLAErK 6vT8mfXIThCyBzKDOXF5VZQGYXlkAR3qUMTsJIahlnjnVldAysDZO+TrdHCUwFc4 uGuAg8IykV1xT13OTZNzTFkB9627kqaIRLpNqO7sPyZrMsE6T3Fj6lenW9fWTL72 DxLDTf3eJpxX+MwGptZYRkjlDDSIGZFDtKeUiJnygl0auHJxAjsCPiL2366p6+ee PX8GlqLDbm//3tSj6t5vvTC3ADzOaPR2VFLmUIKVp+0sFYMHoK95fDYU9udWviQu qL4SOmRAQ71xzNUyn2THOEEaA5lLiifcECqvEu1+TA5I8afs7MDeVulc7d8JQgeh R9fIbQ== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 49fppr928s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 01 Oct 2025 19:00:19 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-33085281806so55716a91.1 for ; Wed, 01 Oct 2025 12:00:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759345214; x=1759950014; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JOfmN+HRrnAEIwEBsGixSCQhow/LIwqmVCM2LlbTh88=; b=P68xc5zK2ffrhWa0xa86MyfZCuQYnmpRZoyUoVx8LB6mUB/dn5sJVkKRz6rMWdCUA1 AlXiaSmVEj1SZg9YkN92SkPCfcTCWSWUW2Xz4c8KBEwbmaGU/9F0ns9MdYgFGhbGLB8G lpdvViN0oYUSwWxzaD93s/QOXFWMQOpMjPESMLoxhVPe6tjYzEA4dkVfiQWc31uaEtYO +GEvz6Gi+Q2ISM+a+khfOn4m7ra6t3/o3gmPYRc3Y2FQmks7S6iXAqvyMv5cBA+2YsSX sbs8HVpiQNppEPUz5qmEZYaLOHguOt0EFARZqh2vgb9EE/s1BosyAPAdS/uvkHLS6UBu w8/Q== X-Forwarded-Encrypted: i=1; AJvYcCXOCUx0G0ZcFy0mZ09SRTRRZNKX8NnYITlLKf1ET810016kFwMDdS5hM0aUV63E9DyIeNt7J/nJP8CCRgRM@vger.kernel.org X-Gm-Message-State: AOJu0Ywk/OEKY9Aq6r/0TSLDYUj5niHytT4fXM2tKRy/HNpFY3/g6H65 P9OqthAvym50ssAClxBP+lfM5ghg2thobJgppMyopFElI5UhP2mBtJyTPqjYfCJVGeh54jspziM AS5EMZG71Pq2Fo9J/qA+8dgyxAPqWpZlnmAZywQFWlB3w/uqkTnod0CLcoAFvpAsBezFr X-Gm-Gg: ASbGncvjZdcNHEthxcF1mobSGzNYXMimCmTxSXA64whnaIZNRUX9wpr84Rdbo+4Dwik d911jNsG9Ma59eZ536sf8/XV+Pq4kyC7iKhINCEww65PeE2jbwWVEqhaZGIPjjGBxAYFuO3q+Pq YlgULqOJdijjxLG3ncGCUZZ2Mrlw229xgQsKKBpcfM40qixOjKhVKlh0OkYDekF60YXVlB04FSq ayA03QEXnC27KCsDYt3uYXSmf+rSizhTwVbvpbmIPATVrWe5ueBqMJYQmATazkXsGL4q5oMvOoI sX9Clv8pyvOMY0DQIl8+esTedRqni6VhUJZgCGSzXrbIshx94nqjRlRExfeXpY+UTAm9sbBAQkN F/5IeMLfYFBJ5H82YnB4iaQmWBT1+Fg== X-Received: by 2002:a17:90b:38c4:b0:32e:e18a:368d with SMTP id 98e67ed59e1d1-339a7038c89mr2762324a91.8.1759345213741; Wed, 01 Oct 2025 12:00:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IExL4QG2vboQTe7pTbfYmJEMC2kEI9Ly4Rm5PcCd3TAaCXS/biDDpjbvPAsLrdDhnvzYEPOLA== X-Received: by 2002:a17:90b:38c4:b0:32e:e18a:368d with SMTP id 98e67ed59e1d1-339a7038c89mr2762306a91.8.1759345213095; Wed, 01 Oct 2025 12:00: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 98e67ed59e1d1-339a701cbffsm2950074a91.21.2025.10.01.12.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Oct 2025 12:00:12 -0700 (PDT) From: Deepa Guthyappa Madivalara Date: Wed, 01 Oct 2025 12:00:06 -0700 Subject: [PATCH 3/5] media: iris: Add support for AV1 format in iris decoder Precedence: bulk X-Mailing-List: linux-arm-msm@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: <20251001-av1_irisdecoder-v1-3-9fb08f3b96a0@oss.qualcomm.com> References: <20251001-av1_irisdecoder-v1-0-9fb08f3b96a0@oss.qualcomm.com> In-Reply-To: <20251001-av1_irisdecoder-v1-0-9fb08f3b96a0@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1759345209; l=7441; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=xajVi5vqoMHc3VXshBVlzP89xG7cEyxxNOEl071BXq8=; b=GJt/KtXOt5OnOiM8GQF0ByDOHLsG+t14tKdCpOD6oQy+Lazt+K5Roo+vG+42duJcvOscrbXtt DRE5HhKyxrlDwBLQQ3ZukyhYUuGafYfu0vcUhRU1dgPDKzMYPb+rVd3 X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTI5MDA4MiBTYWx0ZWRfX1ejJ3RBHDkVy CNx1416ZP6F2oZGVKhwQDcm7c92Qxz8NYu+mvEYl251F3To8oCDiRLKv8c8i0kZ8kcP0ePH2cM+ TrhVfS1m2kL9I2NZK499sEf88DOS4KaViF2DbF7/Za04CqOOAoxMMj189e8vzPI6XLVZQxC7JHM ovKhM8PSW2L3emc/Z+ue+BUkrxScdQnAlsjE6oXjRiuDQSMfo3d7aMl+UarEe3R6SyLE13fYvlk ij2tIFK5ptriH7FSB7X4Lj6P5fi5xbUw0VoFeG+azNzFywFmOeW/65m7Ifqf4OUjrP2UBpCWnmA JP1QnEsUrpyDiy3S5DH/hVd4phBPYh7znoCs8zGVsdc32QMYPckUlw3Pd7ggF28xxcZW5R4A5JG WoCIIizI7LBB0bkWOEelkHanrJ9q/g== X-Proofpoint-ORIG-GUID: O2QXbXL8UmfQDvwxDZe4xXxVtsBI__-i X-Authority-Analysis: v=2.4 cv=GLoF0+NK c=1 sm=1 tr=0 ts=68dd7a43 cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=x6icFKpwvdMA:10 a=EUspDBNiAAAA:8 a=Z_4drlmlzYXD-T4lrkMA:9 a=QEXdDO2ut3YA:10 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-GUID: O2QXbXL8UmfQDvwxDZe4xXxVtsBI__-i X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1117,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-01_05,2025-09-29_04,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 suspectscore=0 impostorscore=0 spamscore=0 bulkscore=0 clxscore=1015 phishscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2509150000 definitions=main-2509290082 Extend iris decoder driver to support format V4L2_PIX_FMT_AV1. This change updates the format enumeration (VIDIOC_ENUM_FMT) and allows setting AV1 format via VIDIOC_S_FMT for gen2 and beyond. Gen1 iris hardware decoder does not support AV1 format. Signed-off-by: Deepa Guthyappa Madivalara --- .../platform/qcom/iris/iris_hfi_gen2_defines.h | 1 + drivers/media/platform/qcom/iris/iris_instance.h | 1 + .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen2.c | 23 ++++++++++++++++++++ .../platform/qcom/iris/iris_platform_sm8250.c | 17 +++++++++++++++ drivers/media/platform/qcom/iris/iris_vdec.c | 25 ++++++---------------- 6 files changed, 50 insertions(+), 19 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index aa1f795f5626c1f76a32dd650302633877ce67be..bbfe7a0851ea94fb7041a868b4df8b2ec63bf427 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h @@ -138,6 +138,7 @@ enum hfi_codec_type { HFI_CODEC_DECODE_HEVC = 3, HFI_CODEC_ENCODE_HEVC = 4, HFI_CODEC_DECODE_VP9 = 5, + HFI_CODEC_DECODE_AV1 = 7, }; enum hfi_picture_type { diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h index 5982d7adefeab80905478b32cddba7bd4651a691..f1883ffc138fd975fb76d4e45904ee04e196cd20 100644 --- a/drivers/media/platform/qcom/iris/iris_instance.h +++ b/drivers/media/platform/qcom/iris/iris_instance.h @@ -19,6 +19,7 @@ enum iris_fmt_type { IRIS_FMT_H264, IRIS_FMT_HEVC, IRIS_FMT_VP9, + IRIS_FMT_AV1, }; struct iris_fmt { diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h index 58d05e0a112eed25faea027a34c719c89d6c3897..9aca70b4c0690f0d8d799e2a9976bd20d6bb8c94 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -214,6 +214,8 @@ struct iris_platform_data { u64 dma_mask; const char *fwname; u32 pas_id; + struct iris_fmt *inst_iris_fmts; + u32 inst_iris_fmts_size; struct platform_inst_caps *inst_caps; struct platform_inst_fw_cap *inst_fw_caps_dec; u32 inst_fw_caps_dec_size; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/media/platform/qcom/iris/iris_platform_gen2.c index 36d69cc73986b74534a2912524c8553970fd862e..12dfbb79da4838069fd0c2b00c539f4a17e300ba 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -19,6 +19,25 @@ #define VIDEO_ARCH_LX 1 #define BITRATE_MAX 245000000 +static struct iris_fmt platform_fmts_sm8550_dec[] = { + [IRIS_FMT_H264] = { + .pixfmt = V4L2_PIX_FMT_H264, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_HEVC] = { + .pixfmt = V4L2_PIX_FMT_HEVC, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_VP9] = { + .pixfmt = V4L2_PIX_FMT_VP9, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_AV1] = { + .pixfmt = V4L2_PIX_FMT_AV1, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + } +}; + static struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] = { { .cap_id = PROFILE_H264, @@ -760,6 +779,8 @@ struct iris_platform_data sm8550_data = { .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu30_p4.mbn", .pas_id = IRIS_PAS_ID, + .inst_iris_fmts = platform_fmts_sm8550_dec, + .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550, .inst_fw_caps_dec = inst_fw_cap_sm8550_dec, .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec), @@ -852,6 +873,8 @@ struct iris_platform_data sm8650_data = { .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu/vpu33_p4.mbn", .pas_id = IRIS_PAS_ID, + .inst_iris_fmts = platform_fmts_sm8550_dec, + .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps = &platform_inst_cap_sm8550, .inst_fw_caps_dec = inst_fw_cap_sm8550_dec, .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8550_dec), diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c index 16486284f8acccf6a95a27f6003e885226e28f4d..8fc27069a06d1480eccdbb0d41ed0f03f1328ec6 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c @@ -17,6 +17,21 @@ #define BITRATE_PEAK_DEFAULT (BITRATE_DEFAULT * 2) #define BITRATE_STEP 100 +static struct iris_fmt platform_fmts_sm8250_dec[] = { + [IRIS_FMT_H264] = { + .pixfmt = V4L2_PIX_FMT_H264, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_HEVC] = { + .pixfmt = V4L2_PIX_FMT_HEVC, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_VP9] = { + .pixfmt = V4L2_PIX_FMT_VP9, + .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + } +}; + static struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] = { { .cap_id = PIPE, @@ -337,6 +352,8 @@ struct iris_platform_data sm8250_data = { .dma_mask = 0xe0000000 - 1, .fwname = "qcom/vpu-1.0/venus.mbn", .pas_id = IRIS_PAS_ID, + .inst_iris_fmts = platform_fmts_sm8250_dec, + .inst_iris_fmts_size = ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps = &platform_inst_cap_sm8250, .inst_fw_caps_dec = inst_fw_cap_sm8250_dec, .inst_fw_caps_dec_size = ARRAY_SIZE(inst_fw_cap_sm8250_dec), diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/platform/qcom/iris/iris_vdec.c index ae13c3e1b426bfd81a7b46dc6c3ff5eb5c4860cb..be8d2d48c82f385e4f46807f7e0dd52e469927cd 100644 --- a/drivers/media/platform/qcom/iris/iris_vdec.c +++ b/drivers/media/platform/qcom/iris/iris_vdec.c @@ -67,26 +67,12 @@ void iris_vdec_inst_deinit(struct iris_inst *inst) kfree(inst->fmt_src); } -static const struct iris_fmt iris_vdec_formats[] = { - [IRIS_FMT_H264] = { - .pixfmt = V4L2_PIX_FMT_H264, - .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_HEVC] = { - .pixfmt = V4L2_PIX_FMT_HEVC, - .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_VP9] = { - .pixfmt = V4L2_PIX_FMT_VP9, - .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, -}; - static const struct iris_fmt * find_format(struct iris_inst *inst, u32 pixfmt, u32 type) { - unsigned int size = ARRAY_SIZE(iris_vdec_formats); - const struct iris_fmt *fmt = iris_vdec_formats; + unsigned int size = inst->core->iris_platform_data->inst_iris_fmts_size; + const struct iris_fmt *fmt = + inst->core->iris_platform_data->inst_iris_fmts; unsigned int i; for (i = 0; i < size; i++) { @@ -103,8 +89,9 @@ find_format(struct iris_inst *inst, u32 pixfmt, u32 type) static const struct iris_fmt * find_format_by_index(struct iris_inst *inst, u32 index, u32 type) { - const struct iris_fmt *fmt = iris_vdec_formats; - unsigned int size = ARRAY_SIZE(iris_vdec_formats); + unsigned int size = inst->core->iris_platform_data->inst_iris_fmts_size; + const struct iris_fmt *fmt = + inst->core->iris_platform_data->inst_iris_fmts; if (index >= size || fmt[index].type != type) return NULL; -- 2.34.1