From nobody Mon Feb 9 02:12:36 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 6CDEB318EDA for ; Sun, 25 Jan 2026 13:57:37 +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=1769349459; cv=none; b=QRshRobHjYoK14YPp+22ZSgQ+PEqAKSlEYhP1go8bSBlVW8QmM13DNcCzNb2q3cfEO71WeEta8gb+mrRMfoD33JRq/wcFP+3PY2DImNVjcv8NK30BUMp7ADw8jJ49pfcbNQxEC4js7I8hgDhORNKx7iT2omm1pSYGjihPt7Nhes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769349459; c=relaxed/simple; bh=Bmf9KEkMp4HJCg1ZJJDbmmSwGBTwEzmFyX3bT3VUuIk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KyidGu1sHvh43jB8haD6oBj128HjvrRAuTpjH1jIuWY2T3WfIxLABYtIYMoJAOVzYqqA4hz37ifvBHIlOHcKInooYHlIum+b/Y8DlAPf8+VSyT9lnw5Q+pQCBSqmiZzyOSkL+4pPcKbRrR9BinM8KUiVceNo92QlNtzw7Tlke+o= 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=iMeKPOEL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=iFzmLsS6; 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="iMeKPOEL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="iFzmLsS6" 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 60P0DCDp1515925 for ; Sun, 25 Jan 2026 13:57:36 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= JArmttMS0xgGKN3K5jgd2M6cFrUBTdyxOVP5jaPlnSA=; b=iMeKPOELxZasZmmg 5NVVY56b72MXP6GL8wgD4K4OhBHznLbVoQC4arteotaQ2LV3mfrY3ZuWAyQ4PO/A WbeV/HF/pjCKlXiEKTsCX0icGz6XohEfRwhEdpwAcDXv8nbN6FHLuvyOmB7uJUe+ BpAosFByPVOfC/Dy6PCP2YbC69jSUXUUGiIIXiPWPAAMEeEIfO6vDCIYRkTVtyYx nZs+ojHsWQg+3XLXBpYZEYngMxIhtiwx2xPrXWoMKpou++UqB1tPxgUJId59Jhpa 5B6iG6BJTggNUZSjvjnicXRsrYNL9kuFH1PYcOK1ekBQ9zwhTiiSvZF6TpZEV57Y /+KXjA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4bvq24j6y4-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 25 Jan 2026 13:57:36 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c6a87029b6so1167533885a.1 for ; Sun, 25 Jan 2026 05:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769349456; x=1769954256; 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=JArmttMS0xgGKN3K5jgd2M6cFrUBTdyxOVP5jaPlnSA=; b=iFzmLsS63Q12bcMDJBG9xu/YudOjGCQmf3Tcdd9y8VB60H2LaPE653yWDVURILmsmy M/3sMOxjEJKt5nnZ9XSnOW/7NG44hm2J/5P6hSk2jJ1rmczINcY9PWN/vCexibeyYy/Y a01aHyMpkk5QQbcXbEMxb/5uHCoRsQNoWDWluMdifOiTIsTHaegZhh9vZtWwC2Pk1VjN gjOWzb5Cqcxx3z0CDvkh1bmkszeZaRfsuooG7TfFo5+QKkED1AgOx+2z3v9qEHOZJCn7 SqbyxcoTLy9VYmnRbkMB/8Lc66oHHPgJO4ZXaQhfDCUZLlylDKRbCYVOde7FmNutMDlq LCDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769349456; x=1769954256; 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=JArmttMS0xgGKN3K5jgd2M6cFrUBTdyxOVP5jaPlnSA=; b=GKUAQQHxLw1oGD92ICDT3yUSE/vc5G+ns7vjEDYMNNq0bVw8NolYI+OmIE0jg2GNvG fxmyrOtZMkD0+BT7ZPkehdQOEBsl1UQZYfW2ZxGOPgsl6qC3u3/85ikvBKekWB1goFzR syp99sbJNp72gyqNTkKt1sN/Ij4MAb/yolgLRePhR2CBJDApYlwM9OwYs0jKUrwlQcR+ fxHMpMPhnXcPjMrfT/0qlnjbee3VVKlk5YmqH0vOITOXIoQ5mF30apwe7aHMKQFkCrYX cGNG5OBXaH2/G8HtinlfPN3/m8EJdsKCXBjDCMxhXbC4UHm5ERqNWo0AlgiEdgqzfr2H LpKg== X-Forwarded-Encrypted: i=1; AJvYcCVAzlwKBAIn48JBmqmTgD8RrswimhdBSi3OjiAQ20KmSysw60un2Dfhps4Io36Az2ambUuAAKHx7GQYZYg=@vger.kernel.org X-Gm-Message-State: AOJu0YyFD1CRvW8A/+FI784k8kf/yW3X9hAKoL+Lsfc6LUlw5Z2mXcAn Cqa04rC9cFMiRdlvUTIWhROq1yyA+d4EofM+py/Jo0AEb1Cj2/ljOMu0ix9ebib75Yw9xoljfZe rOZpxXuqBUyR4u2QtEVocpaWhh9nbjh1E6NcxoCJOEZS2LYipvrEGiX1uaqYQhWb2GGc= X-Gm-Gg: AZuq6aJoC1NOcJyZUfzPsXIhVsb2GvS65+NQ41Z72KqTY9RO0kEvhSHtQq/ETAqQIVd Z8c+iDw42eAGsspC4iDRgUxPHJWBmRo6sqqRKVC3Xf/Cetkdqu94tllqz3hNOa2XqIYY4uHSFZO lzMV5X0IRXQyU4nt8iOZtoIwGxTYaV4Vt/aBetUsbo9DEzJnL6eNgQprlknIvy4D2i4MvMtKOW2 49AxMnGC5/0twg8ArmabTmp1XqiqidakJ00DUTudzYTZ+KTD8N+M8fdHy4Jmu0nTj1RFKO6fI0r VT6y3zKuvhs2GZrcjRoiZc1owM4+GgJ5g6GfGYYtexqrvac5xZc0mjE3e9mBetdEyuG4Uja9T0S +WcUPkDHZvrgO4qN2cSXrv0CQuMIeUDi8rB4k7IUy47suKV9eochzMibIzeQrbVCwZWZCSwo2p7 6oWLjMxjRJtcfFSCIZVac5Qv8= X-Received: by 2002:a05:620a:172a:b0:8c6:ac96:f5e5 with SMTP id af79cd13be357-8c6f96e6cdemr165888285a.83.1769349455791; Sun, 25 Jan 2026 05:57:35 -0800 (PST) X-Received: by 2002:a05:620a:172a:b0:8c6:ac96:f5e5 with SMTP id af79cd13be357-8c6f96e6cdemr165885785a.83.1769349455371; Sun, 25 Jan 2026 05:57:35 -0800 (PST) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-59de4918a3asm2033621e87.52.2026.01.25.05.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 05:57:34 -0800 (PST) From: Dmitry Baryshkov Date: Sun, 25 Jan 2026 15:57:25 +0200 Subject: [PATCH v2 2/7] media: iris: introduce SM8350 and SC8280XP support 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: <20260125-iris-sc8280xp-v2-2-552cdc3ea691@oss.qualcomm.com> References: <20260125-iris-sc8280xp-v2-0-552cdc3ea691@oss.qualcomm.com> In-Reply-To: <20260125-iris-sc8280xp-v2-0-552cdc3ea691@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Bryan O'Donoghue , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Konrad Dybcio , Abhinav Kumar , Bjorn Andersson , David Heidelberg Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Konrad Dybcio , Johan Hovold X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=8971; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Bmf9KEkMp4HJCg1ZJJDbmmSwGBTwEzmFyX3bT3VUuIk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpdiFG3vtiAwE2ORbAocfg/zEuBuilQzilUhpHZ 3NON3WZqbOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaXYhRgAKCRCLPIo+Aiko 1YecB/9Xx9OT7arA2j0kx7Z4ehxPc/XzLjwjW7q5PklC3yBtNDUUB790T+SJJyyGywe/w6rJUHy TNQXS2c0ftf7vjPmmZK9BtWZqbXbRqoAOGxffR1LenQ752KyeQKLD4eQcebx5yfHji+O3pqgNxo UqGDhg6yKMKr367wQ8ziUrNm6RAfalfxIxOwRnpXu3YVcFnMdLD2jyopUl27/rJtIhmM+WyP0nz UxUxKmbVYl9cx5MpWZfCHuG6gfhnNPgk6b5Ke0EtOpj9FghLUGh9g4KlklVzuwVz2+VnJRm/Hb5 5pECWY5aRkF0GgfYSiSwDt6/xlpXRv9VMcJ3+HS5IIE17uFE X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI1MDExNSBTYWx0ZWRfXz3omxbpFA0l4 uqB03LjXd7RQpIuRQdY59nwEWQfn6Ck9IpIIeRSkBmniHRYVWhdyUHPZF04IaEAXxmdmH2x7UiY Bi84XnP13I878FYNx8MNORzVJvX8ICFtXgJS4MSi0pB2p9wULgzYhymXP/igbx4olYYbxxnX+Ja 58hd4rTdi6prigYkAMr8rbGP5IWJl8qE4PEHS5dWiNpORr7hIvM/dAfcmvKmNCDB2aSCU/D3LmC alDkd9+ngjDzytPvCu6XHB0SDQ0/EV0XN7QyWDL9duQF66B94mnBhLvAXCfVZ8ih/aTDTgh+HPd dZBltFQutcakbw03av4Y4HGrdtVSW94nZK5W+xllOCoAtoEDOO0wkb+ArDzK/AW+DkxALov/dVB kwOtgYRsdjF5iReofuBMV2kVnBQWwEiIrsLUadwNtxpKTiEkAcK6iwZu0dfg0EONHYafUKzE4PV hu2TjSzcf/sROXj4CdA== X-Authority-Analysis: v=2.4 cv=EsXfbCcA c=1 sm=1 tr=0 ts=69762150 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=UUdjpNFb6dwvVqmIGXgA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-GUID: Nri5AXsc4wGLQQYb5JEhAsal63Gf7pL- X-Proofpoint-ORIG-GUID: Nri5AXsc4wGLQQYb5JEhAsal63Gf7pL- X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.20,FMLib:17.12.100.49 definitions=2026-01-25_03,2026-01-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 adultscore=0 clxscore=1015 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601250115 SM8350 and SC8280XP have an updated version of the Iris2 core also present on the SM8250 and SC7280 platforms. Add necessary platform data to utilize the core on those two platforms. The iris_platform_gen1.c is now compiled unconditionally, even if Venus driver is enabled, but SM8250 and SC7280 are still disabled in iris_dt_match. Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/Makefile | 5 +- .../platform/qcom/iris/iris_platform_common.h | 2 + .../media/platform/qcom/iris/iris_platform_gen1.c | 111 +++++++++++++++++= ++++ drivers/media/platform/qcom/iris/iris_probe.c | 10 ++ 4 files changed, 124 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/plat= form/qcom/iris/Makefile index 2abbd3aeb4af..2fde45f81727 100644 --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -10,6 +10,7 @@ qcom-iris-objs +=3D iris_buffer.o \ iris_hfi_gen2_packet.o \ iris_hfi_gen2_response.o \ iris_hfi_queue.o \ + iris_platform_gen1.o \ iris_platform_gen2.o \ iris_power.o \ iris_probe.o \ @@ -26,8 +27,4 @@ qcom-iris-objs +=3D iris_buffer.o \ iris_vpu_buffer.o \ iris_vpu_common.o \ =20 -ifeq ($(CONFIG_VIDEO_QCOM_VENUS),) -qcom-iris-objs +=3D iris_platform_gen1.o -endif - obj-$(CONFIG_VIDEO_QCOM_IRIS) +=3D qcom-iris.o diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 5a489917580e..49dba0f50988 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -43,7 +43,9 @@ enum pipe_type { =20 extern const struct iris_platform_data qcs8300_data; extern const struct iris_platform_data sc7280_data; +extern const struct iris_platform_data sc8280xp_data; extern const struct iris_platform_data sm8250_data; +extern const struct iris_platform_data sm8350_data; extern const struct iris_platform_data sm8550_data; extern const struct iris_platform_data sm8650_data; extern const struct iris_platform_data sm8750_data; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/driver= s/media/platform/qcom/iris/iris_platform_gen1.c index df8e6bf9430e..c99ff4d4644d 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -14,6 +14,7 @@ #include "iris_instance.h" =20 #include "iris_platform_sc7280.h" +#include "iris_platform_sm8350.h" =20 #define BITRATE_MIN 32000 #define BITRATE_MAX 160000000 @@ -392,6 +393,61 @@ const struct iris_platform_data sm8250_data =3D { .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_enc_ip_int_buf_tbl), }; =20 +const struct iris_platform_data sm8350_data =3D { + .get_instance =3D iris_hfi_gen1_get_instance, + .init_hfi_command_ops =3D &iris_hfi_gen1_command_ops_init, + .init_hfi_response_ops =3D iris_hfi_gen1_response_ops_init, + .get_vpu_buffer_size =3D iris_vpu_buf_size, + .vpu_ops =3D &iris_vpu2_ops, + .set_preset_registers =3D iris_set_sm8350_preset_registers, + .icc_tbl =3D sm8250_icc_table, + .icc_tbl_size =3D ARRAY_SIZE(sm8250_icc_table), + .clk_rst_tbl =3D sm8350_clk_reset_table, + .clk_rst_tbl_size =3D ARRAY_SIZE(sm8350_clk_reset_table), + .bw_tbl_dec =3D sm8250_bw_table_dec, + .bw_tbl_dec_size =3D ARRAY_SIZE(sm8250_bw_table_dec), + .pmdomain_tbl =3D sm8250_pmdomain_table, + .pmdomain_tbl_size =3D ARRAY_SIZE(sm8250_pmdomain_table), + .opp_pd_tbl =3D sm8250_opp_pd_table, + .opp_pd_tbl_size =3D ARRAY_SIZE(sm8250_opp_pd_table), + .clk_tbl =3D sm8250_clk_table, + .clk_tbl_size =3D ARRAY_SIZE(sm8250_clk_table), + .opp_clk_tbl =3D sm8250_opp_clk_table, + /* Upper bound of DMA address range */ + .dma_mask =3D 0xe0000000 - 1, + .fwname =3D "qcom/vpu/vpu20_p4.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), + .inst_fw_caps_enc =3D inst_fw_cap_sm8250_enc, + .inst_fw_caps_enc_size =3D ARRAY_SIZE(inst_fw_cap_sm8250_enc), + .tz_cp_config_data =3D tz_cp_config_sm8250, + .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_sm8250), + .hw_response_timeout =3D HW_RESPONSE_TIMEOUT_VALUE, + .num_vpp_pipe =3D 4, + .max_session_count =3D 16, + .max_core_mbpf =3D NUM_MBS_8K, + .max_core_mbps =3D ((7680 * 4320) / 256) * 60, + .dec_input_config_params_default =3D + sm8250_vdec_input_config_param_default, + .dec_input_config_params_default_size =3D + ARRAY_SIZE(sm8250_vdec_input_config_param_default), + .enc_input_config_params =3D sm8250_venc_input_config_param, + .enc_input_config_params_size =3D + ARRAY_SIZE(sm8250_venc_input_config_param), + + .dec_ip_int_buf_tbl =3D sm8250_dec_ip_int_buf_tbl, + .dec_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_dec_ip_int_buf_tbl), + .dec_op_int_buf_tbl =3D sm8250_dec_op_int_buf_tbl, + .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_dec_op_int_buf_tbl), + + .enc_ip_int_buf_tbl =3D sm8250_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_enc_ip_int_buf_tbl), +}; + const struct iris_platform_data sc7280_data =3D { .get_instance =3D iris_hfi_gen1_get_instance, .init_hfi_command_ops =3D &iris_hfi_gen1_command_ops_init, @@ -446,3 +502,58 @@ const struct iris_platform_data sc7280_data =3D { .enc_ip_int_buf_tbl =3D sm8250_enc_ip_int_buf_tbl, .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_enc_ip_int_buf_tbl), }; + +const struct iris_platform_data sc8280xp_data =3D { + .get_instance =3D iris_hfi_gen1_get_instance, + .init_hfi_command_ops =3D &iris_hfi_gen1_command_ops_init, + .init_hfi_response_ops =3D iris_hfi_gen1_response_ops_init, + .get_vpu_buffer_size =3D iris_vpu_buf_size, + .vpu_ops =3D &iris_vpu2_ops, + .set_preset_registers =3D iris_set_sm8350_preset_registers, + .icc_tbl =3D sm8250_icc_table, + .icc_tbl_size =3D ARRAY_SIZE(sm8250_icc_table), + .clk_rst_tbl =3D sm8350_clk_reset_table, + .clk_rst_tbl_size =3D ARRAY_SIZE(sm8350_clk_reset_table), + .bw_tbl_dec =3D sm8250_bw_table_dec, + .bw_tbl_dec_size =3D ARRAY_SIZE(sm8250_bw_table_dec), + .pmdomain_tbl =3D sm8250_pmdomain_table, + .pmdomain_tbl_size =3D ARRAY_SIZE(sm8250_pmdomain_table), + .opp_pd_tbl =3D sm8250_opp_pd_table, + .opp_pd_tbl_size =3D ARRAY_SIZE(sm8250_opp_pd_table), + .clk_tbl =3D sm8250_clk_table, + .clk_tbl_size =3D ARRAY_SIZE(sm8250_clk_table), + .opp_clk_tbl =3D sm8250_opp_clk_table, + /* Upper bound of DMA address range */ + .dma_mask =3D 0xe0000000 - 1, + .fwname =3D "qcom/vpu/vpu20_p2.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), + .inst_fw_caps_enc =3D inst_fw_cap_sm8250_enc, + .inst_fw_caps_enc_size =3D ARRAY_SIZE(inst_fw_cap_sm8250_enc), + .tz_cp_config_data =3D tz_cp_config_sm8250, + .tz_cp_config_data_size =3D ARRAY_SIZE(tz_cp_config_sm8250), + .hw_response_timeout =3D HW_RESPONSE_TIMEOUT_VALUE, + .num_vpp_pipe =3D 2, + .max_session_count =3D 16, + .max_core_mbpf =3D NUM_MBS_8K, + .max_core_mbps =3D ((7680 * 4320) / 256) * 60, + .dec_input_config_params_default =3D + sm8250_vdec_input_config_param_default, + .dec_input_config_params_default_size =3D + ARRAY_SIZE(sm8250_vdec_input_config_param_default), + .enc_input_config_params =3D sm8250_venc_input_config_param, + .enc_input_config_params_size =3D + ARRAY_SIZE(sm8250_venc_input_config_param), + + .dec_ip_int_buf_tbl =3D sm8250_dec_ip_int_buf_tbl, + .dec_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_dec_ip_int_buf_tbl), + .dec_op_int_buf_tbl =3D sm8250_dec_op_int_buf_tbl, + .dec_op_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_dec_op_int_buf_tbl), + + .enc_ip_int_buf_tbl =3D sm8250_enc_ip_int_buf_tbl, + .enc_ip_int_buf_tbl_size =3D ARRAY_SIZE(sm8250_enc_ip_int_buf_tbl), +}; diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/= platform/qcom/iris/iris_probe.c index ddaacda523ec..10b00d9808d2 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -357,11 +357,21 @@ static const struct of_device_id iris_dt_match[] =3D { .compatible =3D "qcom,sc7280-venus", .data =3D &sc7280_data, }, +#endif + { + .compatible =3D "qcom,sc8280xp-venus", + .data =3D &sc8280xp_data, + }, +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) { .compatible =3D "qcom,sm8250-venus", .data =3D &sm8250_data, }, #endif + { + .compatible =3D "qcom,sm8350-venus", + .data =3D &sm8350_data, + }, { .compatible =3D "qcom,sm8550-iris", .data =3D &sm8550_data, --=20 2.47.3