From mboxrd@z Thu Jan 1 00:00:00 1970 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 A552A23BD1B for ; Tue, 16 Jun 2026 00:05:40 +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=1781568341; cv=none; b=myU9MnBmI+k4uXRQ+KGLDJb6vOFpNOR1eiQG+NVc1vh+0RzPKJJLzu3Y0B9fLQsJZb1AneMWJr2UVi/E0txhjzLiNHJS69d3RfpDBuy4AMYkiR9/RZVjBYmGBsv767IlS0Ck4EO4K9MWlZGe/1JU5z8W1HU68eXdCNU2PbnbDSk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781568341; c=relaxed/simple; bh=bBMr05z3+hZKyiKnqtJur9lg4bNIQFaGUAfGEfPWSb0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AxH5bVFU3RkuH4QwcVRluxk4q7Gwbu5kN90H81b05+6wg8ozA/CCsfoUVnUTtCwtM7099qTjbpd0Bhd/4OvoUnJNqWInCQVKriLZtouREYmh7YEEQuYHknJeI3Pu2NTEsYWN5Puek45QeXqP+ZJ4+FHFqudZ6exOyD62RxO6guQ= 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=hbYRMHxY; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=Dv7W3rby; 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="hbYRMHxY"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Dv7W3rby" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 65FIxD4U844401 for ; Tue, 16 Jun 2026 00:05:40 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= AWJObvt7y+kbPGRMk8Pkpq/KWzg0qp4Ve45uTUJVorU=; b=hbYRMHxYe02vlCT0 X1snr0Mh87ob7zj/yEWy3In1nCSZpwCIeboJPPLhf4sGV4h3/Oa0IMbMrDaUAQWP jp9zSmbFz1PibTYAZaPh+1pTGQO4Y8jlYSfKNf0iBaDjQRACD4mKOCqgNJbJAw1G Vsb1Rso3nI8MAjDUV4x2xWl4pYAE2OkJ38l0VUnpHHeWpJNvd4n3Ykce6PLfUEA7 sjQxuBpFBewvhsad5Y0KfNg5iavHT/RpjQVUjq4+JiLFsqrHgUBBpMaOW7txnQxS mfQgGp2YoM8R5pLSHNSv+J4zVcuue5VDuT1tvacYF7l//1jf9PKpCTfP0vO3Mw3b P3MgQA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eter03mtc-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 16 Jun 2026 00:05:39 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-91576c147a4so1007876085a.3 for ; Mon, 15 Jun 2026 17:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1781568339; x=1782173139; 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=AWJObvt7y+kbPGRMk8Pkpq/KWzg0qp4Ve45uTUJVorU=; b=Dv7W3rbySsPoSONWjBsPhmVYXs0exN5NoUFnVjNzhI736GroNDAYLQojEvbm5H43No 0G2ZopllZqdgSq+H0u648/O+53dAch2IMG7+bTBpqSd8Nxa3K7ySxjIZqAD2G+RAnUIN y99vTJKEMyj7viQTNwBQC3TFzktab2VmSxsN/Uc/Y3T/cIhuGVtVDD+Ake0PsJptbrxL usAR2QMgK/d0F6Dm/dVkkBeQM+VZPHPDVsnXV8CCRYDm1ij1HTgaOkaT3elaOQgcF8ix oSb/oYGPxaBjbYl9XNrCw77pThYafXQByyMYBxVuO1QnBGxz1qRQj0JTDxG24S5hVapg ZP0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781568339; x=1782173139; 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=AWJObvt7y+kbPGRMk8Pkpq/KWzg0qp4Ve45uTUJVorU=; b=Jplq5zTRbs4rAxZ8TpoXxZYCndUR01QqG223c6pblOChPhc6cAGVe9Z3MDpoiwhEWT /Sr6O5fTVJsRgRRVBkVTJBlZPvddZ5ddUCvxOJVXlk1wyGi0T0UbP5ioNweMZFRmIHhB ZPuO05ypsMuqzFmoH8AZjhMvF8EtC7psu1HqVrjQaKmElUJdIX+H0V6H5/iSfQsyH9qh x8+ItNysZq6cSKUytPwwHp/B7/wnJOs1zqJGC7+2rWN8wr6CvlWXrjOqg5uO2+sPBre6 vLHARbhhezhxZFKNrQjvOhcRRQrwnEyVB6LvWVyXmdlt0vl8RucDYeFrkTZNsOV19Y0v A+OQ== X-Forwarded-Encrypted: i=1; AFNElJ8TI4ufl1lgACCvr2bSy/Flkel2HaXeJ3Khp2DiBE2a0gYV2OoYFY+1IdfjGFIAxK21NVqgStlkFCfOmwU=@vger.kernel.org X-Gm-Message-State: AOJu0YwtewLnzLi5UDz8Si0cQ3bxlSOVKnnuWwUQGY3a0xBmNKLAsZVB awyLOuqq0yNczRKfZDNNmfS/E9qQB6+VqV/Ju8MDqkRupKOK0P8lSTS7RRNIH2VcSbrrZfeR+j3 nnv3FWSDWhcvY3fC/unpnQuvBQ4l2vxmAL5u3hcvx/F3BJeSAPmfNS9Dx7haROrXzMJk= X-Gm-Gg: Acq92OEaSkugORvRt126CWeuUrBIJvMG2h2pCzNdfxflB/cW8JiRYHHBK6PU7cKT3WJ 9QFNP/jgn/KvbaSk4OuA4goQFYO8b9wyI0toi0eMncEFI+y7wX6RvZZndSGcW5ZPDLexejwauxm 57Gbmzmgw0WZ0X6i91/D/cUCnmXoDPFYe9cjiZG08Ced4a0y/TJgBUFjA+dVXE5p4fRs9rOHgWR 8tkviQADp0Z12TuvVLapIC3g4RcXHXzC6o4M6jLx9O7mHBEjR6qbHzAtzfL0M1VmZnfNMjBDhbj xgyUFOzdzUXGAy5Sy/2RyFScsI28cy+uvXlslZRAJThJhcZ0f6krbR20ZTGyOKEBwwxlJdZ9AT1 lQpZKfH5gMdF5bwkbUhjvb39BsmrGlepDaqS7gCCkkIyenEyGTRxJz0n0W5KGSnXrmyS45o4o/Q 9G8VFnXpdgzFB7Bmla42o/b4F1vrE6v3tMD9w= X-Received: by 2002:a05:620a:2992:b0:915:86a4:6691 with SMTP id af79cd13be357-917efbbd2d6mr2192262485a.4.1781568339027; Mon, 15 Jun 2026 17:05:39 -0700 (PDT) X-Received: by 2002:a05:620a:2992:b0:915:86a4:6691 with SMTP id af79cd13be357-917efbbd2d6mr2192258785a.4.1781568338659; Mon, 15 Jun 2026 17:05:38 -0700 (PDT) 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-5ad2e1a7092sm3015731e87.50.2026.06.15.17.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 17:05:36 -0700 (PDT) From: Dmitry Baryshkov Date: Tue, 16 Jun 2026 03:04:42 +0300 Subject: [PATCH v5 15/16] media: venus: skip QCM2290 if Iris driver is enabled 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: 7bit Message-Id: <20260616-iris-ar50lt-v5-15-583b42770b6a@oss.qualcomm.com> References: <20260616-iris-ar50lt-v5-0-583b42770b6a@oss.qualcomm.com> In-Reply-To: <20260616-iris-ar50lt-v5-0-583b42770b6a@oss.qualcomm.com> To: Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Vishnu Reddy Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dikshita Agarwal X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1810; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=bBMr05z3+hZKyiKnqtJur9lg4bNIQFaGUAfGEfPWSb0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqMJMQ9jyjI0xtGZm9mkeQcVIITP3V5I9BWIzP2 B+zypqYjDCJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCajCTEAAKCRCLPIo+Aiko 1ckNB/9gQAoQXZ9c6otmE0V8YpLudu7XUS3NIMxAZq5Vra5YVT7sFL3y94zeBvMGRjioKK5ssTy O3Ty2uYR1qpZnWqZnDR261US0PDhbZ0kZyOUvxhoM3FjqvdpM9SOLKimUsyPQvdt7EHnavWdd9v pAkFOweeYp4QzGwT6LGBE//jSLILvsDSltX3AVoR+g63mA3WkKCoFAr1RqkrCHlQ5h8uwgR4Rrv mGBHpbpQT0vb86PPXdvYYzB3mM29lxjD794q6EprPbEWqtCwYDrYY5Ic1M3akqdjY0kNlaFsx6q 0gemNMP79cm8yuXiuSwwySiJcG1vjQM+iWbkwZoL8iAbci+r X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 6-dR1GJ2k4IyH2CoSqU94_PqR083j02z X-Proofpoint-GUID: 6-dR1GJ2k4IyH2CoSqU94_PqR083j02z X-Authority-Analysis: v=2.4 cv=UPzt2ify c=1 sm=1 tr=0 ts=6a309354 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=FelO9ux0wxsA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=TAcc6fXARiqENDJ69lsA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNjE1MDI1NCBTYWx0ZWRfX6h3tqM0BJEgP Rpn4XN03nMG9R41clCK6iU4a6H+THUyQeoH3jDwott1efHfM/v8mGZTZ2JiEuuG5KxNptzwt3hL zCOzm4IENNqo+KJDHHgPC0e/VAL2ZZIAdkVZRKU2zqCfQYmlECwmwTA4fCQMueKqwU1CpFRAuBA hoPXpoyMGJ9sGQCJlxY7ljJIUr7o0VuMX8CqFBxAsIQW8FyQasjxNysfY/VFKk8g2jfWs5Ts0YJ 6jcZCJdSruqw8Ue8MhX9+4XSXnnYH8xf81oo3z7e/8JPZuSR89CjhFuUZ+ARq5UC/PTD1WNvohS q6Uj0k6Xhi4DZ1Sx4kfI6VcAUqitn/kVmf1i4vYf4hXygY1bxB4tvbqu9aNuHQtJ+xNN7e8wA3r L2Sickg3GHpLHROMSnEGs1slTIUHQuEgOXT1GLd76W9wuY7EW9AYduQBVncSc51UcIYRh2tppRL L/YPckNCO0Rr4RekJOw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNjE1MDI1NCBTYWx0ZWRfX+dKuadLX0aF4 9GUdnSg6zG5w1tciHKwih2Vi3kEi83p8jWlYHAmmK5PmC28iiR4fPt1nzHiIr+Yy1B4mOCmUM4y dDmxMqpW5EZbcU6YYrUI7qV7udkskpo= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-06-15_05,2026-06-15_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 suspectscore=0 phishscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606040000 definitions=main-2606150254 As the Iris driver now supports the QCM2290 hardware too, there is a race between Venus and Iris drivers on binding to the corresponding device. Follow the approach used by other platforms and skip QCM2290 in the Venus driver if Iris is enabled. Signed-off-by: Dmitry Baryshkov Reviewed-by: Dikshita Agarwal --- drivers/media/platform/qcom/venus/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 243e342b0ae7..3c88594eb1d0 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -1118,7 +1118,6 @@ static const struct venus_resources sc7280_res = { .dec_nodename = "video-decoder", .enc_nodename = "video-encoder", }; -#endif static const struct bw_tbl qcm2290_bw_table_dec[] = { { 352800, 597000, 0, 746000, 0 }, /* 1080p@30 + 720p@30 */ @@ -1169,13 +1168,16 @@ static const struct venus_resources qcm2290_res = { .enc_nodename = "video-encoder", .min_fw = &min_fw, }; +#endif static const struct of_device_id venus_dt_match[] = { { .compatible = "qcom,msm8916-venus", .data = &msm8916_res, }, { .compatible = "qcom,msm8939-venus", .data = &msm8939_res, }, { .compatible = "qcom,msm8996-venus", .data = &msm8996_res, }, { .compatible = "qcom,msm8998-venus", .data = &msm8998_res, }, +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_IRIS)) { .compatible = "qcom,qcm2290-venus", .data = &qcm2290_res, }, +#endif { .compatible = "qcom,sc7180-venus", .data = &sc7180_res, }, { .compatible = "qcom,sdm660-venus", .data = &sdm660_res, }, { .compatible = "qcom,sdm845-venus", .data = &sdm845_res, }, -- 2.47.3