From mboxrd@z Thu Jan 1 00:00:00 1970 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 5A2EA419313 for ; Thu, 30 Jul 2026 23:54:15 +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=1785455656; cv=none; b=ZFkmHduAGBMm33N5bVfv8kGlh5SkQ850hp+5EQK8uZTsy5ZG16WUWi9Vhsklt4rI7rZHdx5hilsX9q6HL04b7P2/YBwmd1TJ6MB+JwEWoKGZsCxWmNVylZQO6lHDTLh+tyC5zo6ZyghV9QzsEeDhgaHRjN169T7Zzo4YmqVtiMc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785455656; c=relaxed/simple; bh=Y4Mf564XZJLElxOVQ/ItpFm6hQlqUNnOhCZD26KNdhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rQTOYuYoCWUB3qs4cxoI3yyJ5vwj1kumT932o+Cu9p2CvT2JO1kP4s/HCu2dtIiNKTSqDPG9dA0so+dWD6Jd3GcqBUKQsfobmytFGojiXpXqyCGf3a849zm7W1o75cAaH/cIiSYFwNCPfQAYWM7D0TQnTKViBnvjUakyOGOjiC4= 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=NrJmlbZu; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=kf09L0Wj; 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="NrJmlbZu"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="kf09L0Wj" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66UMr6GG2455579 for ; Thu, 30 Jul 2026 23:54:14 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= Evq/VAnP3EnITG4JjW2jCwPnQPbOBD89cFtu7VIhEnA=; b=NrJmlbZuuNRt3Y2Z m+YGBLBbD3dW/VOAmQBa1Njaah2WYkoDNvUqe9ZQRw1od9pLEWrLK5taKgRQ9JEZ FranFWVDNE51f6HxTuLbubC6uwj3Ek5ahwD2FQ0tLgKztgoZYLlY8emM/hvazmU8 acg0GoW1VjIF/lKBG0uoWY6M+YXTZD6395f+zrh+5kBaW58JNSTgcDCs85h6smaz jNX9iaIHUxuMdICruqsrYB2c3K0WB4HpWCdaWqGpROINc7SaZC5A8EVoWdcWhXHf Yp7uXbE8lPE3mQqWDeS/xeF79WZ/RHPleXl9yofSAQLeZ/uqiFGNE1Es5L6ZL80s dDDLfA== Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frf0wg96v-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Jul 2026 23:54:13 +0000 (GMT) Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52827090cc5so3047901cf.0 for ; Thu, 30 Jul 2026 16:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785455653; x=1786060453; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=Evq/VAnP3EnITG4JjW2jCwPnQPbOBD89cFtu7VIhEnA=; b=kf09L0WjBRBblCfAsD2Np52LQ0UB/yekaSbMom8/SbioOJ7PieRHiVbGd4IAhNRF8+ ArRydEfQsWZUrkr/xaBUorQA1h6DErIJoeEhrcpHh4SlGFFc2rJlthNeM5q0WBGHegnm w7nk/PuxUi3oMZLpDE2jY2c2rK8Bpar/4/cgbD6He3cn3lnPJiuyISXNCIqvBkYZks5N FdD34mMEssdhMjl33fJhJs3mLltHFO+IRRlxSm+ReI1evDDyhwTm9miI9miZKZgeRX2p Zs3IopQsb1K6GLAFY3aj7HcNzNhWhvl6H0MAo364QiihbcVtrri3zTqzfbu53mGl20uJ BMdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785455653; x=1786060453; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Evq/VAnP3EnITG4JjW2jCwPnQPbOBD89cFtu7VIhEnA=; b=Hozl8Vm76ehCIuLoIBcryNm10XsdQa9xLNOpyHUgmOhVHBHcCtbBA3yFjosbqL33i0 H/obSvKEd55aaYbiQVJXUPFkdJoUxLtvj07JNkQEHdVCBnRop+SbGh2utLjCEV14QaAQ eN+UvGgZQGAdMbMfYgbK7+Gx47N3UuipxTpNi5ygbkozwte/M5kT/xxJQ3ZEX2c5VoFA IQb96Cs7NBYoP/DLp0sAaRw/hyjtMGE6ftR4K1qAQI/8GesLi9+w3B+5zYyyP8BW5SNe Nqc3yw95xKf3wtIbU4AbFJIycMjpmVN1wtdha2YjjeJLFuMpG7GcWT4SPGbEp7QAl7jp ya/w== X-Forwarded-Encrypted: i=1; AHgh+RocaQJAY16usmtphxnxtjrzJnF3+0dTzIavyNefXQlXo8iKpkTMsHcH0Yj5fZ88t3Fp+snKHmQXBLU3j0Y=@vger.kernel.org X-Gm-Message-State: AOJu0YxmvvNvsXieSU/31nG2euaeiNeeMH6eUziWnzCV0TMRQP5m9NyI rbl5rVGgCkCEE3llipAYqglngOdhTFlm7BuV9mfayc5JAe4boazWsan2lnML/L90L35X7jCwI4a vkpb7qDdvrEzSoVQNGMJNlW/9O40YiN1FiCk5CJyPW64Lkf9RvL69ipOTNwOthkRik1s= X-Gm-Gg: AR+sD13898oPew7TO2cG5mw/1HRDNq9xGWOjdRqyhF9Bngyj7s+SyOjFpUJJsvhJ2/g blb+1RuAFkn5LCVfOVsfr9hFDTPlik4DSiFHIq5HNHt3IqheTnpqZqnZFQnAtY773SAc1dpcOJt ppflqHJDHYGNTaFE6XgUJiHsXArDN2+raWmQY7Zmg9+rVOVU/qA+hLhjxxVHkwR92IKFyfBf1EJ czIWAzXKmvnwVBe/+BUKzdw5aGmoUY4dAmM/3Hcr5TWDC9LWZeEqEWg+MBHCI9koHwQCrjRKjnH d9FOl6RVEizPTOXdxUxXqu2sPAJ0cDhBEfUdsq7b0Zae5jyN+gHiqtn6VrAyd8imJFjjcunYsKR jJBx1WtTIugQJj8lpi6UWO3LzWJ6JnfQDhKgz4vQVbp8lfRoQBysDO0GMFpiTVxW4hODjA/GPDi +lFvnVxTY7Iu17pw== X-Received: by 2002:a05:622a:488d:b0:528:1bad:a2a4 with SMTP id d75a77b69052e-52b424e2ebfmr26815501cf.15.1785455653472; Thu, 30 Jul 2026 16:54:13 -0700 (PDT) X-Received: by 2002:a05:622a:488d:b0:528:1bad:a2a4 with SMTP id d75a77b69052e-52b424e2ebfmr26815341cf.15.1785455653001; Thu, 30 Jul 2026 16:54:13 -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-5b2db9ba855sm638689e87.49.2026.07.30.16.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 16:54:11 -0700 (PDT) From: Dmitry Baryshkov 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 , Bryan O'Donoghue , Konrad Dybcio Subject: [PATCH v9 18/19] media: venus: skip QCM2290 if Iris driver is enabled Date: Fri, 31 Jul 2026 02:54:02 +0300 Message-ID: <20260731-iris-ar50lt-v9-18-d71a782001c0@oss.qualcomm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260731-iris-ar50lt-v9-0-d71a782001c0@oss.qualcomm.com> References: <20260731-iris-ar50lt-v9-0-d71a782001c0@oss.qualcomm.com> 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" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1873; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Y4Mf564XZJLElxOVQ/ItpFm6hQlqUNnOhCZD26KNdhU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqa+MuxTJ+JLL0cauK+e83kbe8RkVEly/9fxE+W PfFTIuzi3yJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCamvjLgAKCRCLPIo+Aiko 1fEhB/9+q8EAZ52a4Bs9eQGkJ9cbuwXlA5Ud7ToOq/x3/yG3h68s2uTxL2xmQmxbMx+7AIqlD+k gGgbCaJzE//rXF3OgH3gfy2b29ocj219agCx0cP6wsip1c/g5hIr0NkadTKCu15Ipnyc2xbnGnl zTqirGGyaF1nCm+uQwjDjvtsHOnh10tBCli1F7TydofZ1yDZCOINabFbhKtbpaoi2e8j+3lj+8F +dik6f4Q+iZXt3DNkOD5ZVpU/fnI9gDn8EwRQF/E0+q+bGo2MfesOL3BOymTNzTcouq8qEVvq8y ynfDEElonanJ4Ka6qppUuzvPpj3viLp4koiUlUGsS7FjAewi X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Content-Transfer-Encoding: 8bit X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMwMDE2OCBTYWx0ZWRfX2owIqpT/avvl ikilZuAzJTrN+vmInhM+kAA8xEMyQaIwXbFzyuI2HBoEfFOWWdqScfpcjbSBisFT8hTxZQ2ZJJC 7pZynHVwahTvoigSYumXsw8KBUB7l+U= X-Authority-Analysis: v=2.4 cv=T928ifKQ c=1 sm=1 tr=0 ts=6a6be426 cx=c_pps a=WeENfcodrlLV9YRTxbY/uA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=4ldMYZ-nzf-nUnInMJoA:9 a=QEXdDO2ut3YA:10 a=kacYvNCVWA4VmyqE58fU:22 X-Proofpoint-GUID: gg0JynkpHg_F-8GEgjlGQksIqxmhpEFw X-Proofpoint-ORIG-GUID: gg0JynkpHg_F-8GEgjlGQksIqxmhpEFw X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMwMDE2OCBTYWx0ZWRfX3vGGiwkJ6NG/ tEu+t+Q5PEqt/MfEIuMCUs9MMCvLA/+mkianDnq/BDdh4SxlbSAIiNKcF2f0NUlfx6+mtOF8Y/K 47pPSXeLkQZ4UeD7UZrK+HOeWLPdbGyP/Q4gG7udfbNTjEvUkaHLBeZm6x3qMcsTWbIpWTq/tSK uCvEyu7aNzYC44arfw/aW2IetIgAHtg+SBSTQsPucciUJId2QJ1LNeQh2erO5Vt/6Uo7t66mvjY TCTqlbBFTmh5aLK4vjx7gHdYK412sSx2onueL1cFE6GVsGNzZP66QHrcuLrRuKqBoGw7TD06jb/ Mo3iMmtBCzU9da5Uuw5N967Obw5AwUQ8Vehh15AwyU80A0DpEDROXmIWZy4BbaCt/Zav18YlSUe QcgVrDRyJluqcUfvEYcuq0VWdpMFjOrcU3BlcFRNXuNofyfFmB48L+Zf2x1CV66mJMXC/0goaEQ BTKXHYkcxyAQ6wCaNIA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-30_07,2026-07-30_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 spamscore=0 malwarescore=0 impostorscore=0 priorityscore=1501 adultscore=0 bulkscore=0 lowpriorityscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607300168 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. Reviewed-by: Dikshita Agarwal Reviewed-by: Vikash Garodia Signed-off-by: Dmitry Baryshkov --- 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