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 75C5F3D810C for ; Thu, 30 Jul 2026 23:52:01 +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=1785455524; cv=none; b=erB9vQwV34t2pJIW+0IU4raRMhKUQCCJTuP+YulAIt8BxBQgQB0tdeDBWgbWcZMujRnvpKHqUXPXW3SgUWM1wsXlwnrkNO8xjYBFaTnhpq2uiaYLz5OmHzuBo9fogu0DQZKZQz4Ua0cfUdokaEaWXAgBTY+FhWnVUsgKebfT96Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785455524; c=relaxed/simple; bh=Y4Mf564XZJLElxOVQ/ItpFm6hQlqUNnOhCZD26KNdhU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JDy7DH6rtxlWKSGaqfwJ5DCS1YGAv0tNsoyGMoaS+NdfeBUlTPzynpfSb8BmgRD/sMn/KumwyyJuWG9NvFlzlyq2+pUiWK5heGaJV9sw7wAaQUvLWq1ShaE21sTwvpiv4/+B+FC8T63C4JAs5O1R2insu0kDN/oVTnGGbJIucqQ= 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=f5k5xPav; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=WWJAfv0B; 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="f5k5xPav"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="WWJAfv0B" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66UMr1vB2203157 for ; Thu, 30 Jul 2026 23:52:00 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=f5k5xPavq1pNNLFf aq/tuDcR0/vXNupjlmxO0G7r4QIN1UyqVFGdikr2wpJLSXT8yVk+GiKA9oB6lAEl msdlcyU2mS32bPCFl92Lj+CxxQTQWe3L9LjgQeOukpcNpEj7QA/paY1TS9sPUIkR x0jsF1SKfGmNDB2pubdkL+/26WObuMUJJYZuLTFZ264gB5909qzL96ufuz6diSvG T0MYscDUG9EV/hYxYL2YViEg+zNZxh93nF260LWoCYBj1IWta1I9FOI8N5QbGKLp 2zZD201N/B9hA5JzZN1Sfxg5FhsQ2cgn3cMn/BVId7W4f2PKGuwRuK40WPqTH9xT LNDIdA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4frdjgrm33-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 30 Jul 2026 23:52:00 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-92e62e3459fso47530985a.0 for ; Thu, 30 Jul 2026 16:52:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785455520; x=1786060320; 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=WWJAfv0B/qUubuQw55b0Wd01qMLL2ZAk1HoFE3SZ7HXjeJ+MSaApsmZeK82zzAIb4R npgNTWnWawCRx+I5hYm0NlU1hcLEONKFaEUhr87Y+P4xHqW/UnSUcSxv62FUl5YqiCbF BLCgygkl+0Gvij+NoLk8zFZI7yFx1vy+qW8IX6oq6PujVdQ0CfGhAOIOfLDlt3thUh6y EvMdx6E3GRp4dqpUKrBJTkbwaQw0aGQr5QQK0u//F7aTWp8mTLKKMqyPwPBOV4oyoiLL pccYL+Mywzi89FML7N43wtKkoDfeMKLJQvtvgBtmpwi6P4lT5y/n9NIYi5Ec+A4wXP6C 9/fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785455520; x=1786060320; 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=sUOBGyT9WoqVsMOzlyztYT0hUyHG8RVz5Zb7GFLd7ffsVE3h5yy9RtmXJ0rvNdwqYM 8xWIJwNIkZMLB8I8cTu6vdBuwVPrKYo3qmzI886LolmOwNfL2qEtToYisUnuL61icr6W bONqIqxhNNI5CkYgj/jKGazWzI6hisMxgksIcOlXvnv0jdOa5ysNNYKuwDR40GXXTv8K gxeq+v9z9WMCYBrxcAxJi+jm/Zn5tR5gXUZhTZzDFNz7m4yZTz158gtzdN0iRF3yp3tm IkOBO+9m/u6ehski+ksuO8uBN1qgoVM9Hh5VO2I5mI9Re5PBd7WszHOtP1Fr6H80zKeZ dSLQ== X-Forwarded-Encrypted: i=1; AHgh+RrTrKCgnNXc++hJWwFqh7Oz2WH5xHnsm4xasZOh10fFfWgvxKOY+3s8nBXhrPANc7j0VHTBQYktd/SX9EM=@vger.kernel.org X-Gm-Message-State: AOJu0YwcUtcawinlV42cR3Lr7Vct0cHWzlYQcFgUykDDaOnK5FlW37WG YoxnI6+WKuMwcip5kFDntAKDWPf+YGt+geXU2lphWzzb0aHjs6CCPUVE/sCUhVF7NUZJinVP0UT nwfK7bh8ofJfAEmcbrg3a9ptqon38uFYJOfDZcw/KpU86GfCfiNr9uVCiN54qmsAMgJA= X-Gm-Gg: AR+sD11hHAanQ30HacBnsOmR+KYt+oGGp2WloWTJqSjDjx/H2dX0waujIyBBH2F5RII hdfTsVdASzWQZH5PZCyokfUWxu+//uhTeZjYsE0tpblFK7yOUZeu+2KVkfRTDOug5lWVaEsN3jY AW98ShX8s5RYV1gNsOd6wAfi0hxb7Co4XsUqMTqcD6M6kvrEcvPOPycsEyPdRVFV4pqh+MxfekX bALt3n5gMeye2zvHWqRB3BoTA7yapF2HWeA0b6R9FJvNPTtj8Sb3tUqagFsjufDPzTnggeoJfO6 Z+KyXWRla9jY5CSmMWnEve3lAsrJFuFDClBdxiI0Vy1M3YK190fF2tt7UB0eVSX0Iemk3RgwHTd O8vCmxL1eawbm3lq58/5kcIct7N7UjRjOcYQL8FzV+lYIcKDW1LiTAVXY5e+PFSwd7K4uTLDq2n IMrihDkIMkHSOHRA== X-Received: by 2002:ac8:580e:0:b0:51a:8c97:9385 with SMTP id d75a77b69052e-52b386a7e2emr48884061cf.60.1785455519565; Thu, 30 Jul 2026 16:51:59 -0700 (PDT) X-Received: by 2002:ac8:580e:0:b0:51a:8c97:9385 with SMTP id d75a77b69052e-52b386a7e2emr48883881cf.60.1785455519156; Thu, 30 Jul 2026 16:51:59 -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-5b2db952f45sm613789e87.29.2026.07.30.16.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 16:51:56 -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:51:51 +0300 Message-ID: <20260731-iris-ar50lt-v9-18-25bbab43a436@oss.qualcomm.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260731-iris-ar50lt-v9-0-25bbab43a436@oss.qualcomm.com> References: <20260731-iris-ar50lt-v9-0-25bbab43a436@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-GUID: pBBjSA-KK6UfklBxaB0C5i_13nfvARtw X-Proofpoint-ORIG-GUID: pBBjSA-KK6UfklBxaB0C5i_13nfvARtw X-Proofpoint-Spam-Info: AW1haW4tMjYwNzMwMDE2OCBTYWx0ZWRfX6tef9wn4bJzc HC83exM3x6itfQYNW5ID8Cnvd8GRVMYPgFhJKzuMDPvQ0SCF+qeit3uBxhM+LJAiX92bcrqvbOw OulfJusBIaXSQdkieQgpNedHY+cXOrw= X-Authority-Analysis: v=2.4 cv=eo3vCIpX c=1 sm=1 tr=0 ts=6a6be3a0 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=4ldMYZ-nzf-nUnInMJoA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzMwMDE2OCBTYWx0ZWRfXx9G3UmXnZzPt b274hMzpv70ORSnlbG0iX4Bc0m3kopJk2tYL9sn2yCUAGasWxS8iKDAurE/REy9O5OvedaJ4k79 79kgv7NB2LK+D4eJ2GsMksTLZ8FY0xKHiHzKqbvTF3DSydYgJF4DzKyC5cE+r1BGaq7t2s1/LsU J5Gd7rZxLn7WnaPAQX6iVUlGs35cFnUeMC4/JkmiI3bLvpZ9fmatqTZAb4H2X+DEJJaODT0VxgQ ydFIrM2J0GCeWDT2sO1qy8Wu3hNzamvNQJjuZknExTmag/4aXC7EgNYB/Y38jv0obz/kdu/l1pD dBkIf5/HRVD3BKLvFwCDPMUCgeVXExuY6GaBjR6CxEbyfnw5w0IWPMY7CKPYiY256F9lyOaMDE6 HThoJRa8bI6bBGyCyRsPaEuhkg9zfuU9DP9wsSRnfL6qNcsQhpF3fwiqGwoiMyy9AAPH21ui6nh 6XitzpgkzjM6Pu5ka6Q== 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 priorityscore=1501 lowpriorityscore=0 malwarescore=0 clxscore=1015 bulkscore=0 adultscore=0 spamscore=0 impostorscore=0 phishscore=0 suspectscore=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