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 50CB532571D for ; Thu, 9 Jul 2026 13:42:44 +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=1783604565; cv=none; b=tpu684DO6eoDXHnPh2kCq8z+UcUbFP+rf/GWpdFWkWMPjQiPvT8CiIyvNF9A3wx1KEzKomEaOM7RzhwMEmRhYL9DSZI02/srYzM5D2tle3EuKuR3dXaoI8AK7gZHoLBbEtLPj3hana1B2WKAC72gcWiOO1mLUMTAajX+UKBNZGM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783604565; c=relaxed/simple; bh=Y4Mf564XZJLElxOVQ/ItpFm6hQlqUNnOhCZD26KNdhU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MQP5WyFcuKtn4L8dab9yhx/Ix36WdLFR7K5qN5QzX9J0g8ZsrDlEVNDi8X50qDiIjfOLpHX9D3QX79BQZm959GGs7HAfuaxSi12m9ZhV9it3atPzec5/Gdf6U0uvfM/QZXRl7/IAm8uUuUhexDTxWwwyui45sbv9jJTB4+4j/JQ= 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=FWxBYymy; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=S6grsNXF; 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="FWxBYymy"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="S6grsNXF" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 669BNAQl1715963 for ; Thu, 9 Jul 2026 13:42:43 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=FWxBYymy3HMALBJR aYPvUURuekqh1leJ+SZLvJefacgkveb+++g/b5f98UgR+GTPAF47/OojiMcGM/2C aHNf+UJE5f+v7Yq92g+lZ6mSasS7oUEwG1ZK57RpIIJJygtoGt3OXF/ko31t+9qB Zt0zl/ML655UEC9Bh2d+n3y1W/CcFc5CDbW+gDJieltjZ8LO3dgcX5Suxurm7dEi F+dZ6eYa/165j9maVKyXr7l7VbUKlSSte9M1kORjCRrehtO9BdzGF2AZqSTPn0Ss Q8omxU82HKMZcRvM3nY78WLrZCbBIiLo4RmmFakfsVLpvJ+x+8uBWTcaQsDIxLj0 qjofkQ== Received: from mail-ua1-f69.google.com (mail-ua1-f69.google.com [209.85.222.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4f9v4vv4kd-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 09 Jul 2026 13:42:43 +0000 (GMT) Received: by mail-ua1-f69.google.com with SMTP id a1e0cc1a2514c-967973f71fcso401175241.3 for ; Thu, 09 Jul 2026 06:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783604562; x=1784209362; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Evq/VAnP3EnITG4JjW2jCwPnQPbOBD89cFtu7VIhEnA=; b=S6grsNXFUwwBIzZRoChGbx9NY6kRXdU4Dc4IxXSccMnyLznITJJCUNDpi9+JoXZwAc SblfDG8RqC7nNEWedy/AkzK1Uq4zxb9h26FxfUJITulg5vKWBRwJpXfMzlHMISTtLTdM qfvmXuOMYQbIWa1vC072Zc/nOEgiWL/zha+wqWsbuSHsfcCbOQLVbSyvDiaHgzVwLo/5 jco19kOMPWmZmiQ7iNFclakZAadJ9owYnUiZPz7b9j/n12CBcS3U9q90wG4F1pA5/iL6 sVV+cw2KBv+aNMziW3Q7f1y8hpy+lR9vrTTCGzSv7flZBOc8RYlwXjClYPT78YhQLV9T uuzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783604562; x=1784209362; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Evq/VAnP3EnITG4JjW2jCwPnQPbOBD89cFtu7VIhEnA=; b=qCIyrJPn6p4Mvh5KK93KPPFCmw2LuaunBhBorcfiWCluyeXhXLeQXzNuvP4C0Pvfl/ 8fnsCiD9/qLIBPqB5RAmsPy4wFmXsTjKkzlNwCLjrgK83EWl/QBVv8j25tGvkAuyHG6e 8THontkKErSPPOpekaoO0d2JfdD9QFIShycKtxCmTYQyTiGuYHAueEcalhYTzOUJqOq3 bSxHkmA28qX3Q1c1Ntsn0ovib3vbsOFWUIPgpEPOzCIJ/5Caw8HB1z5sMOA3RFeuyQAY FSCAiVUBz6uMFKIbNqpViJI6GSNEOzJhuS8sq8nyddUiD1LVgF+b35E0aXIgr+rCi/BV D4ig== X-Forwarded-Encrypted: i=1; AHgh+RpSWzJweIqhxk20kZGAaBOHsNXmIjGhCa/QZBqk9Bjq25SydkmOs979GuODflYV61EfjHU1eroblZyL7YA=@vger.kernel.org X-Gm-Message-State: AOJu0YyAJIKpYM0QeRtXJFB08H4VhQJBgYqQ4zE9/AaDMaogHmv596E9 CKT+HvAeZG+hB03JVpwfVpAwAL7sxRCUwBdOH3c78IuHosx5Tkep8LJQMVpfV1HYwdnlWHii0g1 Tn8hiMijKodbbmVjKLYOH62yDU57faIeq9smyXoqdUTFXnmp3YxJFbTambu7Pbd7HEyE= X-Gm-Gg: AfdE7clijJEZclOl2w5DsMuruXBE+JdmgOAHvt/oRw5CRz1psfgjzRZ4YUhsFh12PjB 4129Xj6cApVYQNy+ua5lv+2XJ5WkLCwRBytUgQ4kSBk1myMvnZXslLlpDFLL7v39NO2jjSZaDJZ CwMwvcz/83GjoVqcn9fz9cCJxjMfpcFya1XJ2/cT+kFhxicDJpkLMQPvxYDX8GKS7nNa1yfmifH lDR3oWndw7RcjlwxVszQnL+L/UH6XTzTrREj7DNgPbiProTpJ+CENFlb/36REsq2I/LUVVL2PPy 1pw6xyW9orfSSqGnjOcGW3aVX/3TKD/lEtFy09pYC4usg8qYIakuG4hMvjYhBR1gEV0nqq1FP+h n8UwCFEYNqbUB2mumrxTK5aI4NXUpby/z++UIEPIQsRvV6RvBYuA2A12yCZTLZuk4M0Rc+kLgMT UyGX8HvaFzhvyb7m9uXNc2+XFt X-Received: by 2002:a05:6102:94c:b0:660:d26b:506e with SMTP id ada2fe7eead31-744dff52b67mr4460037137.1.1783604562379; Thu, 09 Jul 2026 06:42:42 -0700 (PDT) X-Received: by 2002:a05:6102:94c:b0:660:d26b:506e with SMTP id ada2fe7eead31-744dff52b67mr4460000137.1.1783604561868; Thu, 09 Jul 2026 06:42:41 -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 38308e7fff4ca-39c849186e1sm3345151fa.9.2026.07.09.06.42.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 06:42:40 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 09 Jul 2026 16:42:08 +0300 Subject: [PATCH v7 17/18] 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: <20260709-iris-ar50lt-v7-17-76af9dd4d1f6@oss.qualcomm.com> References: <20260709-iris-ar50lt-v7-0-76af9dd4d1f6@oss.qualcomm.com> In-Reply-To: <20260709-iris-ar50lt-v7-0-76af9dd4d1f6@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=1873; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Y4Mf564XZJLElxOVQ/ItpFm6hQlqUNnOhCZD26KNdhU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBqT6Um3x0DVIhta7pt6Su24PLZGGj05AXnS/cbv /uOXE/dWFyJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCak+lJgAKCRCLPIo+Aiko 1UeAB/9I1h9kcsc0rZFPxQVvV9c5C5XdymJruOglX7gtc6BJIQcL0iuuybsm28TCQmtxTbbUd62 d7bRpjC7LV/bH0i6KHWNpuAcoZPnnnRRg7rsKDRtPb83/B54rJ2WVdyYCXj4pyjHRAQ349TLoin hUcLx8C39cmP1dFS5QPTVszxyCOAoU3e4WSBbJG2MpeBl2bUl+HgSLWMGmMz2s8nfTH2iUGgJ6k NaOoMadqVt8oxxCOQaOxA+V9f+K+qjSD7YQwTFK4yzy8Vb8bagG626Uz0LfvtLxwYWZBNWpI1yg ncBrcfoM7BhRYdddCJ70dFbBUXLzFpjD6uyp/b55HeDsP5SN X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: dfVP6GWQnZpPTmwU1ddfhz0tU09DJisD X-Proofpoint-ORIG-GUID: dfVP6GWQnZpPTmwU1ddfhz0tU09DJisD X-Authority-Analysis: v=2.4 cv=GIg41ONK c=1 sm=1 tr=0 ts=6a4fa553 cx=c_pps a=UbhLPJ621ZpgOD2l3yZY1w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=4ldMYZ-nzf-nUnInMJoA:9 a=QEXdDO2ut3YA:10 a=TOPH6uDL9cOC6tEoww4z:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzA5MDEzNCBTYWx0ZWRfX56L4dWwHjiB8 LbjraNVi1wC0r90TWFgyFied/x1CI7f7ZoeVGGq+uCZgb2dxFXA173Up4vF1IwuQ54lwAVW7NtZ TSyfLszqHO5ENfE3DTvaYdR96r4uwZapDxb+z49uGthQc0zZgEBqk3nsyjFizDjkRc0Fy9J6Pzb Sb+MlMa8vjXw/s1IMZaZ2j+YAHgS+zh42PuTk6H7JsgNu42crD1YijilYAK1AXmgITQhOjt40Bb jWUtVcSdlXye8oDnDTuopRO4xp+QjZiloYcWwbfJ2JlUsjz4lpJhIAoMc88XP72hhMmWOVOa8nF AN6QBHPkULtVYqFqVJ0+lQlLc22gV2bPO4PRihnvI5lOKnMDzfRQ0XLDMhfYO5R2UKADRw1ooCl mXtdXhdVG71jolRxDDYvcoTI4aMG8t8NfSh59ytIpYs26qjNxkfka0F5pa/Gy1RSxd41TfCGomi 1cyrJMqf9v/1LD2mfsQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzA5MDEzNCBTYWx0ZWRfX5olf6Q19uAa3 X2e+3AFEuZ/Nxi4tPAzQYfktB2WHlTGgSf2WAliQvX03XNc/k6aJIDo3q7INi8kMpncqZgdfW/n mBx+JSCEvoDaPvo8wFZQdCAQ+LqtL7s= 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-09_02,2026-07-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 suspectscore=0 adultscore=0 priorityscore=1501 spamscore=0 malwarescore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607090134 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