From nobody Mon Feb 9 11:46:50 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 E8A5B34D4FD for ; Tue, 27 Jan 2026 12:23:12 +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=1769516608; cv=none; b=nPpjzJW9ZZNTVkSQYAFJQjsgMbaccALnbZZi45i6Uv+fiG/rYwIUsR8weeepdm03c/zjkKoD7Ui2Q3HoFNE0lA+XQFFT12E2s+6Xbp6gxRlm1SmuVa70ou05q4G/rf4fCuCvmRYhI2ZR8DGTANeU6RFUzuAL1b8MRKUoOKwfgTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769516608; c=relaxed/simple; bh=O6rDG01uuKhI+p5aawFUM6OGJMTB29WlyXqC3eML6Y0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aUiKOcairUvbV1Uxa1g6c1FTAE76fbSztNHzd1sl+t5jnV4MkHp/Aa8JBTTEqQhqX4lP830DMcrmwkD6ml0rTB7ba4jnA+RE8QSFaomje0yUNq07iHIntVl+Vsr+/ccfCcq7JRkQN3WRzaRQlU0tNQ9g8cyxqoh95asQCahcvLU= 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=ZkHF303U; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Iapn7+m5; 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="ZkHF303U"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Iapn7+m5" Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 60R86v5Y621206 for ; Tue, 27 Jan 2026 12:23:12 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= X+oDnrqs14XAXLjkyy0vgrxBDcXxr0LVxm/6KC6d1bc=; b=ZkHF303UhEKwwtrI g7ufgwgU1ZzxxDghaTI2YvIxmT/LSaS2+oOPV3NoBAMySE6ATBTPkdW1YiqdgDcS I3Q6SE1LJbtdTxShejon/mfeGxwp1Q6w+fl/2Ap5H14g2fBUvpFBs9bW/aFbStgK m3rmGtSdfxQZjpurnKBzGUkKtsI+t3w/0aHreUkV0M+ahvZ6aZ9H7Yp2UStpRwxe 9HBqfaaj2imXnaW2EIpufoVKaEd0ICT2wyE7L7PLQypCQ6iB3/DkgVaEXq+iAP/D FOSAIeDGHZV5pr0+xM68KmsynognwLJwZQZOuBdyfEqy5b/Vy87f3euFl1tyUfKb K8r6dg== 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 4bxsjegsq6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 27 Jan 2026 12:23:11 +0000 (GMT) Received: by mail-ua1-f70.google.com with SMTP id a1e0cc1a2514c-9412512e9abso25096060241.3 for ; Tue, 27 Jan 2026 04:23:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1769516591; x=1770121391; 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=X+oDnrqs14XAXLjkyy0vgrxBDcXxr0LVxm/6KC6d1bc=; b=Iapn7+m5Lwe0b1vp4moqhfoiuCDRj3KHk8VBZPCGumYkhmE7OB807PCt/EW9UnSJ6/ 0+xMEnIBFdBCJbuTNhOiaHN4bRUxIt0v8hNHqh22jDm69gfbXkLNC4p/Fp+Jto5dCqmr 9npeLANq8Kg7MNMlHW+EhV1DfYitHTUVqyhkpRveFE7f0Lz1cqxPT6cInlZ4hZn8Cpjs a2a6yT3i4yg/I2MqkyFIyPQL74NbrZZbPkC7vcvH8QossJFvQIlO+V+39IsUjFV8RsLK aRUXW7hPJ/TJLUEDASDlkxIk0kh1Z/5YKkSciLPb+RV9vYQCLk0YFOlYW3SzdoDeIYJ/ GOXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769516591; x=1770121391; 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=X+oDnrqs14XAXLjkyy0vgrxBDcXxr0LVxm/6KC6d1bc=; b=lgaZLk/dzN81bZtLNuME7eP5ldeBrrr+xdzTt/GgDfYqXHd/XBFFrwnjw2eWsPjP42 XGOMxMEmo2DJXyw5QuuWgMXc03HUiLX+HVNZ82b2lYkexpWWS15QE3TGFhzB3vdV9vgG vqkDGYRGenQ82UJlsQ7J1AAxA0J3KjvPRb5JjQerJKMpPGgHQdscnUmFAucGo1kj6KWh Ld5FBrFl75GdeHE3kdoK/tnOesFkffVocPm6QQTZlLg50PH9NB6hoZj0Ek2xXI8kztRT P35kcK8dn2jbLlS65AVeNXOsWwAa+rYQX9xbocdFcJh8bOtEadRijyy5RYuvdnDvDDZi p0MA== X-Forwarded-Encrypted: i=1; AJvYcCX8UE0ZO7EhsGAn1GzZZjI7oVkmUhC5mHWkK7zLcLrxlhxHtn37gQOL958Pk5s31LA2K8WVqKKkNwklwP4=@vger.kernel.org X-Gm-Message-State: AOJu0YwWu/JIuiAU1SWlqgEG1iEPwnnhluzMGw0LFPTzE2MyOXFqiyUo yn8bOniDWfwZG1bAcgKUpBhBYVM5kh1bC9LFDWT2JQCOrSqDi+61kyIsDqVBkMoAHwFinIVKNga Cju+wU2+WAD8Tv9csfyCOmquQ2NS72nf8Ytxi7WhSkJtQcwru3rhP5+wnMDU58+vMIL8= X-Gm-Gg: AZuq6aI5wHftomHQNTtxawUQnmEXT5FFL/qReMO1dZ0hR655OBnRzHVYT0z4J4FSuqj Oid3MjitYFc0goHBSOMlEdzvgCnl4uO9HalHKqb3PEA2usSehTOyFhkByxlE96Z6OPP4KGT8oe3 FrDPOfElOP1/HyokMXi88ncxQnZPVQ3I5IWjf3tC4XFTrrB5/nwSRU6cF9fU/7LFG1NnRmvWVde TbTH4MG0T3K06yHxa4gvI+DYJjXqaWKd0wdakkD2OgleYV6uheBDVkijMdyqjpiXGg8WZGKh3Vz t9+jhwcESl6e6pIj1HCFu0sMIg2S/OhMQ/sZjEATjSpdV8Qkpt5X+g/u57MSIgCsQfAan533lXu ghjW71IOiZI4GVb6UJ5kVLETVoJZmGqAo5xPStJGle8jsvud+oqm57fmYZqZLi7osX1/picMYJd QD1TIjwgOSY0wFSzaa+XoLLp4= X-Received: by 2002:a05:6102:5492:b0:5db:d60a:6b1a with SMTP id ada2fe7eead31-5f723811ad4mr928514137.30.1769516591048; Tue, 27 Jan 2026 04:23:11 -0800 (PST) X-Received: by 2002:a05:6102:5492:b0:5db:d60a:6b1a with SMTP id ada2fe7eead31-5f723811ad4mr928505137.30.1769516590620; Tue, 27 Jan 2026 04:23:10 -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-59de492cc4asm3375442e87.101.2026.01.27.04.23.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 04:23:09 -0800 (PST) From: Dmitry Baryshkov Date: Tue, 27 Jan 2026 14:23:03 +0200 Subject: [PATCH v3 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: <20260127-venus-iris-flip-switch-v3-4-7f37689f4b39@oss.qualcomm.com> References: <20260127-venus-iris-flip-switch-v3-0-7f37689f4b39@oss.qualcomm.com> In-Reply-To: <20260127-venus-iris-flip-switch-v3-0-7f37689f4b39@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=4504; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=O6rDG01uuKhI+p5aawFUM6OGJMTB29WlyXqC3eML6Y0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpeK4mv48HyhHRJB1xy9Fj/VwTAdT9q4lho1IqU rhXjH45KUaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaXiuJgAKCRCLPIo+Aiko 1bpZCACbRjwawbbj4eT0N4rNQ6vV37xnqhofZJOQ1e1Ia1pEkDdMQ8HueJq2D8SR/ry2WEAfkX4 imhemVutFwtlDR5BFNUK3FI8ESM5Xgl9+WKU3Mdohp1+rJr72IMerPenQFPvUiNd1ZX8+9DLbNu ujVN1Xz22XelD7HfZmIqN3nZNVUAXFHamKCWURQ/BJKpieCfaz+JkRat3neWgR0csqWSfxu0CRY xPYZlZJ7HVjGPSBksPrRCVL8Tb51Tk2HSdgZ/zUlXfSHzVIef5nUTBh8/CIhIb6qpA0TN6X7kR0 I0csveL2bbEqwIlON7cgPQPJv86hAXNSlzyfZodlXhn0deZX X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI3MDEwMSBTYWx0ZWRfX5zqH+Ogw+VgY +0CrP6zUtKY+wecaCRsVwwpuJpYmjDZWmc3T7QWSs+KRHNlMgdwM9stYE79NdVEdBtsphgAML/r GxtSsJWUhrVoq6zSH1Hp8plgPH7DjIGXymheDasKk6cw/+bk1ObxRtv3YFqnQc7ECQBEorRXOka YAEDbhIHn8vpJA/z8mSZvDW6TK+oLgYqduY2Sol66D0+VdyXIge42gwk1INSpukasMoEFhN2KIw 4VrfLDeLRqUgBmsd3fa+QzonRQlJJW7jZhMODeuu1JHod1tpgmuMu+als0/1Ukbi4IUXR2eL1k1 yt54ABbL3jGSpI4Hy7NXBSUiygs0/iBod0I9tvWS/4lswPU5GU1hoFxNxm/9D9SVd8tPaqSGMiB Qa+fzby0076ViSWLHPgQsWK1ldto31CXcBA08ySWY0Y6PZ16LZqAjaBnc0qA2YY5NYp54SFNTiD 79pO4ACFSf+HRIMe41g== X-Authority-Analysis: v=2.4 cv=Qelrf8bv c=1 sm=1 tr=0 ts=6978ae2f 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=ch7mjRkEqDhx0_hr-tEA:9 a=QEXdDO2ut3YA:10 a=TD8TdBvy0hsOASGTdmB-:22 X-Proofpoint-ORIG-GUID: 0WoDL8cX1A9fGxIJj6VI6NW5qz7Dc6Yg X-Proofpoint-GUID: 0WoDL8cX1A9fGxIJj6VI6NW5qz7Dc6Yg 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-27_02,2026-01-27_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 malwarescore=0 adultscore=0 phishscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 clxscore=1015 bulkscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601270101 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 Signed-off-by: Dmitry Baryshkov Reviewed-by: Vikash Garodia --- 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 +++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) 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