From nobody Fri Oct 3 10:11:16 2025 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 8906F2820B9 for ; Tue, 2 Sep 2025 23:00:29 +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=1756854031; cv=none; b=fPsL1IdbB/Pl6oI0bgvWMKW70Hl6YeBG+BIdcE8Fsx9gYBU/AM8VaITy5xViSA1YxVdzEcp0JG48m08s2KlXc92lG6rBOww/HAI568Wj/ZwIcfzMyovd5Rj/3wroEtCTG3ulYO+RaxpH5Cf/jo9BNi4lsRg9uwS7o44VE1vvVEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756854031; c=relaxed/simple; bh=Kx47orXPGexZaP8p+2+3rbgEdZzv/9NvxjGLCgl4yW8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=evZ8kH3YT0ASNU0aGYIfrMoxdM2cuNOJn1zvcJQ6cQNoLyJoNBQ9JhNnOD8F/IWS+zTgK4v++LU6dL6jdlwa8gUwni4g4vcmNkq2hYQO+YPsV6NRmggXujUHSNPPP76y00ykPubqJ8pTRQZyq7PkbvV+0LfxU2jg9ulVDIESbDw= 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=NLrnxbaS; 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="NLrnxbaS" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 582ErB2U020058 for ; Tue, 2 Sep 2025 23:00:29 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= aTBObM6XSVmy6H4vnDn98VU9Fu2k2HG5VWLw5+GWZjg=; b=NLrnxbaSLsB7uvYF khAVaqZ60HpiBvFT8taSV44+GepvqzJRdUJY36njKUWw3alKBCAoadfXYG7go+8B UC8wGD16DCTSG80uypCTQ3h82X1orvipKVxyhACHrl/jYUfuOIaJpS7arVKTDD+L glbedC0YEivgDXbCGrTgYwqIthN6TV8CQuTPBop58Xv7J2kkDvWhkOJ6t1nKei9j kyRmFwOi2+kpaDsBQxUkVPz/oJXI+55fHy71S1lRfw0MUpNbjsLFil5UR4Qtg/kU 95auBJk3uFPLRC95rLcgu+QkDEkCsHVR4MraTG4Qkoxp3sj3haISIueLajKK0Rb5 nNDl/g== 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 48wqvwb6us-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 02 Sep 2025 23:00:28 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-24457f484d6so18373815ad.0 for ; Tue, 02 Sep 2025 16:00:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756854028; x=1757458828; 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=aTBObM6XSVmy6H4vnDn98VU9Fu2k2HG5VWLw5+GWZjg=; b=jCnAEYHDTNMgwCPs3BBT6JebJmcs9wfpSG6V0dafA83Ba+6C5pNSpUYAMVgkrhpbNC oB8AfPsVhOdczY5DXYrNi2VeeaHcfUJhPN4NnUwMqYytUF7eCopMKZ6Rj6PF2UcK5OXq VLmMAHpvllmwAx5UMKnSX41yGrPUYYnSTB9ttO6BnpXpGdxL4510IJWd8z+UDrWmm/Ym yPBBPTs5QG5JLefWwVKcNZQjrIJp5kIINFdHxyycNszu8FG7UCBTW/SutjowRkiCVSdC uVep71tM6/g5qx2oyHZJTVwEO4Hq39/xNC6hp0vcRLbPZmytvGglsUebIeWhAa266pju tjXg== X-Forwarded-Encrypted: i=1; AJvYcCVotztVpSZF5UwssrXB3JviKZUgg8M4YV2rIB6sGvgh25cHIabBoytKBvNIm4T1k2xCjjpb9s3HdktY8bI=@vger.kernel.org X-Gm-Message-State: AOJu0YzWSX9YIUyWlxqVMaz1ugA5xyW+M/JB7nakYokGRN2cz8POkNiy kzbfQNug8VJnYxB9nCjjsAxFR0Ipu1VGX+OssVNwYThVj8qZyaL9a/m7fj2RbDJs6Sf+vI2ZBgZ uklzQ10eBPuX+12MqGXEs36HSXkrkb8ZnfPelWz1yG9ne2T7wPdwpYDpLKo8ukeAPiCk= X-Gm-Gg: ASbGnctpDXCliTxtbucbsWaKWHeYTsbH4IKBFqIEYBm5K80Qme1Fo1X8p929rQ3GaCW q9RIoBUtI5hYXqzLFUTRXfnmHMLqzfn+CVRF+mLTWLx8hYIUdHB5JJ7ZetJk5m9ouIL69bzrj91 zAIdof2JUzaJLsw4voZ4MPO+ehYzob3OIuhSecflkP/6kFJpzL9j5mz2eyiDgwMr7IajXxuGh3M iCyYJoK0qd4MU6WJP0XwRSJVLcXTPSDqqhXMdEjcvaC1FKGhUTd0iu+wBEK2cVEdac+jmxCVkZM 4mTMROG2lXfyVETieO9fLSL4KEw5NjIZJ8IacmS1Yto1ypdo6fNb3/aNXEX2O1mso2K1Wg+H2iI p4IPJkGFEF41dMITFLHbSY9RD X-Received: by 2002:a17:903:22d1:b0:248:8a31:bf6f with SMTP id d9443c01a7336-2491eadb922mr122349185ad.4.1756854027515; Tue, 02 Sep 2025 16:00:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFw+5VoJ6duWQ4Rm1aeAzQqI8Z8vHGO1kkHZv3FFiDX16bPxYBB2O3w/2sM8GerwA5o+u8cDA== X-Received: by 2002:a17:903:22d1:b0:248:8a31:bf6f with SMTP id d9443c01a7336-2491eadb922mr122348415ad.4.1756854026147; Tue, 02 Sep 2025 16:00:26 -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-32a698ad4c1sm1875866a91.5.2025.09.02.16.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Sep 2025 16:00:25 -0700 (PDT) From: DEEPA GUTHYAPPA MADIVALARA Date: Tue, 02 Sep 2025 16:00:05 -0700 Subject: [PATCH RFC 3/5] media: iris: Add support for AV1 format in iris decoder 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: <20250902-rfc_split-v1-3-47307a70c061@oss.qualcomm.com> References: <20250902-rfc_split-v1-0-47307a70c061@oss.qualcomm.com> In-Reply-To: <20250902-rfc_split-v1-0-47307a70c061@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=1756854022; l=7441; i=deepa.madivalara@oss.qualcomm.com; s=20250814; h=from:subject:message-id; bh=Kx47orXPGexZaP8p+2+3rbgEdZzv/9NvxjGLCgl4yW8=; b=h/+rtfZUH/8/HR6GweeAAXpPh4PtkD34iLLBM1hgfPt/HS3x74Oldmba/GvyZcEI8MUpB8DHb pnaxJ2AxqCPAA50fgDxCTjwFubGpbAup10T5fs6VrwajW8noJHQylzs X-Developer-Key: i=deepa.madivalara@oss.qualcomm.com; a=ed25519; pk=MOEXgyokievn+bgpHdS6Ixh/KQYyS90z2mqIbQ822FQ= X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwOTAyMDAyNCBTYWx0ZWRfXywpwaRHxIyMR SJeFgLhIcym8z1FYNOqJBRCC7mQIl7V03s+8OWnuggpyBrOa+lmVXYv7sxsqRGTqu6WNaalghwe /wdrDZDzkLFiQ+BIvi1OHsMyRpYz3N2BfnFpRfrqgLGsIykAuBtDhUWq6ksIUCi9duBieBM71ir 43SKPW2W+hiRH3wBR75EnfQ1y/9A1tkxHsVWQ2ZtPQWd48vuNvvG/4r2Bxy0HZ6k5ZEta3j8N5A 96XGOT/sNYrP0iCq5hcSv4CvNnZiUXmWhF+03SGwSWjy6JiWMqJwX1/bbd/TYB6tbbIZz59eh/i dWgYUIEw4MgBxZpoxBGcGl1AqOpbLV/mCB3rvf3WlbLluNJM5G9OlHTlyfKzVd+TBZf0mO+dQ8K PWGVMDdA X-Authority-Analysis: v=2.4 cv=WKh/XmsR c=1 sm=1 tr=0 ts=68b7770c cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=EUspDBNiAAAA:8 a=Z_4drlmlzYXD-T4lrkMA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: p5CZq0E-9t94c2tomhhTcbhPPUah4TpV X-Proofpoint-ORIG-GUID: p5CZq0E-9t94c2tomhhTcbhPPUah4TpV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-09-02_08,2025-08-28_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1011 suspectscore=0 bulkscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0 impostorscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2509020024 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/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_defines.h index aa1f795f5626c1f76a32dd650302633877ce67be..bbfe7a0851ea94fb7041a868b4d= f8b2ec63bf427 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 =3D 3, HFI_CODEC_ENCODE_HEVC =3D 4, HFI_CODEC_DECODE_VP9 =3D 5, + HFI_CODEC_DECODE_AV1 =3D 7, }; =20 enum hfi_picture_type { diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/med= ia/platform/qcom/iris/iris_instance.h index 5982d7adefeab80905478b32cddba7bd4651a691..f1883ffc138fd975fb76d4e4590= 4ee04e196cd20 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, }; =20 struct iris_fmt { diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 96fa7b1bb592441e85664da408ea4ba42c9a15b5..99057a624cb976af68403ef0421= 73b5ebefde8af 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -208,6 +208,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/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index cf4b92f534b272a0a1ac2a0e7bb9316501374332..fecf2e06f19723f30777c04bc4b= 155954c2b746d 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -16,6 +16,25 @@ #define VIDEO_ARCH_LX 1 #define BITRATE_MAX 245000000 =20 +static struct iris_fmt platform_fmts_sm8550_dec[] =3D { + [IRIS_FMT_H264] =3D { + .pixfmt =3D V4L2_PIX_FMT_H264, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_HEVC] =3D { + .pixfmt =3D V4L2_PIX_FMT_HEVC, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_VP9] =3D { + .pixfmt =3D V4L2_PIX_FMT_VP9, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_AV1] =3D { + .pixfmt =3D V4L2_PIX_FMT_AV1, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + } +}; + static struct platform_inst_fw_cap inst_fw_cap_sm8550_dec[] =3D { { .cap_id =3D PROFILE_H264, @@ -756,6 +775,8 @@ struct iris_platform_data sm8550_data =3D { .dma_mask =3D 0xe0000000 - 1, .fwname =3D "qcom/vpu/vpu30_p4.mbn", .pas_id =3D IRIS_PAS_ID, + .inst_iris_fmts =3D platform_fmts_sm8550_dec, + .inst_iris_fmts_size =3D ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps =3D &platform_inst_cap_sm8550, .inst_fw_caps_dec =3D inst_fw_cap_sm8550_dec, .inst_fw_caps_dec_size =3D ARRAY_SIZE(inst_fw_cap_sm8550_dec), @@ -847,6 +868,8 @@ struct iris_platform_data sm8650_data =3D { .dma_mask =3D 0xe0000000 - 1, .fwname =3D "qcom/vpu/vpu33_p4.mbn", .pas_id =3D IRIS_PAS_ID, + .inst_iris_fmts =3D platform_fmts_sm8550_dec, + .inst_iris_fmts_size =3D ARRAY_SIZE(platform_fmts_sm8550_dec), .inst_caps =3D &platform_inst_cap_sm8550, .inst_fw_caps_dec =3D inst_fw_cap_sm8550_dec, .inst_fw_caps_dec_size =3D ARRAY_SIZE(inst_fw_cap_sm8550_dec), diff --git a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c b/driv= ers/media/platform/qcom/iris/iris_platform_sm8250.c index 978d0130d43b5f6febb65430a9bbe3932e8f24df..947dd25a483a792681e34fbbf43= 96342db582203 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_sm8250.c +++ b/drivers/media/platform/qcom/iris/iris_platform_sm8250.c @@ -16,6 +16,21 @@ #define BITRATE_PEAK_DEFAULT (BITRATE_DEFAULT * 2) #define BITRATE_STEP 100 =20 +static struct iris_fmt platform_fmts_sm8250_dec[] =3D { + [IRIS_FMT_H264] =3D { + .pixfmt =3D V4L2_PIX_FMT_H264, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_HEVC] =3D { + .pixfmt =3D V4L2_PIX_FMT_HEVC, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + }, + [IRIS_FMT_VP9] =3D { + .pixfmt =3D V4L2_PIX_FMT_VP9, + .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, + } +}; + static struct platform_inst_fw_cap inst_fw_cap_sm8250_dec[] =3D { { .cap_id =3D PIPE, @@ -335,6 +350,8 @@ struct iris_platform_data sm8250_data =3D { .dma_mask =3D 0xe0000000 - 1, .fwname =3D "qcom/vpu-1.0/venus.mbn", .pas_id =3D IRIS_PAS_ID, + .inst_iris_fmts =3D platform_fmts_sm8250_dec, + .inst_iris_fmts_size =3D ARRAY_SIZE(platform_fmts_sm8250_dec), .inst_caps =3D &platform_inst_cap_sm8250, .inst_fw_caps_dec =3D inst_fw_cap_sm8250_dec, .inst_fw_caps_dec_size =3D ARRAY_SIZE(inst_fw_cap_sm8250_dec), diff --git a/drivers/media/platform/qcom/iris/iris_vdec.c b/drivers/media/p= latform/qcom/iris/iris_vdec.c index ae13c3e1b426bfd81a7b46dc6c3ff5eb5c4860cb..be8d2d48c82f385e4f46807f7e0= dd52e469927cd 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); } =20 -static const struct iris_fmt iris_vdec_formats[] =3D { - [IRIS_FMT_H264] =3D { - .pixfmt =3D V4L2_PIX_FMT_H264, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_HEVC] =3D { - .pixfmt =3D V4L2_PIX_FMT_HEVC, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, - [IRIS_FMT_VP9] =3D { - .pixfmt =3D V4L2_PIX_FMT_VP9, - .type =3D V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - }, -}; - static const struct iris_fmt * find_format(struct iris_inst *inst, u32 pixfmt, u32 type) { - unsigned int size =3D ARRAY_SIZE(iris_vdec_formats); - const struct iris_fmt *fmt =3D iris_vdec_formats; + unsigned int size =3D inst->core->iris_platform_data->inst_iris_fmts_size; + const struct iris_fmt *fmt =3D + inst->core->iris_platform_data->inst_iris_fmts; unsigned int i; =20 for (i =3D 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 =3D iris_vdec_formats; - unsigned int size =3D ARRAY_SIZE(iris_vdec_formats); + unsigned int size =3D inst->core->iris_platform_data->inst_iris_fmts_size; + const struct iris_fmt *fmt =3D + inst->core->iris_platform_data->inst_iris_fmts; =20 if (index >=3D size || fmt[index].type !=3D type) return NULL; --=20 2.34.1