From nobody Mon Feb 9 04:29:58 2026 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 4CD6F2040B6 for ; Mon, 26 Jan 2026 02:09:50 +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=1769393391; cv=none; b=K6VoOMi4Xd+Uw9PX1SLKcLfcrseI26vjEGXRmyAleYmEbLp9vowZ5jX0NS2fysOtDNxyNrKLIiiMVIoYJsVdIuPnOryAYm7woXjAbxQ3tI6fkbOEeanYmHE58Na5O4oVAQJaeEZAbDS/G/rLldnaWePdlxSx3AoJP+VPbOi6TEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769393391; c=relaxed/simple; bh=/pXYIcxvSkuZpBg9yyVPOQZNVFfc9Qv8zIPbdJARv/A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M1z6BjmZF7hZNQtpx3BCRmW2ZLC5ESBgbC5pAnhlsBnmcbFpZpDIkC53XPrr1xs5u1l7nmKffEItypQIIKwBSf3qFfDYRZrP2lllScFZwziyQFZSDWyTT3sjk2kMcuf2KJd4pMvNU8NOkntoyQu/6TuYBBKQM9sKQ3u7RW/5a9w= 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=JiOLUYYc; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=CNOO70w6; 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="JiOLUYYc"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="CNOO70w6" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60PLDBxG010117 for ; Mon, 26 Jan 2026 02:09:49 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= 12JLVjSwH3qLFl84DNG93K/xFsEvtq9+jZ017krl8Fc=; b=JiOLUYYcwNs/tKEn rKOoP7pOcbAgn8WqVOIiC9JKEagEBodU91Loe2yz+a+BaWluruzKMhgX7f81cPqw CljCP55Hgjht+pB+sQdP9/Tn2fHaGVQMtksi+DW0iEEDJR+FtYr+I1LwezZnPYbc DBLyZbnod2vx1m7is5GQbnobWk8/tNzDhvgsNLNKSmOoK+P5ixAmOAj6xh9wP9Kz 6MdTBqR5Je8yMepkLoBFos4USicpnW5ydW8pDWWSP7UW9Lg2fSKQOSWvzm1sfJ3A JbsF9HTabosoFD192W0h3apHfeZSI7H7l+jMvQwYi1ybg1UdnN6jvYXUiBodHHPu poFmcQ== 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 4bvw4wtkdd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 26 Jan 2026 02:09:49 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c6b315185aso152787185a.2 for ; Sun, 25 Jan 2026 18:09:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769393389; x=1769998189; 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=12JLVjSwH3qLFl84DNG93K/xFsEvtq9+jZ017krl8Fc=; b=CNOO70w6eNR/vwdCaWsp5XigKF4PP+javUZ1MGgtSeAoGnrkcDy7JQvOqBo+GAOw7k EENitvbcbkl0qCPIq+V5/XIU8obivZkBMuyiDGJHPBVJ2zkaHX/HxtzWYIQluv30eXx4 VntQ9TBEZeJqxkIgkdOIMpJevfsgIZZgTt5MRenE4Bh1u0Wcmm/ABaeITn6TbheE1Ly3 cwgpmInIvnv6MsgXqDxoWFFqjQPXb7LuEqCJZ6Byf3nlezMe0qsr+FzS2F2GN+UwnOXN rS4bGwT47SBun2p7LLhhQizhm60jt5bdZA4+AN8STyPuMULMZ4FD97go4xMo292wN2dt DINg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769393389; x=1769998189; 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=12JLVjSwH3qLFl84DNG93K/xFsEvtq9+jZ017krl8Fc=; b=eIjSknic+5TpEfgiCR4BdPNMMGBR6jdIPhY6gX9vRCBsauklHTGg0sWKbBdkxis6xk gW26R+Pj/VJZEj/pfEuUyJy+W6LxKiZvCfIuasqkVhY10K6nAPUqBxjk+8Ls7FMiWlkg az0ghc7hj5oPV9AadVtGbKU7VdU8gJvRLryg/rP7NlXGmP2ygRRNWNWNmtpQw9uarwm2 fB2FlgJecnrTOq8cAciRECoLfcwDJRZieosSkWdy6sXuNm5In7q2FpRWao2cHY9nD31f IsuAKaiUQf9th2LvafbSnUslFnSYQkMjb2PoAfbJgbZ+/N0ep8YsyOpf9DqwU79W/2u8 +DFA== X-Forwarded-Encrypted: i=1; AJvYcCUasponbxWAXWbGShcLEZzGXI06vA88MEZYFiuq5Si7y9+UpWKi3JOPOUHcxbtoxUNqaR8PDK7aZoPJimY=@vger.kernel.org X-Gm-Message-State: AOJu0YxNe0TfqtEGf9e/efFCS1PGsX5XkDZTH6uYAEOlK+rYCztFSmey s3oikguIKGofqJX8P8M73Kf2xK7f3GTrT5b4+wYiMj4EigiNBIi7eocGArjjcpfcrwijkzwP1yZ 4LAmr4xdIMbMiPi4PUb2PLI8vh4xxU3wB0eHVGlPEMzmYCtvPOZyLgYE/ba1Sm/qr4Uo= X-Gm-Gg: AZuq6aKl880NBT/SGTAtKFG/nX0YjJCq7Tl/XCNytuf51BgEPmsWPqRWvIDzpYQMQtq hyt0Xcdwf0sPXWXLkd/bsIPeHgpq+Xv3lMBaaR+ml/oUzjcwlYL5W2uwbaG3a+yUtmlSwKkxuno prlPRENhfyuff89AA19jTrRw3fUi+WLO/kiMk8gQKgbTUFmx6EitqB7Myp9mpEv5P8b5AXNVBmc wosA/6Z9aajViYpKZ8Z3inuCbqS5/AyY0tFbfyoOAEF8+0K6slX8yYzsZtrLMb7KrMSoFT0h9TK 8MOK/DTNnn3l++uauy5Pp522sb0FPB90duWQWkzLC7leMHMA527Vi1mpYGIaKgGSgmDp0FDdmeu s2fSG5pOVi8RWqeh6adsL5JKZLKwpvKEJ2C5gicih266s2RJxkhTSJuHR6iErK7f0MnKwY8kDhw EZ38neviN4Maq3PsX7htUcHUA= X-Received: by 2002:a05:620a:1a04:b0:8c6:f7c7:8481 with SMTP id af79cd13be357-8c6f9572730mr404989185a.8.1769393388639; Sun, 25 Jan 2026 18:09:48 -0800 (PST) X-Received: by 2002:a05:620a:1a04:b0:8c6:f7c7:8481 with SMTP id af79cd13be357-8c6f9572730mr404985285a.8.1769393388179; Sun, 25 Jan 2026 18:09:48 -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 38308e7fff4ca-385d9faed52sm22778201fa.2.2026.01.25.18.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Jan 2026 18:09:47 -0800 (PST) From: Dmitry Baryshkov Date: Mon, 26 Jan 2026 04:09:39 +0200 Subject: [PATCH v2 4/4] media: qcom: venus: flip the venus/iris switch 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: <20260126-venus-iris-flip-switch-v2-4-b0ea05e1739a@oss.qualcomm.com> References: <20260126-venus-iris-flip-switch-v2-0-b0ea05e1739a@oss.qualcomm.com> In-Reply-To: <20260126-venus-iris-flip-switch-v2-0-b0ea05e1739a@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , cros-qcom-dts-watchers@chromium.org, Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stanimir Varbanov Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4519; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=/pXYIcxvSkuZpBg9yyVPOQZNVFfc9Qv8zIPbdJARv/A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpdszkDWQPZJZAbhdDbMFWtyDz3ANZ8+/rgd+Ks pMn6MAzUOiJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaXbM5AAKCRCLPIo+Aiko 1T+4B/9J4DeXrVENoNMzKe4OvhZKDMYMDGxA8Kg59wZVv3qeH00p6Znr02oEeibmz3Ed453OMG7 2z6/IkgEhnAnU6JTHC5xyUTc6+6bHiOva66mJ4sPjfc1UOTMPGptI6wty3lRX3KHBPO0dwGlGil 9zsmKCpSelSMqlr/tR/9uE3W6DNZ5iEz8JzKGk9CI4G0KNVCm6P45GnbIL3GTsFiJ/yPpN4LMrR gGI8mnaTWF7JHS+sfouRubQxk5LeUYQZuBhnJB+X3V9pMqyzPqGuROlwZwPHQ8KGqR2Q1BRGK+f ElOlfY20QGYfDnPMSDS73H3V/AfLUxYyDblz+qM+RQq0Av2E X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: B2NdvBABG0g4tYST2Uzvo1GTnonqduDi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI2MDAxNyBTYWx0ZWRfXxtl9mp+7J8O8 7LJFeVKvmrmrWdaP/vgBOQ0gfoyTpHC3e5Ar85J8aU0b7WTUknQ5caTINHXQNwZPzcC3anlIBoF eLL+3AQ7rkP3ZZiY6C29lst2ch6T8geruPU6c1hH6gSXhsPGnMjydHSf0HPom+jE7ajNt4SPQZl FQ8sAZN1BoP2C6MzKOao9POMzOGvRSji+lTJP/V9FUHrgqdrGuuqUo2eQnf1/v2cjry5QcX+I0p vN4vkO9RUgdNPObqk/PGOUJNW/5HQGjMlkL0HVQcwewHyHR5EQB3hBm/hHVJFsO/Y3M+mrRMFjR 1Weiv04H+glkDpk4Fn59eSlIgG33zV0/MEDT0jYvgo5/sneR/oSLc1I1ldTtEJu+6zmzYqCpboR BzfxK8dK+PkrGDB6WV+Bf80fLQHA15tz4DkP/oM4P2IoLDXCqds8d4LI5hbg0Y1faG6J+0+hlHR 7cIxGOsgXSb4aPQHQew== X-Proofpoint-ORIG-GUID: B2NdvBABG0g4tYST2Uzvo1GTnonqduDi X-Authority-Analysis: v=2.4 cv=POgCOPqC c=1 sm=1 tr=0 ts=6976cced 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=ch7mjRkEqDhx0_hr-tEA:9 a=QEXdDO2ut3YA:10 a=IoWCM6iH3mJn3m4BftBB:22 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_06,2026-01-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 impostorscore=0 spamscore=0 bulkscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601260017 With the Iris and Venus driver having more or less feature parity for "HFI 6xx" platforms and with Iris gaining support for SC7280, flip the switch. Use Iris by default for SM8250 and SC7280, the platforms which are supported by both drivers, and use Venus only if Iris is not compiled at all. Use IS_ENABLED to strip out the code and data structures which are used by the disabled platforms. Signed-off-by: Dmitry Baryshkov Reviewed-by: Konrad Dybcio --- drivers/media/platform/qcom/iris/iris_probe.c | 4 ---- drivers/media/platform/qcom/venus/core.c | 6 ++++++ drivers/media/platform/qcom/venus/core.h | 11 +++++++++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/= platform/qcom/iris/iris_probe.c index 10b00d9808d2..3b662ba90259 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -352,22 +352,18 @@ static const struct of_device_id iris_dt_match[] =3D { .compatible =3D "qcom,qcs8300-iris", .data =3D &qcs8300_data, }, -#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) { .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, diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platf= orm/qcom/venus/core.c index 24d2b2fd0340..646dae3407b4 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -949,6 +949,7 @@ static const struct venus_resources sc7180_res =3D { .enc_nodename =3D "video-encoder", }; =20 +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) static const struct freq_tbl sm8250_freq_table[] =3D { { 0, 444000000 }, { 0, 366000000 }, @@ -1069,6 +1070,7 @@ static const struct venus_resources sc7280_res =3D { .dec_nodename =3D "video-decoder", .enc_nodename =3D "video-encoder", }; +#endif =20 static const struct bw_tbl qcm2290_bw_table_dec[] =3D { { 352800, 597000, 0, 746000, 0 }, /* 1080p@30 + 720p@30 */ @@ -1125,11 +1127,15 @@ static const struct of_device_id venus_dt_match[] = =3D { { .compatible =3D "qcom,msm8998-venus", .data =3D &msm8998_res, }, { .compatible =3D "qcom,qcm2290-venus", .data =3D &qcm2290_res, }, { .compatible =3D "qcom,sc7180-venus", .data =3D &sc7180_res, }, +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) { .compatible =3D "qcom,sc7280-venus", .data =3D &sc7280_res, }, +#endif { .compatible =3D "qcom,sdm660-venus", .data =3D &sdm660_res, }, { .compatible =3D "qcom,sdm845-venus", .data =3D &sdm845_res, }, { .compatible =3D "qcom,sdm845-venus-v2", .data =3D &sdm845_res_v2, }, +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) { .compatible =3D "qcom,sm8250-venus", .data =3D &sm8250_res, }, +#endif { } }; MODULE_DEVICE_TABLE(of, venus_dt_match); diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platf= orm/qcom/venus/core.h index 7506f5d0f609..c7acacaa53b8 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -54,8 +54,10 @@ enum vpu_version { VPU_VERSION_AR50, VPU_VERSION_AR50_LITE, VPU_VERSION_IRIS1, +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) VPU_VERSION_IRIS2, VPU_VERSION_IRIS2_1, +#endif }; =20 struct firmware_version { @@ -525,13 +527,22 @@ struct venus_inst { #define IS_V1(core) ((core)->res->hfi_version =3D=3D HFI_VERSION_1XX) #define IS_V3(core) ((core)->res->hfi_version =3D=3D HFI_VERSION_3XX) #define IS_V4(core) ((core)->res->hfi_version =3D=3D HFI_VERSION_4XX) +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) #define IS_V6(core) ((core)->res->hfi_version =3D=3D HFI_VERSION_6XX) +#else +#define IS_V6(core) (0) +#endif =20 #define IS_AR50(core) ((core)->res->vpu_version =3D=3D VPU_VERSION_AR50) #define IS_AR50_LITE(core) ((core)->res->vpu_version =3D=3D VPU_VERSION_AR= 50_LITE) #define IS_IRIS1(core) ((core)->res->vpu_version =3D=3D VPU_VERSION_IRIS1) +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) #define IS_IRIS2(core) ((core)->res->vpu_version =3D=3D VPU_VERSION_IRIS2) #define IS_IRIS2_1(core) ((core)->res->vpu_version =3D=3D VPU_VERSION_IRIS= 2_1) +#else +#define IS_IRIS2(core) (0) +#define IS_IRIS2_1(core) (0) +#endif =20 static inline bool is_lite(struct venus_core *core) { --=20 2.47.3