From nobody Mon Feb 9 03:13:53 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 BC33C356A2B for ; Sat, 31 Jan 2026 13:59:01 +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=1769867943; cv=none; b=OjllzrNqWT9eyP3prMrdlZ7+8GznNbQeXVYYvpPanIffJj+I+Vd89fBzBChuYZuhMi67nyS5OVdqS9A6yu6kK6UIBGnp/d8m5qIzh3HTxX3o4Qcs4qYiDshxcH+EdVwMX0Feu5nXSEpDZX0iBx9Zo0xomc0RpNPGAGslyDVGtOU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769867943; c=relaxed/simple; bh=OzD4FTK6JV+5RvDrmyf8OgLghGE1je6zg8bW2QD9QnA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iM3N8NratR4WeL05HADjt1O+zMtNK7UcM0iy9EfVT/Db50OspFuu2hZlu9BwJjmIgeoPyTxIt9UbYsM35nJEnURtSI9ver9UAuNwJdN/gqr25J4zfmyGZ7sx8BC2lwZKfWp1dYqs2fCaj4sC939V5Kn9ns4Ph8Gpm4TpR2uINNU= 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=iqlkuveL; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=h+Zw+Sna; 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="iqlkuveL"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="h+Zw+Sna" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60VCtpQe1320146 for ; Sat, 31 Jan 2026 13:59:01 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= K3s8GuETxl5AklqxiZ+dsaNTgW8Onj8c//rAG+Um/F8=; b=iqlkuveLw/Hy22SK wsaAr3ueyeL1BSziXwrVia6uiyHqvT3hivE6dFV71lNYDdG8M/mOBYqXF+Yh6NIP iOzGpVwtlwyth9ihBaKxdNfoeOOboB4CZ5s+lTqGSFYgC1BHhSDt29WIpowXq5uO dpIFZR+pzRosP20MPm4P48wjbqUazM2XhiCQX2kWN71MS8Mil90rpVtbdarAfmNM tPSfyo4EUPKzvRrQ+d9tuzVcyMq3y/Pub7TsQ58JvJrc3zjgwC1rWD6VpgJ6Dx/1 B3vex8NDdBhRwzQdfClHQdGHtYQNAH5y2ot0hbZLWbnh3vX8se7/nLiMc794sSbj M6aKWQ== Received: from mail-ua1-f70.google.com (mail-ua1-f70.google.com [209.85.222.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4c1as4rvch-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sat, 31 Jan 2026 13:59:01 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-9483c03078cso9675300241.2 for ; Sat, 31 Jan 2026 05:59:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769867940; x=1770472740; 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=K3s8GuETxl5AklqxiZ+dsaNTgW8Onj8c//rAG+Um/F8=; b=h+Zw+SnapzsM90hFCFpFNmYrDqOPALWJIWCPEsi/dCpqwSLnLl8Ll4sI4lKaylvcbf agbTccASuQL4YlEXg/y6PSVWBJ89f2qcSpGkAO+ym5IulpYrIgoaPE6B31HgteqybIMb XLWQv+5/EcpFUQexASweh5zfVUnkqEYh2vg1UcR7PSM2ATLKkEg3L/pTAr+R3HhTLY42 MafJ/r53XxAdWOf4pmhx70gZDFfe6j9hidf72glC3FKAg+0Y3fekfaC3EZrqDnTrd921 5dps4a8Nyq19xk4CWfp/3f7BZWgDXke/hStd8wNMTxwFfEeQyOVph0OVTweQU8c2AlNx xT7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769867940; x=1770472740; 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=K3s8GuETxl5AklqxiZ+dsaNTgW8Onj8c//rAG+Um/F8=; b=VsLFdT64/uBwUKdc/bt9mY00RDUlN2Zqf9+yg2cPyJOdJLSkCzvCTFHIA5qv9EWAmT ykfdmnKn2MVjuu0nuJHUbvqtoNHQyT8RxHgf92LRVelrPjAqV+h0uxlATfZvBp8qHvKU triBwo4+3po+TxlmD76AD64wC2b9gGOj1EBmJJDBdgaePRfpRZI/VRw0wlTQJLpjkJIk Izrm8AwJFE9+uvWQC7qSG4nNOPzCgPeK4+OSWsGUmPVqcNSmV6nMLJ3dsW5R24rDQ4II EUUgDYjY8GCYiIW/tmm2Gz64g2XrgstEvbRkOPIORVXTCSDHkYptlOaaB2ZqCdZQHbuS YFJg== X-Forwarded-Encrypted: i=1; AJvYcCWWZw9Ti617t7tJ34ULG1ouPpq736bgASUvdxVZ0rEXol3urJxyfVMQVsIWyCeGcljaeIDqiKPD14wl6iM=@vger.kernel.org X-Gm-Message-State: AOJu0Yxbsdagvu5qmrL97IAxYAXkoabnTYshKS+aWqz6WfAFD1maSqBQ yxKo5s+tFVk9EveUnYyIvCa976O8bzBIP2ZZN06ZBIn8Ajwygg0DiuhUvt99CMEVH5XMnSUCqgW LMr2tStF0y8J5eOqANnKuakEmXuL2iaXSNtFeORQag0ZIsLFb2OcEonhAsmH4C3TCvxonXw6YwQ Y= X-Gm-Gg: AZuq6aK306QyaqIUapwyLBLjObXz6zGbjHeXexPCq/OvNaZ+tEkvGF0173iKNOM3e4F gSizo2MylsBrrVvpZ5Q0fDGeQWhCInh54xdPoPTLqSR5iH1IH7eAP/PQrovav9du7+v8R04m+Qw PSoq3edwejEgJgjKKY2MAryifG9oqPwQdqu8whf465c4grweHI8tQ4qCMf4uj0zA5YlG2Lxv4ru FpOdEwVieKakjT3Hl6zYozjwAcTzBiPPNXjXK1L+9pQwoF+8K6mCm6HjfyQ4bST9w1tC8E1turM NqvYt4ItF6UAHyblYYmgF3F9yILU4t0B2IGqC4rjWgKLvZOEclUjr0jutnRGEJTO0zhbUFwXCO1 3VWBPoQ6u2oKo0GPeCspPZclAfdslLRxbZfW61vT2jcRDJOaEAOqX6In6ZXr18rkrRTGbzxfRQB 1xN9hl1/oBT6OLo9IpLkuAOUw= X-Received: by 2002:a05:6102:5092:b0:5f5:1256:5e4d with SMTP id ada2fe7eead31-5f8e2464410mr2254910137.2.1769867939680; Sat, 31 Jan 2026 05:58:59 -0800 (PST) X-Received: by 2002:a05:6102:5092:b0:5f5:1256:5e4d with SMTP id ada2fe7eead31-5f8e2464410mr2254904137.2.1769867939284; Sat, 31 Jan 2026 05:58:59 -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-59e074b2dddsm2373021e87.61.2026.01.31.05.58.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Jan 2026 05:58:58 -0800 (PST) From: Dmitry Baryshkov Date: Sat, 31 Jan 2026 15:58:54 +0200 Subject: [PATCH v4 5/5] 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: <20260131-venus-iris-flip-switch-v4-5-e10b886771e1@oss.qualcomm.com> References: <20260131-venus-iris-flip-switch-v4-0-e10b886771e1@oss.qualcomm.com> In-Reply-To: <20260131-venus-iris-flip-switch-v4-0-e10b886771e1@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, Konrad Dybcio X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=5432; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=OzD4FTK6JV+5RvDrmyf8OgLghGE1je6zg8bW2QD9QnA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpfgqcwACF4Kxly/RoVtv6V3U6XjPhT5z1WlsEa RnNJu+7oleJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaX4KnAAKCRCLPIo+Aiko 1bE2B/9M9BoOKIhEY0BnR4LEyPnUl6Z8TFYtOzDaVOBiHp8Z7jaHIRgB4QJ8a/ga4l5D9v7MuYW 0eYKg9ODeBV8SWtQRXazGzdEXKCmBIY74enV4lmlo1UFCtSPP7rU75zU+qwmQxDlcqwDVW5Li2i BfAiBRdqrGWS9eZR3UP2qy9cTItQCv/0xxrJxaXrDItERGX7JtODmCsqgrlPL8Cf0D3fW5XkvYt uaQ3cd0txT2Xc4gOjENK8NiEgdpaKCEaun9PQc9VNqtAf6LeKz40G88bPKjPVl3lnYdC1eZfwUE fK5jQM4IqDTiHxpUuv7Mly66B0B2oTvpRJ7uPPHADM/Zx7YW X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: PsEQ3OcmpaQ_zsmhDMBCds5MVm_VTOB1 X-Proofpoint-GUID: PsEQ3OcmpaQ_zsmhDMBCds5MVm_VTOB1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTMxMDExNyBTYWx0ZWRfX9GyAPLBIm0XW nSP0RkHJW9WF7AJLo1JGYgPZw9OoFj06yvOYhSC8XaXeCsAd0+BLjPMBk7q279nbYGOVMFmK5ZP YVavlMrCJztl4lINojXubwy+UYJ83QLqj9rUvOHG/Lq5PZKZxwjYJfOXEFeEfBvVNfJM+aU53jW gkMTW+XpgJsVoOcrWEDTybj3Txxbs+MUK6vhRnaMQI41XRhyM3Uy8WKeVDQFGfxZZjEqSgFcHeO zBoXHYdn+xVdymjz6paiB5N5gcGLnCSbHgFJId+dbAOXC5KG1Gj/L2m7QutN7api6k2AM95QzW6 hBlTuRrA4QDjLh0JYHSZMBa5LgBmlXdAAUA4JcL+d+A86GwgDVbERi9B6uJp40jzcDNpATOjEDo mgTIOC0BsxYiaAIOAxHpLkSKFySc9gSbJG8kKSxMylAwqaEMm1gXDqUK6MPZaaxA8fakZinRvVN 39j4x6DH+AlEfVxrhqQ== X-Authority-Analysis: v=2.4 cv=bIEb4f+Z c=1 sm=1 tr=0 ts=697e0aa5 cx=c_pps a=R6oCqFB+Yf/t2GF8e0/dFg==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=EUspDBNiAAAA:8 a=PTCOktDilvW4XOe9n6IA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-31_02,2026-01-30_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 malwarescore=0 lowpriorityscore=0 adultscore=0 impostorscore=0 clxscore=1015 suspectscore=0 bulkscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601310117 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. Reviewed-by: Konrad Dybcio Reviewed-by: Vikash Garodia Signed-off-by: Dmitry Baryshkov Reviewed-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/Makefile | 5 +---- drivers/media/platform/qcom/iris/iris_probe.c | 2 -- drivers/media/platform/qcom/venus/core.c | 6 ++++++ drivers/media/platform/qcom/venus/core.h | 11 +++++++++++ 4 files changed, 18 insertions(+), 6 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_probe.c b/drivers/media/= platform/qcom/iris/iris_probe.c index ddaacda523ec..7b612ad37e4f 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -352,7 +352,6 @@ 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, @@ -361,7 +360,6 @@ static const struct of_device_id iris_dt_match[] =3D { .compatible =3D "qcom,sm8250-venus", .data =3D &sm8250_data, }, -#endif { .compatible =3D "qcom,sm8550-iris", .data =3D &sm8550_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