From nobody Thu Apr 2 14:09:46 2026 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 50BC239C638 for ; Fri, 27 Mar 2026 20:20:01 +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=1774642802; cv=none; b=BTuAlxiRPbYMMVaZ8VUJrFOnQChfuOpf/ij1ilV5wGhG2/G2kYt0P8jfnyKK73fHTTWW5cbX31IjW90lQv41aUn7xd1/DcMlS/lVlWGtYQdFempb7SAM56tA9EArt1Fj9D6H9lYDVT08l3XIea6kH6rfddxpoeYVJUtNyHCsG8Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774642802; c=relaxed/simple; bh=6t4bZjQEwVJSE4KMbGmyYY9zqlqufbdXRAFAjFYMPJU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jzUpdgF1yx3eLbAYww7bmuJ0+O5V1pO5DPJ3xTCUe/y5ZV9yDWXvTJC8ViLSm7/Zw3nBHq+Vjxmh4j/Az12OcxnJCaxugBydsOMLfSBms6VWpGjYHEaUxecdvA5s+LqOcm5aNLMXivMDFXvrXlQZD9Bi7clLZwtl9jxjZ4dWyBA= 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=SvsjKfSV; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bHd22pUf; 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="SvsjKfSV"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bHd22pUf" 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 62RI2R7C133557 for ; Fri, 27 Mar 2026 20:20: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= 1MWJF3hIMhRNf4dgGFUhsIdW2b9aOdxhV9FbfIMi59s=; b=SvsjKfSVNsxgYHf5 v30pry5Ju5lOKJJHU3zzNzvzJyTdSqfHgW9qWwF3F0G9z0nLNKNiu0qmaSUIs5re KX0RI/3gQfvGQBWJ5qZ3mKOSKDnXWAD+bU0qnZmXw5k7VHCBXe59+IJ1fNLyFTYs 9fJXD4kbXlAFK+c9mBRJEJUAVw4fFcj3+AlFqmZgVb23TgERhZvPjt+Bo4X/lndE 5JZSACmrcMvKJl1vVjgANUm1M9W6qBjFsVcIOEh6+Pu9WLSh1qPYhYwjoALzSmAJ 8tqFo/dUkqiIEj6qhvNbllwpVDuqRI8Xv+pfVcGh85Ri1KwFB//PZh5GIi/vv7Fd FelLEQ== Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d5sxhhj82-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Mar 2026 20:20:00 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-509070bda13so90282981cf.1 for ; Fri, 27 Mar 2026 13:20:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774642800; x=1775247600; 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=1MWJF3hIMhRNf4dgGFUhsIdW2b9aOdxhV9FbfIMi59s=; b=bHd22pUf8D4ZdqzJ0Sb7n1v3kSfD8s6zaWZgGIcWmLjotDkv/UAgb9eJU8AL7YJEHM Tel/9IezA12E7h1nNvyTNgyYntG2yjb6P9z+AcCt3Hm0FfOE7v9xAiTRCoPVGvhCIV2H injM/9oexYBcO+0yDfnIsSALN8DrWWsloFFzlPVSkn3v2WMqaM6zGQdnOjYgonG4+TjV fP4P+lIuGCodIu+Pqs6d3uZzUYGZZGNpnOVuRQGpHWwgXcV5funy5P6YprzDi3JEVXWb tjYaDY+vjyCHV8IG4wYfXNSNqxTCSh27au0ICH2U2Uot/duzOnvXoIsajGGKqpBc4ZtB aL3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774642800; x=1775247600; 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=1MWJF3hIMhRNf4dgGFUhsIdW2b9aOdxhV9FbfIMi59s=; b=NWfIYtmpWJvihfFFHyat/0mTQM6MRhgGClz71ppDaeDWjbgA7X3RCs+jGjHhmBbCOS MzstAnN66gbnQ4rl0246hOPac83UQ1m1/hFcKfrFRBcNzOvxCdci8QeEoBGTQxHce+fk H6NM0qH8eOZKK0A5cxpDwQs13DIpqPoK8h7tt1sVsyRpPvDIB5KMy3Y/RauWXoyNVqCc e4o6sLoNVn+GXpgXxPDHU150yqNiCbPzwlO0UzdZ7ed++1DWOxxSDIqUUQkC23kE3zOu kIKONnBaWSXuuyCLpoUnLWdzd4tnfu+UFnIK0CQeFBdqPzygJjpexb+xxYar+E9eO8Kw 83ig== X-Forwarded-Encrypted: i=1; AJvYcCUbvDTKio+9HPt5Wq6ZxsYD052ESRD3Us2F+aTULRXOmlTjvf88U1qVL+O44c9fQkE/Yfg6I0q2xhU3fik=@vger.kernel.org X-Gm-Message-State: AOJu0YyvSFFzOXlHzLO8uvBSuDDWT8+iMDMazCbLVIzpA3khVPogXRkf Po6Phe96H9sKQcqhiCkvbLQrOT/EFYbyD/kXpTRd2GQUEuq/3C4zaZeXF6EBcojjd8ja9R/c2pn ipxVkq82kMXa/+yro6QhhnU930mGqmhE3Cry2sGwbtNOHPBA/K9kTJQWu6TfhJK7mubo= X-Gm-Gg: ATEYQzysAHffd9Jq6EdMtx0bR9EAI6r9QHi24/rRqh7Y0j602pVXclnWbdcMLMz1EyK upKTzv3xJ2OlkRFRugt4Gft3MwaTpeUJFRmB9cuszm8zjZ6KQe9glyV9sMT1zU9VafypIeGw17u z/ftxkGl57VkMKNduP7LXlspDZy6VzOuXLDS9W4nKrp3LY3vL6j3ewP5F2iNbI1HBUzRWC3Zzgz L0i5w+0RkCF80hOzH33Zs2Kyqm5+9egMvAD3eY59BwxbXEYCChiMSl7UJnjmf8pLNi9vqJc1L74 DRL8RH6W9vxwP9csFOYghG+iKP+hPDg8Lu3gvSd1OD/5ON9Ip7SM9UUcWPKqQDukmbPfSnwHMGx zWpS69SJYn2G96UXgBlsdfNsGefH0/Yj+t2h8/d1BsZ/t1gg45ZQpCqPQfUkw/3qJowPJf6zGD1 QPWe7oGbem8XsRtCHEwZqAHMX9wKVTMH7+Zp4= X-Received: by 2002:ac8:5a46:0:b0:50b:41ec:5e85 with SMTP id d75a77b69052e-50b993de828mr91194711cf.11.1774642799648; Fri, 27 Mar 2026 13:19:59 -0700 (PDT) X-Received: by 2002:ac8:5a46:0:b0:50b:41ec:5e85 with SMTP id d75a77b69052e-50b993de828mr91194441cf.11.1774642799194; Fri, 27 Mar 2026 13:19: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 38308e7fff4ca-38c838931acsm506581fa.19.2026.03.27.13.19.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 13:19:58 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 27 Mar 2026 22:19:53 +0200 Subject: [PATCH v5 1/4] media: dt-bindings: qcom,sc7280-venus: drop non-PAS support 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: <20260327-venus-iris-flip-switch-v5-1-2f4b6c636927@oss.qualcomm.com> References: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@oss.qualcomm.com> In-Reply-To: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@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, Krzysztof Kozlowski X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1928; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=6t4bZjQEwVJSE4KMbGmyYY9zqlqufbdXRAFAjFYMPJU=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpxuZrqy6cO8rm/NDV+bNsxyZdigt0/CjbrrBib BDGrm4UK8aJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCacbmawAKCRCLPIo+Aiko 1eV1B/9mtpXqB9uYdpFRm1lqiblwHwviRF5zEvOtdJ+qT/pG40hMN5PYhOcjDyeAjqmCGXR81Zn FWLCEd+ef8Mx3+VHkF/3v9Kk74/FpumlGObDW5bnt2dzl2unSn8mfms169p9TKwI17NxrI7wnmU mfFvULP+omrL5hhuEVjQRPCnd2INr7BZYWXGz7sNfhu0ncqyRDJIXOq6B2+edfgBFHd0ViZpse7 VD059RYZ8ZYnO+cMUZv4pYlAPvCi0H0dy3RZoGwlRqsq8KwqSEyoqwQohyBE14Q/kvAE+ykN7W5 K4XjNN11qXtwsOMlSJ6BH60s9XW8xYmTSyMtvtk2EUf5MWBK X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QZVrf8bv c=1 sm=1 tr=0 ts=69c6e670 cx=c_pps a=mPf7EqFMSY9/WdsSgAYMbA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=zCM7-lDapuS4FQW10A4A:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG:22 X-Proofpoint-ORIG-GUID: Z67wBiQGTJL1VlGPYD7irB3X9YEdG29z X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI3MDE0MSBTYWx0ZWRfX2nNUQWZjzU6s ow2FKg/AUFkfnw9cyAG3oAfpnPW0KGIVvmkrP9JXZb9uUEdUMA+TWXw8bDhNeKLEdFZVFeLxEnG PtwujVPFK7l9seny/aa65Mt2H7lsbIe62fvop/4C2wqQOfC863LeXBbJLyMcM4ibSG1mFqx903Y YWlQp2toi6oF3IRfwBTkT+bLvY5yuxLzF5YX6XwnJfOFmnfARzeL9zJnoQJCGWjlPqXSJOWq+cq SE32+2Lz+s+/f+atIVeK1X2lffT4gY+kagzi0gIIbjygI/40h2zIuFBzCnNli2dkUVYp6SrILjs HK5sNckokob8qryWnsttRK+lPIZqibvIzAS2Ox06WMBfufZ3v5tLL/b4k/Wk/cFrptOsj5P2UnD 7dSOM6/REXDGjxkGgNTT/PS+/fWHzJahx6AjXNA9noCWZElSbmRFiLxHqdw4rpXsiwZ262tEI7T bsKlw1T0dK2aitO5oZw== X-Proofpoint-GUID: Z67wBiQGTJL1VlGPYD7irB3X9YEdG29z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-27_01,2026-03-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603270141 The only users of the non-PAS setup on SC7280 platform are the ChromeOS devices, which were cancelled before reaching end users. Iris, the alternative driver for the same hardware, does not support non-PAS setup. It is expected that in future both Venus and Iris devices will use different ABI for non-PAS (EL2) setup. In order to declare only the future-proof hardware description drop support for non-PAS setup from the SC7280 Venus schema (breaking almost non-existing SC7280 ChromeOS devices). The dropped iommus entry reflects the extra stream, which should not be treated in the same way as the main one (which doesn't match the usage described by the iommus definition). Reviewed-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov --- Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml | 10 ++----= ---- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml= b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml index 413c5b4ee650..9725fcb761dc 100644 --- a/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sc7280-venus.yaml @@ -43,8 +43,7 @@ properties: - const: vcodec_bus =20 iommus: - minItems: 1 - maxItems: 2 + maxItems: 1 =20 interconnects: maxItems: 2 @@ -120,12 +119,7 @@ examples: <&mmss_noc MASTER_VIDEO_P0 0 &mc_virt SLAVE_EBI1 0= >; interconnect-names =3D "cpu-cfg", "video-mem"; =20 - iommus =3D <&apps_smmu 0x2180 0x20>, - <&apps_smmu 0x2184 0x20>; + iommus =3D <&apps_smmu 0x2180 0x20>; =20 memory-region =3D <&video_mem>; - - video-firmware { - iommus =3D <&apps_smmu 0x21a2 0x0>; - }; }; --=20 2.47.3 From nobody Thu Apr 2 14:09:46 2026 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 ED2C52C032E for ; Fri, 27 Mar 2026 20:20:02 +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=1774642804; cv=none; b=ikGsZ2BZ+yn4t+v3LK2xt31laDKm53wS44MVBkFx4k8FM+GdAuRXkeJDooKt35s1RUGa1c73o+aLn92AVby7xpuxQnqlTeFmYLXbW7lQFUko/S9ZpPvts7iiFaH1dUWex5r6VKae8L+nPpnj95ChSeBJvvQvEJVKpISl/EtizfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774642804; c=relaxed/simple; bh=pvGogtYz3ToyC7AvsbxMd3Op0x0cS14QLEENjtD1YWQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VesUHZ0I0un63aixPbfiv4e6pjhvJj5pGgpA4Ob+6LGrYwMRqL+5l8PCQLkcSg5EpDP3cfeHp4O2pJryiHdZ6qlncgKuID5yeUWJu8VQNEV5DzreS9X66h08EQfzwmMQncredl3uEx12s1xjp3ewFRBPFozTlihDeEKa6qOz88c= 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=ESWKwyAa; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=B6AGVNGX; 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="ESWKwyAa"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="B6AGVNGX" 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 62RI2Ovt4030339 for ; Fri, 27 Mar 2026 20:20:02 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= 5sftBoUYRN8krc33OKZxWXSUXoLKwRmpS5072sKzwys=; b=ESWKwyAaen7w7fyP XCCojErwL/33jOzVPaPm3niAoGzOc7p07HJ4TXTX9V9/nJqqF1d9jYGEW0iou+3z Z48C4sDbXw2AMna3xAl+u+bjPbjtq9RHc/GyJxlnIexdXzOliyrStAxDqnzivFQL dfNm2seHP0iGxZ3Lkm7oXLERW6luDjynXPHjgTrdmax0V1pZNo1G2uDHvLxIY73+ Pw3bS+Wad4smlr7d6ZCRgTj2sxHGsVtzdrZ0TVdmW+BEoP9vF0C7NvWlMl1tTzqB 6W1WI3+sV3U+b3F3vMOQ+IktKoBTI/jbNTDMUNHSDmTct1dLilurLLJDGLdwWzLR yleKBQ== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d5v6b122m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Mar 2026 20:20:02 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50b220c72bbso87029741cf.1 for ; Fri, 27 Mar 2026 13:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774642801; x=1775247601; 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=5sftBoUYRN8krc33OKZxWXSUXoLKwRmpS5072sKzwys=; b=B6AGVNGX6eH4aHvY1ghnBw0JRlPO6AD0S00r9/ceCyl7VUcX2an4XQnNzPzsZNCc+O kCP90KLLeKUQ1sXzQOP1sKCUbJVIzxrpFrjdn13PRd83g2+Hy1z6LdVXHzULJRO3GJrq j1ZeM1cbaxJNbWurmr5GhE8yg8rvVoOuGuqlR4MumCRLGW91BmS1vHaVr7uu5DPcykDm t74bn4Sb86R0edCEyt95Qqdp+81tE/0wIN63w32quYUb1t+OCaVEYRKS7q1h6FaDZ8t8 nohEYhlqjwKlZJaIh8jLSbSupOjBy1x9l+TPNqlYMeAN3ocvGJLRzcdgFiK72Z+1VTFk tCcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774642801; x=1775247601; 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=5sftBoUYRN8krc33OKZxWXSUXoLKwRmpS5072sKzwys=; b=hf7FP9CpEJjN+A+CDGQa4Xouu9uwUCbJDl9p75L58A3tX0dbuqcRE9Da8aLf6wk0DR VB8Jow2oF2Lag0va/3lw5D0lP1eII0oVDg3DE3RyjpkI63C8jXIm8b+YEh6XyvxNxT7U abM3U+OvMejbPQUZxsOC9ZO5zMb0O+i3u3SsVy1kASFCJbTfR0rgCfHnEMOj8YdUyNTW fZUjucFr3ITNJk+Zotio50VPoFfj/vLMyiUvPqzMYXRmMwNnuFEEKNlGA1jOSZoct9hH Hxw/xKqmgG+lwF3zIWjjVd/927xAl+YVFKOI7o9T/s6z8CWheI/cnYTWFn9MKooOEiN9 E25w== X-Forwarded-Encrypted: i=1; AJvYcCXvoUuZYmLpITzahWQZDaUQGMqSZIkLKL5Yvu1rtUoE2YI67K6gnMXzrnigRfUSe4Rks17I4mzEGOouKu8=@vger.kernel.org X-Gm-Message-State: AOJu0YzaXMoTZan/pmwScxvs382oH2e++Aa1RsvI6nW/bqDvMeAke4Cv gdt+AGcfiwY/QAIKY/NBlHvqQplqtLX6njb6k3bBtS4E7JorHuOrNazr9VlxbpmAInYSy89+l36 x258HsDZgxLn2N2516KAHEPo4AzyoMkPTb/6HBFjgTyUmoUslxN0sHKuqrBxWvUD9mIM= X-Gm-Gg: ATEYQzznUzFTp2ER4hdApniYy+8HqgehLcroRCGrS4M/vFaNHOMS3jbcvjI0TaJUpL7 WRbuxZrdZ9CaLQrvW7693F34/reoeOoBRYCfFY7aD87Ge2a/ajOGnRFIAV7YB5D08sIOcfYH0J4 T/AEAehfYUytI4TO7v+0DKbxG5ZK6fYqszfu66kzmEP2ARF0iCmaJBUpHRYbViFWzvM/wBW0M0E Po3UIAZf6CZQTtqhWBNt0ZrTUkIZxbZJ12WejyIpmhI3lU9EQb320dktH7t4N/NVVTadyvF1Uk4 qyUgUPpAbaLAGnvLn2OGW7miz6rGfadBytlkP+M3zf8BHJkxnPHdlUGeFKckc7Ti5vPTx8zoMhP N2M3YjFgrwLZ99MSIlM/46TUtQzP3iGozAWIuSRrTv2co6bxsyCZQmZNg35bIwyAnHF9QKVLnZw L9yX8KuIxvYKSPAtWBfH8f4POutf6gopmxcIo= X-Received: by 2002:a05:622a:1886:b0:50b:2ca1:4d85 with SMTP id d75a77b69052e-50ba390dcb7mr51876551cf.52.1774642801190; Fri, 27 Mar 2026 13:20:01 -0700 (PDT) X-Received: by 2002:a05:622a:1886:b0:50b:2ca1:4d85 with SMTP id d75a77b69052e-50ba390dcb7mr51876101cf.52.1774642800707; Fri, 27 Mar 2026 13:20:00 -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-38c838931acsm506581fa.19.2026.03.27.13.19.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 13:19:59 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 27 Mar 2026 22:19:54 +0200 Subject: [PATCH v5 2/4] media: dt-bindings: qcom-sc7180-venus: move video-firmware here 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: <20260327-venus-iris-flip-switch-v5-2-2f4b6c636927@oss.qualcomm.com> References: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@oss.qualcomm.com> In-Reply-To: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@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, Krzysztof Kozlowski X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2286; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=pvGogtYz3ToyC7AvsbxMd3Op0x0cS14QLEENjtD1YWQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpxuZrEeRxdm2oFgIKpGcq8XmJigyNmQyJIr2oE szumgoILv2JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCacbmawAKCRCLPIo+Aiko 1TAYCACSHejZpuRmFQIxR1d+ocU4SxkFFv9c/A7YB3JfkHaHvPZkLKu3Bw2W3R1xrmXjCIGheYW 770KS9OuLpEuaWC7dRp90a/+pMtTTmBTNChqGI4BHWNA3FcPwsUFuAbdrYKvfKa0hyeVk6WwqKn KhQvKmgty9HKOzw6g8LHGb+k8dypNKn52slDc5uEPYwi3Q+oIxg3mehhVXL5xFKex/gvRVxy2zX QyWvhhi5sCJBM0sohsB36BU8q54f2BNtw4hHduB1jAwg/2kIx5tNYgBGAFzgJgq+uM7JDfYhUz/ O7MVcjR6w0r9wDeAxax5hvyDQqKVgG4Dl8a7kuATAzdZP6/J X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: KfJzawJygiBtTmf0Eno1WiMU6IGkIXYm X-Proofpoint-ORIG-GUID: KfJzawJygiBtTmf0Eno1WiMU6IGkIXYm X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI3MDE0MSBTYWx0ZWRfX/1a3EZccWJDt OPl1L5juvCDxplYvl9zqTGXIEn6+QXqZdTbIHbVbYb1SZ9KwKDA1YyB+GARD+9olp2bTTwlnt7a XdIOZ54hjul2DWxSWOfVfKqz/J0fJNQ1jHn7vNFDq+WFVKab7wvCkiim8dnlPPFKHf7rhXO+jNs cAeKKPq6mYcr97jhpiTonllMsJFoAOA2FwWRHUyhaoVdt+iAhFUN0RpW5cpvzBUlXekX4PJVvHU H6TeE0Ru8/LZ4xnrl6u++0iQHEmHztbeGSbkolLH/nWViAovJa1f/kpaX/2uY20omN7r25YDkSI 0oj83v4vrmwxeqQWboBuESuBcA4VUzFcpyqla+fAidAFN4eFhHLam49Q34F5xAWRSW4CAlK6v2D 31798hIEhiJ9HXEK9zk9qMyi5abBHSxjiR+UbHtjlWCHw0cz7hy2l9/DR6aYFlGDqXevLRFglgv HmmhSQL1gmrpaJfE/RA== X-Authority-Analysis: v=2.4 cv=JLs2csKb c=1 sm=1 tr=0 ts=69c6e672 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=0e9ukYqe-uxmdYkeUVMA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-27_01,2026-03-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 lowpriorityscore=0 phishscore=0 priorityscore=1501 impostorscore=0 clxscore=1015 bulkscore=0 suspectscore=0 adultscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603270141 As SC7180 is the only remaining user of the non-TZ / non-PAS setup which uses the video-firmware subnode, move its definition from the common schema to the SC7180-specific one. These properties do not accurately describe the hardware. Future platforms that are going to support non-TZ setup will use different semantics and different DT ABI (using the iommu-map property). Reviewed-by: Vikash Garodia Reviewed-by: Krzysztof Kozlowski Signed-off-by: Dmitry Baryshkov --- .../devicetree/bindings/media/qcom,sc7180-venus.yaml | 15 +++++++++++= ++++ .../devicetree/bindings/media/qcom,venus-common.yaml | 15 -----------= ---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml= b/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml index bfd8b1ad4731..b21bed314848 100644 --- a/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml +++ b/Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml @@ -91,6 +91,21 @@ properties: deprecated: true additionalProperties: false =20 + video-firmware: + type: object + additionalProperties: false + + description: | + Firmware subnode is needed when the platform does not + have TrustZone. + + properties: + iommus: + maxItems: 1 + + required: + - iommus + required: - compatible - power-domain-names diff --git a/Documentation/devicetree/bindings/media/qcom,venus-common.yaml= b/Documentation/devicetree/bindings/media/qcom,venus-common.yaml index 3153d91f9d18..59a3fde846d2 100644 --- a/Documentation/devicetree/bindings/media/qcom,venus-common.yaml +++ b/Documentation/devicetree/bindings/media/qcom,venus-common.yaml @@ -47,21 +47,6 @@ properties: minItems: 1 maxItems: 4 =20 - video-firmware: - type: object - additionalProperties: false - - description: | - Firmware subnode is needed when the platform does not - have TrustZone. - - properties: - iommus: - maxItems: 1 - - required: - - iommus - required: - reg - clocks --=20 2.47.3 From nobody Thu Apr 2 14:09:46 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 68C923A6400 for ; Fri, 27 Mar 2026 20:20:05 +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=1774642806; cv=none; b=Ku4ps3p9WD/k/7GU6+9rtLg4xT+7sRGuhf1mgIhD+879/468eGz/L70hOUTejAwYtpjCu6jNCHzETXCASDDxSC/20egjzmCd4kHOQIRjoL0l5+AW1o0U2i4+BLZb/10rOAJWe3/xAsf4jxjnC5bNQ8Ye1yoiKl61+QWOb56+ZJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774642806; c=relaxed/simple; bh=XMmEmNUu9RVdz+GiH0qUt2UhQyeVsFtCItZxcUhLc/o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=IhJZiRoBVOES/RORM81Ln6LCb2BT4tJnEaXMydKMnWScaOJr+9DOCAsL/GPQypGvyaJcFI5dqA5v6FbyOUmSoP5F0UdhmxY6yR+84au1BBMUVl2SS1Lluohvf+uvMjBOAXWI2VSyNOxb00MwUzKLgiwMt7C+qdK7WP5K+Mgyg9c= 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=lwUtV0wM; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ACh9yo8G; 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="lwUtV0wM"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ACh9yo8G" 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 62RI2h46083236 for ; Fri, 27 Mar 2026 20:20:04 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= 6GgdwoB+Ukn6VRO1bHY69INTqGlbDpb72pFrBX8+YRI=; b=lwUtV0wMSWBtkmHe 9QfLu6S76bML3aU0EwUQWcq8alTMeK4iYYliRFNlxlocvslA4kZ5I/EWEMnwLq3Z ydAtWUnMgrfLF7SpLE9SdtAuyx7aldIYAKdOixBiGtIZSgzxDzXlPPdhBim/5bS7 EbRf2SpTDsxHTOZzcrwJXaa4P1dBNH1fme+EXK/X9rd2V+FwZrL5SylVtcl5+oxA S2dMOUqzGkAlsCA7B5Hfu7XU1AaCjireBdxWs+tnMEchBCJS+kKmwbEKumgtWs5C wmszQiB/wnGX0K3yXM6RsPzlXPhWT44PLHelaDXdqoZ7BAPDaOFhYqMEXILcjIP2 NDkD8g== Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d5jcx3cjk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Mar 2026 20:20:04 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50b4ca7e7c2so63548671cf.3 for ; Fri, 27 Mar 2026 13:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774642804; x=1775247604; 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=6GgdwoB+Ukn6VRO1bHY69INTqGlbDpb72pFrBX8+YRI=; b=ACh9yo8GTulm9AoTFNQ3s7hXH4M8bdAxztlbczLpJaLZPNbWaagSFJGN48m9M0bJlS iuxQxSX6sv68sdpZHQ4ZMvn1082/lLAClCa4qRiKXxqiDPHKvwfh9zOSfTRfuM9LWFvU lMuGrprwdqx/inLpcfHf9kLo0hu6pqrGm0TZcHXSWmcAHR8bTp4QlGb/TtPH9hrhHmAN vgCDA8W39ywgxa/RJpq86H+eZryyYNNlGTshC+u60QfmAnMk4Ww+lephkpom5zcLSaHM 0xPpTuSkXrX884me6ufsQ4T+KSvnuMlE7IRQVh0GHteTKWw5FbqBja9iaaXWgJQVEu1h oZDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774642804; x=1775247604; 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=6GgdwoB+Ukn6VRO1bHY69INTqGlbDpb72pFrBX8+YRI=; b=IjitElFGU6tMRTEDBpL6LrRRRd6iWvFwVThoR3UnEdnUdgnYerY3lOM3BFFV9GU3J6 FX88u6rntQmmGWbqdRBebB4aM/OimfUmBLx0AwORBsPwVUM3+ndyKDuWFexUR/aT8ptP aTnWXFZx/zFdtS/DI6tJjNznfVgDqdRMIGgaKbwB1tog5TtYVE86eJlboihhgF4vEcY3 sr7RrnILVKpjGDded5nmN7qiTcnl17GdXEA9TcnNu+UxcMbL5GHQj2nAM1whWPpgVCaC qYftzQnVqJJ1XwzLV6SJ8sOu9Zz1MC3RlixaxMFTuqmyLGiNIAG+St7ifmsVkR6Tuvkq irgQ== X-Forwarded-Encrypted: i=1; AJvYcCVYzQNP5MhHsylO0kJ6JIRl+Yh224vAKVaaIuy65VXT4QXUWtnTQvYGq3U2MJPze0hGCOZyuWGcKlg3IVU=@vger.kernel.org X-Gm-Message-State: AOJu0YzaOUrX0PTyS0a4C5IA/naCM+Z0wilNCT6mh/AyweUX1HpP2R89 xlO0Wx2vF/g0pkHvrVARkLSEGIeJ0XLV/+FNmErK58G7WWi42oXGvSeuYv6V7z9YhpYMdAnBgDC 6hyH/r+WYnoiRcgWCxdUAADwVhYQC4CNP++lK2qBMaPy+X8KQYGIpZE6OBJIFn3PWhmM= X-Gm-Gg: ATEYQzxhDYAFilZEkIKXMsTkQ4Jb/tVd2ntXhfnhW689bt5JNplqP8DGpgVPiCqDrD5 DiwgFVHvP69Swt4RiQ5S0EHq/oj8xo9rxzdCWYTk6oMOKEUmolyANU93Ni7k2zLIC5pl9YF5RPL g/EEdbPIUxmNfb4J00IjtEiPAHmSrTdDWdfDHpT/BQe2ThhAsZk8/wDa5Mn6P/tR1Ci5op7FNt3 05YnS04yDasMyq51bZJW1wwLGHe2lqTamijX0ZvjqSB0UsTo7WOgQjQb9AevJ0uOhCuBuCzK1Gk nN5svauRroZAN6DlpJWLmDO8AdRYCh1Z2DV0t7CumQukJ1ectMs+423w+sEEr/GM0PU5i4WogSo qQBPF7+iLIkJYxBHQcymczRX85yNOdNI7opsH9poxgw2BcKEt9FMdtf6z2iwziLFd4VlmNjN2uE JMSNNlArk5Q523c/yCRDJPGsIxIWrE75rksfg= X-Received: by 2002:ac8:5d4a:0:b0:50b:3b54:d78c with SMTP id d75a77b69052e-50ba3948161mr54504371cf.52.1774642803765; Fri, 27 Mar 2026 13:20:03 -0700 (PDT) X-Received: by 2002:ac8:5d4a:0:b0:50b:3b54:d78c with SMTP id d75a77b69052e-50ba3948161mr54504011cf.52.1774642803323; Fri, 27 Mar 2026 13:20:03 -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-38c838931acsm506581fa.19.2026.03.27.13.20.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 13:20:01 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 27 Mar 2026 22:19:55 +0200 Subject: [PATCH v5 3/4] media: qcom: iris: increase H265D_MAX_SLICE to fix H.265 decoding on SC7280 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: <20260327-venus-iris-flip-switch-v5-3-2f4b6c636927@oss.qualcomm.com> References: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@oss.qualcomm.com> In-Reply-To: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@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 X-Mailer: b4 0.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1097; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=XMmEmNUu9RVdz+GiH0qUt2UhQyeVsFtCItZxcUhLc/o=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpxuZrvI7psFdulchuoRFrrm3bjFtNBbfR/r+Ry EdAolOGIA+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCacbmawAKCRCLPIo+Aiko 1RaIB/90YGdp6y9KsL/zEmkoBJmzi5qBdnk0y1Gwq6BLObnMYiqMFx/DuBesNoXn7PUPMlQA3ku RDu7jzZhYbmPlwn3Exz9L5JtPPRFZL9TRxUMJzl98SaKUytGA1gbGFGjwNqLV3AtERe3DP2Q69M PnctmqJoVHm+dLJ6mjssqolccXtC1Eoai/cl8ZvUYNLF6mk+DiGlXoonFE/Viw9HNqE0h8IN/lI f+Zr1B51AUb5rywdJcTNtGVM1qG4Y1zzrH2vrAGcgTZhUv/JonezqrY+2/rOQtgJKP6vTgNC+0L OgmERuZuSQiQltC3L/vP5unyA6X14vZu1lVZtlUOZV59ohuG X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=NfTrFmD4 c=1 sm=1 tr=0 ts=69c6e674 cx=c_pps a=JbAStetqSzwMeJznSMzCyw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=2ewHlduzuzxMNEBOIYQA:9 a=QEXdDO2ut3YA:10 a=uxP6HrT_eTzRwkO_Te1X:22 X-Proofpoint-GUID: GnG9efXzVm4df1ETHQRp5lnJRsv9lzuO X-Proofpoint-ORIG-GUID: GnG9efXzVm4df1ETHQRp5lnJRsv9lzuO X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI3MDE0MSBTYWx0ZWRfX9wEXaDPxKJC/ U0AEvPtCF7CgjU3ZPCTJ9xzhqVLxMp6achwm9ngITzwYJXg7OWRtsEGzLfHC3P89cjvxazEKSBo ByQ0yqdipPETfERROiJziDOKKJoT58p/2qhWR/54cGU99rb5uNhkT9iQa0l5VqFteRBKcZFLfYe d2/XxAScH1QfN4N2TKN3CSNEelySGCpY9jXv1POepo1dgLz4gPDeqvhiQzwsz/MpALawPuA2aQv Z5m3PTPQH1eJY+BsPVVJtMYGAWfwMWZKT1dy0/313eu6ZZ6mITZyWRIUOFRyjxtiRQ+Xh4qxVsm RvJnjK0K1BiJU9Lx6jrRZiEOIH8e1QHEe1t8oW73Q37Z6GdgC0GTYVUcKTUquwkh+Ps2sQFZhbA 7LhZ3Dw8kvRoQQ4ay93dBc59+vf3h+l1TosKN8Lr6giCN45GchOH00lwGkTHNhz3p2CQWxzMzxR fUyKevWfP8IO0x4qpOA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-27_01,2026-03-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 bulkscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603270141 Follow the commit bfe1326573ff ("venus: Fix for H265 decoding failure.") and increase H265D_MAX_SLICE following firmware requirements on that platform. Otherwise decoding of the H.265 streams fails withthe "insufficient scratch_1 buffer size" from the firmware. Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h b/drivers/m= edia/platform/qcom/iris/iris_vpu_buffer.h index 12640eb5ed8c..8c0d6b7b5de8 100644 --- a/drivers/media/platform/qcom/iris/iris_vpu_buffer.h +++ b/drivers/media/platform/qcom/iris/iris_vpu_buffer.h @@ -67,7 +67,7 @@ struct iris_inst; #define SIZE_DOLBY_RPU_METADATA (41 * 1024) #define H264_CABAC_HDR_RATIO_HD_TOT 1 #define H264_CABAC_RES_RATIO_HD_TOT 3 -#define H265D_MAX_SLICE 1200 +#define H265D_MAX_SLICE 3600 #define SIZE_H265D_HW_PIC_T SIZE_H264D_HW_PIC_T #define H265_CABAC_HDR_RATIO_HD_TOT 2 #define H265_CABAC_RES_RATIO_HD_TOT 2 --=20 2.47.3 From nobody Thu Apr 2 14:09:46 2026 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 3B7163A784E for ; Fri, 27 Mar 2026 20:20:07 +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=1774642808; cv=none; b=MkU/yhFAm1gD7oEVD6V5p9EoXJ7LfkR1y/ygCQU7TQFD31pmoCESA4z++LmHk63RW7YTGGKKEB4vy9W/M/zfsWNwr1t0jl19QLZLETHKlYzjcInNPg0nuYFVBEcQwO/TA7YyQkk+JSg0mVP0GeAAlr7OSpVPJm4aZXOoou6QwnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774642808; c=relaxed/simple; bh=Sjkopt6DE1KjMmnlYS+KL4p1o+7A4uaEPfALTWUuNnQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=q35L9oPwuRJuruHOofqDcAKBcVG9ZfBRTOid2QxtmghMXo+2QfIw5B05RJhSinl7BHDrcvFoBdrqUrOSOpHXwdyRP7ayXt0NC3MCwVz9mvHnqigyZ+K2+O47F+0OoMx4sAB5kFbmmbw6sQbAzJuq8GXdWGyksv6XQuNK1b4hKTA= 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=hRYHpQTf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=J78XIAkN; 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="hRYHpQTf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="J78XIAkN" 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 62RI2RcE133569 for ; Fri, 27 Mar 2026 20:20:06 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= QKlKMp4CxZTt/vapbQeq8RXp1kuuPuBSN620uIJs00I=; b=hRYHpQTfWGrmGu78 3adgtOhIoL4Y9p8AHbSdejsVY2I8sGbMBZCh1i3mutLQKlA69Xpby/Mer+bM8+fw kq50jFphA7Oi4CDV61b1bfnrT0Z3CJ3J7YZpaUqBqA5My9WuCK0bCF0uSLVfUpkj N2JQ8+ly68OUNJXEYZvaaWxhLkErG99Jhb9ORLvJ7VppH2K6vurDFQZnMaIbX7sv ebenrYdsF16AG4wzPziI4j5tF6OQVfso6omQHfCzvkxXSMCuKUan8ymLM09ugDNF 9INkHbnkIYbL++XXsLM91t+mYDEw1wBd7tVXa7N7CG+6SJXxB4RHWb+HkmUhk4Y1 veVGnw== Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4d5sxhhj8f-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 27 Mar 2026 20:20:06 +0000 (GMT) Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-89a0a2afc55so80200646d6.0 for ; Fri, 27 Mar 2026 13:20:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1774642805; x=1775247605; 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=QKlKMp4CxZTt/vapbQeq8RXp1kuuPuBSN620uIJs00I=; b=J78XIAkNHUkXFNz7ddW767vAsewgc3Q1/Mjn52U1GgRyQXJc7+oKubFXrq/BVPdwLi /Qx/6YdG579SQZlYIuF//gHEvRcH3KXiJv6+m0E/W8PgRpysk0R5iKpuBoYKOcvgzFOi /mfD2FIDzQe45YtDuA0+rgH+sPK+DLalrjBV45gTPW5ou/aRoabzCEBfXcljfCy7wEO7 DVwGTI7kjUFGvwyF5bhlowAKVyOcTgIusjSyRq+TneazAOF3OOjZSinef1pYadwhDREu EaeEObvogqmtZca7EuR9SF3Ks4MPFnik+hzrIi1njbWx/0NhegHzu1ZT0vS2DkkT8EGb cOww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774642805; x=1775247605; 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=QKlKMp4CxZTt/vapbQeq8RXp1kuuPuBSN620uIJs00I=; b=IKU2V3+7X2s75luZj5/4s5+1ASpuu7ZUOUEFDiT4J3I8jinQizWJSs2C9me2btZ8aO fk2EzL0mW81C4zkrbdNbY/JauT0FL6MHC4L6lYVVn/pef+fwUukq7OGzsiEwuueS3+FW hlPFzGYuq0WLAH861Ktx0xjTLmfM5gJcWr4M4tWG0J+hEm8I39d325r6uGMyUgxGxi8M 0iL2SyMjZ2hoy+/gokxlGb4Rx3C+H/oSuBvdZOxDiAqf6n0K8RWWi0VIad0KWL123KC1 ubKhP4tQMwgrz9fGI2vCE31f8KfiVbP1asrA11BgEFmCp6ekc2Zte6bnJCaEPd7w0X3r Z7QA== X-Forwarded-Encrypted: i=1; AJvYcCXGs2Ni7XaOCLSEivXmjBiy1HXOrvBN+Ew7P02HR+Q3Z6adBs+yJbjiWrFNFBwgGrdpjvHPvN2Y0Lv51ec=@vger.kernel.org X-Gm-Message-State: AOJu0YyAotwgSkAI3otQ6EANPDGqKlhTFEIiSBArVmW+DuIIM0WXLbBL TcmEeEiQw3OxrBXV1gPqLZqeAlIczmEFqEa/oIUohOu1/Rs4+raNWJtCXHaxdkX5QFAGQflkSKM KWMGxV+QSZIZkehM/VLRPRi4Ng2ubULfX6BU1/dcaorF+csYZ5wqlZtbF3fqoBkfk/Ow= X-Gm-Gg: ATEYQzz+wA/4DNE1uhoWNulId9FRMHJq3bGcEYXG0+wsS916v9p/zubBX3GKrUCRbaw DAlsUGI+OfEZ/c6eeUIu/6XGlVCuhH6MXGrh0HktHVJfwHTsMH8SknW+/pKbChiVFUbPbUPCFtS Mhuw2E4L1q6egVttI5Abn7EoN5f2W4mYOVQE+wNeJsVJBuzaDzmapJpHliBVEBylVw4Kmka3r2p RMNQeki2dpWR/UJ/3vpdmn6ejbkqqF9Je5eRRwm+klXdbs5A5G/Qg1koQIRtuUlsuHHLFpXvBkw ZsgufUMS6NxR2j9Zj04qji6TYyqmp8gcJ6jnHSb/XdhZx2fgac347F3mOi+4VqvmVZjPgmusmLe rcj59yG02Yoh/KAIZKB1HnoXs73qpShWht6tTffhP2VcR4YB+tIQRWSUSolj+1+GekhRZeAQWfk M06X4ZEsIaWtSyWa7YpQwSGrPTTekbDWvXY0Q= X-Received: by 2002:ac8:5848:0:b0:50b:41b7:d6c2 with SMTP id d75a77b69052e-50ba39353a2mr51090451cf.47.1774642805328; Fri, 27 Mar 2026 13:20:05 -0700 (PDT) X-Received: by 2002:ac8:5848:0:b0:50b:41b7:d6c2 with SMTP id d75a77b69052e-50ba39353a2mr51089891cf.47.1774642804764; Fri, 27 Mar 2026 13:20:04 -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-38c838931acsm506581fa.19.2026.03.27.13.20.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2026 13:20:03 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 27 Mar 2026 22:19:56 +0200 Subject: [PATCH v5 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: <20260327-venus-iris-flip-switch-v5-4-2f4b6c636927@oss.qualcomm.com> References: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@oss.qualcomm.com> In-Reply-To: <20260327-venus-iris-flip-switch-v5-0-2f4b6c636927@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.15.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5432; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Sjkopt6DE1KjMmnlYS+KL4p1o+7A4uaEPfALTWUuNnQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpxuZr5r6OVOXEdzWas4EPQjAiJUEbw3UkgCdwv DATYz18u6qJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCacbmawAKCRCLPIo+Aiko 1aIHB/0drkiE8COAyTwG3I6NtvLdH+wqx3VfHE525Wjy5OIjUKAZue4VLoohz4BpWNv9nEXuLW2 mFNJQY/yKcJLvosOAAeugg0FyV5PZLxnFSAsivsgISS0+pO0w34ga/8PHZsFHv8RIm3ekO70nda y0VI+i23F46mD7qrYlet/PxsEd1sEcXNSvBx8FAxGcx536iAq+htojrmIHeCElT3gt530j1dXUp um9+5CATUhwKCQRmkYcf9PxO1K2eBfOsesEFaKi1XcWxUZ3/2OtLssi9kINQKofgaW9uksMml4t mPuxykXCqeOeXMTXwGGG8A4RnAkHjzEIJOOVrZkRQzvmB9Ua X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=QZVrf8bv c=1 sm=1 tr=0 ts=69c6e676 cx=c_pps a=oc9J++0uMp73DTRD5QyR2A==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=PTCOktDilvW4XOe9n6IA:9 a=QEXdDO2ut3YA:10 a=iYH6xdkBrDN1Jqds4HTS:22 X-Proofpoint-ORIG-GUID: lCHgfUYnK6M42UwUrrJ-ydGlIB9hGE9T X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzI3MDE0MSBTYWx0ZWRfX1KdMgJNAIT3L ay6Aq2buDWSDJPjWxiwAkihWRlofFhylKG/KzE6wW74XvJPvdJCcIBKZ1BiNpqXO0nAsC7hzHqw K2+Uidgi+uaSt1WlYqxlwUJPV0/fDqwuDE1BlGYvgLaTW2OhbI7+34Wc93coA8cCjg8iXkHpcMp 1m4PgTFfqhLu4JpeTuf4Nc13HiH5m45+h2/mNV27JdIh8EGpJs4dzPeZpViyErdeO5wR5VpVQUo OF4TI6WRTFKNrdpwDtQ+LxAW/eiFJzpXwN33qV6AlyOw2SIjZvnx2kMmZ4Mtkmk2UffsN95V/vq PvxE9MxCVO+8z0gehDsAL4RRxe15gX/A1gDUGY7FWDKMiD+6fJaBTuP66prGNenW9gJuWoNu67R t3F3bk3VTXPqZVse8e5cEqwezzl/XrTyst2L/3ctviKomjp9Z6lEITMalDcgHtsSNXEaLz4XO9y Y+FPhToxGekMoT/newA== X-Proofpoint-GUID: lCHgfUYnK6M42UwUrrJ-ydGlIB9hGE9T X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-03-27_01,2026-03-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 clxscore=1015 spamscore=0 adultscore=0 priorityscore=1501 impostorscore=0 phishscore=0 lowpriorityscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603270141 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 Reviewed-by: Vikash Garodia Signed-off-by: Dmitry Baryshkov --- drivers/media/platform/qcom/iris/Makefile | 5 +---- 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 +++++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/qcom/iris/Makefile b/drivers/media/plat= form/qcom/iris/Makefile index 2abbd3aeb4af..2fde45f81727 100644 --- a/drivers/media/platform/qcom/iris/Makefile +++ b/drivers/media/platform/qcom/iris/Makefile @@ -10,6 +10,7 @@ qcom-iris-objs +=3D iris_buffer.o \ iris_hfi_gen2_packet.o \ iris_hfi_gen2_response.o \ iris_hfi_queue.o \ + iris_platform_gen1.o \ iris_platform_gen2.o \ iris_power.o \ iris_probe.o \ @@ -26,8 +27,4 @@ qcom-iris-objs +=3D iris_buffer.o \ iris_vpu_buffer.o \ iris_vpu_common.o \ =20 -ifeq ($(CONFIG_VIDEO_QCOM_VENUS),) -qcom-iris-objs +=3D iris_platform_gen1.o -endif - obj-$(CONFIG_VIDEO_QCOM_IRIS) +=3D qcom-iris.o 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 7e639760c41d..45ce57406a4e 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