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 E36522C0261 for ; Fri, 10 Jul 2026 04:23:48 +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=1783657432; cv=none; b=fneMxmj8uQUgF4tIC6jKnpvYhMq2aUaA9zZrV5WNZDiK4xvSu3cIrWGaczYEZleuJlV8BYXp7xcobbPciC6NzdVHM7s/4z1F/xH8JrKB0mXDhcefINZyu69ueOJqjti8jDppTn3OD25qKTrBCGM3aWQHF7VsiLnJ0wrx6CnzsD8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783657432; c=relaxed/simple; bh=q+GdnQAxL/KhJDXHLDPS8BYkN104mPLRh/AML/oTlNw=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Lpz/DP7RkmfJDOG00+KAdh5pRaFb8WKPBbjJJt3K2en0NSjLF5MS0+MpY+XBonCz8e4bs9rUnifheLYUJ34aF/NL53sS6iZenG/Gw2cNIkEVYoQC5IZX4Ozb5CQTFh5RkaEk4NSC3h4o/8zcCd1ss2zSpRPI/9rf/4f4Ut3SOP4= 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=QJ10hBEZ; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=FcjDPdxL; 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="QJ10hBEZ"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="FcjDPdxL" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66A3mXF63838038 for ; Fri, 10 Jul 2026 04:23:48 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= l9h9Iz/a5W8eF88pzYnVKouzL+ejaGHBujqlpMHXUZ8=; b=QJ10hBEZo70qBIFe v2WpbknWqUi1T7fgCwCMH+Cjg/iG+O3k/9IW9Nffe624W4zANpOkQ5Pu96U+7hr3 HSdi1d6cP6BmIvaMcOaDTkz+O9uEogfBMa9FpTajwO8vL1g3OCGs0G96LU1yurEM tZXLnt7/zGl3U5MNBFF5KJTYYsy/qurYHEWAjNycLJ3LXv1j0yBWncT4lPvDsN/L H0u/cgBryodu0KJo4Crqrv/1legAbKIRx3eAlzalSnIPvamxdgMLRuWMUykKhnaF acanIOQ7hy+yC1zHytXMj902K5bWwCG98k7eoXK5dancs4DvpLZP7Q8tsW4LX8yQ 4iaCwA== Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fanwe8pcx-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 10 Jul 2026 04:23:48 +0000 (GMT) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-381ed6616f7so823736a91.1 for ; Thu, 09 Jul 2026 21:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1783657427; x=1784262227; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=l9h9Iz/a5W8eF88pzYnVKouzL+ejaGHBujqlpMHXUZ8=; b=FcjDPdxLlFdbdEFTkfJ3QBhY/QSY4moPFC/89alFpdaCmwrPOZm5sVV/+K7GajnJJg OcBpXy/ePiNgKm1GF4fN3QLtWqcvcjbYQR83bNRiQhQfQg7/wfEWYYa4Qa3F8i5gZnl1 W+J7K+uAiwLjotLsKeuCeExSOwgEXeRbTuvCzMPtCCJ4tZAZAasRNMEIHGEa6N5sr57V zmfUH27xt5ZW5uSwTe4AjBNGnmg0+xGfwFeoC/rahTN81gakLaNjZFgG+8/fxP4/EMwt eyt2l+ESJLpN4ioNobQ1a5F3lhDazzL2JepPnzodceyykrGmMtpo+TnzL0+3Z1ALBqYs hRKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783657427; x=1784262227; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=l9h9Iz/a5W8eF88pzYnVKouzL+ejaGHBujqlpMHXUZ8=; b=FzZ3lIT6Ymqy1y1j46upzeOwmNNSMYhzLXTFgOgTueuqS0s8bMqcBWxDEB42lFVjNb 5PYrrBMFjtTdnPLH2i4mr6s8mb/N2wvsU0GOTEv2IAVgd0MjLgah5/pX8dxBqJWv4TDg /Z+n2P+y0wLW7Drm0ahM2AHOe3M3qDdkb7OvXSoFTipDXdfpiD81G+sLYyFi3Y3zYIbC QZfqFPBGjMv/YY/8M8zVr1ZKqaA6tCXY2CUUdLjH/rSy2W+Au7RXN+MAQT3VHJ9frLVb +fpG6te2v1+wGVOpm7VhLpmqocYaFONts9Y4qpbeOHnmSN0KyqcA7b94Zp8gvi8/9lRG 4/hQ== X-Forwarded-Encrypted: i=1; AHgh+RrKbWvYOjlKQtqjoYhfkY18+oWhk7JggsY5xn4QymbMm0PxFBUizveqkQIZRBZDMfZuQUrnuOBHq8Nr@vger.kernel.org X-Gm-Message-State: AOJu0YwkMqKtW1u4neXkZeY894RZNtPsDRg/DoBqgpEQ5EyX9mDJn5Xy tI8UAJst8emNmloshVI1VcQP3kVZqXmvpUZCPA1fg6niUPN/gQCMfGrCqRr8zoa9EuAWSkAs2rU TrFM5eAZBwS1GfOrIraXq8Jh3EkSej2xI8hPbsZNQqlZxbSO1FzgPGTv3ikYwP7Zl X-Gm-Gg: AfdE7clVvqIzYUZNStvODBWaCJPF/c1APOknpTBiygbZwq3BKqdDjROQ9KWEnKocNCD Eq5bj3+zdlEL6oo0c7rqcLiw/+a+GTeUwJQA0XwERIwz1Ve96tD4GgCfFI8zvTOrXOYWLM+WHjY P5wHvocWdF8AXnKqBvGY4pJoS6Dygo6YgRsoHqVB0UUOqa+lplPkTnqY+SDtcyKjTNqLbRT0xFb 0OD0kETKKXggUbXcaTtWGrCxAtC1x2dxntNV+O/D+OHPJBOglF+H8pdz6THUuPtNjA5ur82+KfR u4r4sPP3QpmeYV9gQuCpgazJZtMbiDPj+t6f4pDwx0mbMOvC1kmP3G5ITZelgh4ZA+FkhdwU0X7 uKXlw+uE1E2nwedfLIAggoAbbY13Q6XMonTeCV7f28mI= X-Received: by 2002:a17:90b:1fd0:b0:37f:9ce2:348c with SMTP id 98e67ed59e1d1-389434633b8mr10372758a91.29.1783657427317; Thu, 09 Jul 2026 21:23:47 -0700 (PDT) X-Received: by 2002:a17:90b:1fd0:b0:37f:9ce2:348c with SMTP id 98e67ed59e1d1-389434633b8mr10372726a91.29.1783657426778; Thu, 09 Jul 2026 21:23:46 -0700 (PDT) Received: from [10.206.105.200] ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-31174accae5sm56586238eec.29.2026.07.09.21.23.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 09 Jul 2026 21:23:46 -0700 (PDT) Message-ID: Date: Fri, 10 Jul 2026 09:53:38 +0530 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: [PATCH v7 01/18] media: iris: Add Gen2 firmware autodetect and fallback To: Dmitry Baryshkov , Vikash Garodia , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dikshita Agarwal References: <20260709-iris-ar50lt-v7-0-76af9dd4d1f6@oss.qualcomm.com> <20260709-iris-ar50lt-v7-1-76af9dd4d1f6@oss.qualcomm.com> Content-Language: en-US From: Vishnu Reddy In-Reply-To: <20260709-iris-ar50lt-v7-1-76af9dd4d1f6@oss.qualcomm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Authority-Analysis: v=2.4 cv=LbIMLDfi c=1 sm=1 tr=0 ts=6a5073d4 cx=c_pps a=UNFcQwm+pnOIJct1K4W+Mw==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=uDXHxCxWII9kAjgowtcA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=uKXjsCUrEbL0IQVhDsJ9:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzEwMDAzNyBTYWx0ZWRfX3vlrh5/U8htB 7EjvuCO8KsYOqmfgKRgK21hbFgU3HRRU4KEFkZP1Dx1Rj43ljq6127ivWIKvqEHT7rArCy9gdCC LRGQrQZSVOOMOwkZZdij0RPd4XyMMxYXXxuWLRT4YL8ZLYymd0B8IEaXnPloQ0/u5kq3ix75a1m lpJGuXWHq9ElFjY3mf6MuYbTo8hL2OvR7iEwq6imXSDvQT/r5FG06W2s474Pf6OFN+GsPX57wGs A35Owfphvr/Hv702leh27z9jopyYArOmdO2s5mfPHv6JS1Cd5s+pR9e9iLyJfyK0uVSjRBuL9i7 PgbPfQWJQX263zThxyfEGr/MgCUBVgv2uCDaFvUXDQd2/S3qTbzaE1v++y7uTbRTTLPrPk8REdh AkzWpv6ybVz+5pb1+8QnyGCdH60KXln0g6L0iYxsHxWT5K3z7uZyEIZeyRqcVFy1bpkS48NgwdC Llx1s7UyD1ciykKnv0Q== X-Proofpoint-ORIG-GUID: siuBYq0tWcF_cYdKZdb2tL44MTMhX0kS X-Proofpoint-Spam-Info: AW1haW4tMjYwNzEwMDAzNyBTYWx0ZWRfXzZegrppD6Zgl wph0ZX6SIvrxk4vnIXud/4TamIE2Ck4Myju2d+0Q/ZwoTHlIzxY8d/JatDWgL4oriBN8aaeavkH LF0EiB7uo2CIofSLcLommUrn8XvFsHw= X-Proofpoint-GUID: siuBYq0tWcF_cYdKZdb2tL44MTMhX0kS 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-10_01,2026-07-09_04,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 suspectscore=0 lowpriorityscore=0 bulkscore=0 clxscore=1015 impostorscore=0 priorityscore=1501 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607100037 On 7/9/2026 7:11 PM, Dmitry Baryshkov wrote: > From: Dikshita Agarwal > > Some Iris platforms support both Gen1 and Gen2 HFI firmware images. > Update the firmware loading logic to handle this generically by > preferring Gen2 when available, while safely falling back to Gen1 > when required. > > The firmware loading logic is updated with the following priority: > 1. Device Tree (`firmware-name`): If specified, load unconditionally. > 2. Gen2 default : If no DT override exists, select the Gen2 firmware > descriptor when present and attempt to load the corresponding > firmware image. > 3. Gen1 Fallback: If loading the Gen2 firmware fails and a Gen1 > descriptor is available, retry with the Gen1 firmware image. > > When a platform provides both Gen1 and Gen2 firmware descriptors and the > firmware is loaded via a DT override, the driver detects the > firmware generation at runtime before authentication by inspecting > the firmware data. The firmware is classified as Gen2 if the > QC_IMAGE_VERSION_STRING starts with "vfw" or matches the > "video-firmware.N.M" format with N >= 2. > > If a Gen1 firmware image is detected in this case, the driver switches > to the Gen1 firmware descriptor and associated platform data so that > the correct HFI implementation is used. > > This change makes firmware generation detection platform‑agnostic, > preserves DT overrides, prefers newer Gen2 firmware when available, > and maintains compatibility with platforms that only support Gen1. > > Signed-off-by: Dikshita Agarwal > Co-developed-by: Dmitry Baryshkov > Signed-off-by: Dmitry Baryshkov > --- > drivers/media/platform/qcom/iris/iris_core.c | 2 + > drivers/media/platform/qcom/iris/iris_firmware.c | 146 ++++++++++++++++++--- > .../platform/qcom/iris/iris_platform_common.h | 6 +- > .../media/platform/qcom/iris/iris_platform_vpu2.c | 11 +- > .../media/platform/qcom/iris/iris_platform_vpu3x.c | 10 +- > drivers/media/platform/qcom/iris/iris_probe.c | 4 - > drivers/media/platform/qcom/iris/iris_vidc.c | 1 + > 7 files changed, 147 insertions(+), 33 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_core.c b/drivers/media/platform/qcom/iris/iris_core.c > index 52bf56e517f9..6dbe18be5b49 100644 > --- a/drivers/media/platform/qcom/iris/iris_core.c > +++ b/drivers/media/platform/qcom/iris/iris_core.c > @@ -6,6 +6,7 @@ > #include > > #include "iris_core.h" > +#include "iris_ctrls.h" > #include "iris_firmware.h" > #include "iris_state.h" > #include "iris_vpu_common.h" > @@ -79,6 +80,7 @@ int iris_core_init(struct iris_core *core) > goto error_unload_fw; > > core->iris_firmware_data->init_hfi_ops(core); > + iris_session_init_caps(core); > > ret = iris_hfi_core_init(core); > if (ret) > diff --git a/drivers/media/platform/qcom/iris/iris_firmware.c b/drivers/media/platform/qcom/iris/iris_firmware.c > index 1a476146d758..a3aa41aa1e66 100644 > --- a/drivers/media/platform/qcom/iris/iris_firmware.c > +++ b/drivers/media/platform/qcom/iris/iris_firmware.c > @@ -16,20 +16,138 @@ > > #define MAX_FIRMWARE_NAME_SIZE 128 > > -static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) > +/* Detect Gen2 firmware by scanning the blob for: > + * QC_IMAGE_VERSION_STRING= > + * and then checking: > + * - version starts with "vfw", OR > + * - version matches "video-firmware.N.M" with N >= 2 > + */ > + > +static bool iris_detect_gen2_from_fwdata(const u8 *data, size_t size) > +{ > + static const char *marker = "QC_IMAGE_VERSION_STRING="; > + const size_t mlen = strlen(marker); > + static const char *vfw = "vfw"; > + const size_t vfwlen = strlen(vfw); > + static const char *vf = "video-firmware."; > + const size_t vflen = strlen(vf); > + > + for (size_t i = 0; i + mlen < size; i++) { > + const char *found; > + > + if (memcmp(data + i, marker, mlen)) > + continue; > + > + found = data + i + mlen; > + size -= i + mlen; > + > + /* vfw => Gen2 */ > + if (size > vfwlen && !memcmp(found, vfw, vfwlen)) > + return true; > + > + if (size < vflen || > + memcmp(found, vf, vflen)) > + return false; > + > + found += vflen; > + size -= vflen; > + > + /* > + * video-firmware.1.x is Gen1. > + * video-firmware.2.x and video-firmware.10.x are Gen2. > + */ > + return size >= 2 && > + (*found >= '2' || (*found == '1' && found[1] != '.')); > + } > + > + return false; > +} > + > +static const struct firmware *iris_detect_firmware(struct iris_core *core, > + const char **fw_name) > +{ > + const struct iris_firmware_desc *desc; > + const struct firmware *firmware; > + bool has_both_gens; > + int ret; > + > + *fw_name = NULL; > + ret = of_property_read_string_index(dev_of_node(core->dev), "firmware-name", 0, fw_name); > + > + /* > + * A platform may support both Gen1 and Gen2 firmware; which one is used > + * depends on the firmware image installed on the system, not on the > + * hardware. That installed image does not change while the device is > + * bound, so detect the generation only once and reuse the chosen > + * descriptor on later core bring-ups (e.g. after a system error > + * recovery). Besides avoiding the redundant probing, this ensures > + * core->iris_firmware_desc and iris_firmware_data are published exactly > + * once, before any session exists, so the lockless readers in the ioctl > + * paths never observe a reassignment. > + */ > + if (core->iris_firmware_desc) { > + if (ret) > + *fw_name = core->iris_firmware_desc->fwname; > + ret = request_firmware(&firmware, *fw_name, core->dev); > + return ret ? ERR_PTR(ret) : firmware; > + } > + > + has_both_gens = core->iris_platform_data->firmware_desc_gen2 && > + core->iris_platform_data->firmware_desc_gen1; > + > + if (core->iris_platform_data->firmware_desc_gen2) > + desc = core->iris_platform_data->firmware_desc_gen2; > + else if (core->iris_platform_data->firmware_desc_gen1) > + desc = core->iris_platform_data->firmware_desc_gen1; > + else > + return ERR_PTR(-EINVAL); > + > + if (ret) { > + /* No firmware-name in DT: select by probing Gen2 then Gen1. */ > + *fw_name = desc->fwname; > + if (has_both_gens) > + ret = firmware_request_nowarn(&firmware, *fw_name, core->dev); > + else > + ret = request_firmware(&firmware, *fw_name, core->dev); > + if (ret && has_both_gens) { > + desc = core->iris_platform_data->firmware_desc_gen1; > + *fw_name = desc->fwname; > + ret = request_firmware(&firmware, *fw_name, core->dev); > + } > + if (ret) > + return ERR_PTR(ret); > + } else { > + /* firmware-name given: load it and detect its generation. */ > + ret = request_firmware(&firmware, *fw_name, core->dev); > + if (ret) > + return ERR_PTR(ret); > + > + if (has_both_gens && > + !iris_detect_gen2_from_fwdata((const u8 *)firmware->data, firmware->size)) { > + dev_info(core->dev, "Gen1 FW detected in %s\n", *fw_name); > + desc = core->iris_platform_data->firmware_desc_gen1; > + } > + } > + > + /* Publish iris_firmware_data first, then iris_firmware_desc (the guard). */ > + core->iris_firmware_data = desc->firmware_data; > + core->iris_firmware_desc = desc; > + > + return firmware; > +} > + > +static int iris_load_fw_to_memory(struct iris_core *core) > { > const struct firmware *firmware = NULL; > struct device *dev = core->dev; > struct resource res; > phys_addr_t mem_phys; > + const char *fw_name; > size_t res_size; > ssize_t fw_size; > void *mem_virt; > int ret; > > - if (strlen(fw_name) >= MAX_FIRMWARE_NAME_SIZE - 4) > - return -EINVAL; > - > ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res); > if (ret) > return ret; > @@ -37,9 +155,9 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) > mem_phys = res.start; > res_size = resource_size(&res); > > - ret = request_firmware(&firmware, fw_name, dev); > - if (ret) > - return ret; > + firmware = iris_detect_firmware(core, &fw_name); > + if (IS_ERR(firmware)) > + return PTR_ERR(firmware); > > fw_size = qcom_mdt_get_size(firmware); > if (fw_size < 0 || res_size < (size_t)fw_size) { > @@ -66,18 +184,12 @@ static int iris_load_fw_to_memory(struct iris_core *core, const char *fw_name) > int iris_fw_load(struct iris_core *core) > { > const struct tz_cp_config *cp_config; > - const char *fwpath = NULL; > int i, ret; > > - ret = of_property_read_string_index(core->dev->of_node, "firmware-name", 0, > - &fwpath); > - if (ret) > - fwpath = core->iris_firmware_desc->fwname; > - > - ret = iris_load_fw_to_memory(core, fwpath); > + ret = iris_load_fw_to_memory(core); > if (ret) { > - dev_err(core->dev, "firmware download failed\n"); > - return -ENOMEM; > + dev_err(core->dev, "firmware download failed %d\n", ret); > + return ret; > } > > ret = qcom_scm_pas_auth_and_reset(IRIS_PAS_ID); > @@ -99,7 +211,7 @@ int iris_fw_load(struct iris_core *core) > } > } > > - return ret; > + return 0; > } > > int iris_fw_unload(struct iris_core *core) > diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h > index c9256f2323dc..55a4fa356985 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_common.h > +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h > @@ -289,11 +289,7 @@ struct iris_firmware_desc { > }; > > struct iris_platform_data { > - /* > - * XXX: replace with gen1 / gen2 pointers once we have platforms > - * supporting both firmware kinds. > - */ > - const struct iris_firmware_desc *firmware_desc; > + const struct iris_firmware_desc *firmware_desc_gen1, *firmware_desc_gen2; > > const struct vpu_ops *vpu_ops; > const struct icc_info *icc_tbl; > diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c > index 6e06a32822bb..961dce2e6aa9 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_vpu2.c > +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu2.c > @@ -22,6 +22,12 @@ static const struct iris_firmware_desc iris_vpu20_p1_gen1_desc = { > .fwname = "qcom/vpu/vpu20_p1.mbn", > }; > > +static const struct iris_firmware_desc iris_vpu20_p1_gen2_s6_desc = { > + .firmware_data = &iris_hfi_gen2_data, > + .get_vpu_buffer_size = iris_vpu33_buf_size, > + .fwname = "qcom/vpu/vpu20_p1_gen2_s6.mbn", > +}; > + > static const struct iris_firmware_desc iris_vpu20_p4_gen1_desc = { > .firmware_data = &iris_hfi_gen1_data, > .get_vpu_buffer_size = iris_vpu_buf_size, > @@ -65,7 +71,8 @@ static const struct tz_cp_config tz_cp_config_vpu2[] = { > }; > > const struct iris_platform_data sc7280_data = { > - .firmware_desc = &iris_vpu20_p1_gen1_desc, > + .firmware_desc_gen1 = &iris_vpu20_p1_gen1_desc, > + .firmware_desc_gen2 = &iris_vpu20_p1_gen2_s6_desc, > .vpu_ops = &iris_vpu2_ops, > .icc_tbl = iris_icc_info_vpu2, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu2), > @@ -94,7 +101,7 @@ const struct iris_platform_data sc7280_data = { > }; > > const struct iris_platform_data sm8250_data = { > - .firmware_desc = &iris_vpu20_p4_gen1_desc, > + .firmware_desc_gen1 = &iris_vpu20_p4_gen1_desc, > .vpu_ops = &iris_vpu2_ops, > .icc_tbl = iris_icc_info_vpu2, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu2), > diff --git a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c > index 2c63adbc5579..74626b35d9cb 100644 > --- a/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c > +++ b/drivers/media/platform/qcom/iris/iris_platform_vpu3x.c > @@ -90,7 +90,7 @@ static const struct tz_cp_config tz_cp_config_vpu3[] = { > * - inst_caps to platform_inst_cap_qcs8300 > */ > const struct iris_platform_data qcs8300_data = { > - .firmware_desc = &iris_vpu30_p4_s6_gen2_desc, > + .firmware_desc_gen2 = &iris_vpu30_p4_s6_gen2_desc, > .vpu_ops = &iris_vpu3_ops, > .icc_tbl = iris_icc_info_vpu3x, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu3x), > @@ -119,7 +119,7 @@ const struct iris_platform_data qcs8300_data = { > }; > > const struct iris_platform_data sm8550_data = { > - .firmware_desc = &iris_vpu30_p4_gen2_desc, > + .firmware_desc_gen2 = &iris_vpu30_p4_gen2_desc, > .vpu_ops = &iris_vpu3_ops, > .icc_tbl = iris_icc_info_vpu3x, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu3x), > @@ -154,7 +154,7 @@ const struct iris_platform_data sm8550_data = { > * - controller_rst_tbl to sm8650_controller_reset_table > */ > const struct iris_platform_data sm8650_data = { > - .firmware_desc = &iris_vpu33_p4_gen2_desc, > + .firmware_desc_gen2 = &iris_vpu33_p4_gen2_desc, > .vpu_ops = &iris_vpu33_ops, > .icc_tbl = iris_icc_info_vpu3x, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu3x), > @@ -185,7 +185,7 @@ const struct iris_platform_data sm8650_data = { > }; > > const struct iris_platform_data sm8750_data = { > - .firmware_desc = &iris_vpu35_p4_gen2_desc, > + .firmware_desc_gen2 = &iris_vpu35_p4_gen2_desc, > .vpu_ops = &iris_vpu35_ops, > .icc_tbl = iris_icc_info_vpu3x, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu3x), > @@ -220,7 +220,7 @@ const struct iris_platform_data sm8750_data = { > * - different num_vpp_pipe > */ > const struct iris_platform_data x1p42100_data = { > - .firmware_desc = &iris_vpu30_p1_gen2_desc, > + .firmware_desc_gen2 = &iris_vpu30_p1_gen2_desc, > .vpu_ops = &iris_vpu3_ops, > .icc_tbl = iris_icc_info_vpu3x, > .icc_tbl_size = ARRAY_SIZE(iris_icc_info_vpu3x), > diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c > index c2dcb50a2782..7fe31136df21 100644 > --- a/drivers/media/platform/qcom/iris/iris_probe.c > +++ b/drivers/media/platform/qcom/iris/iris_probe.c > @@ -251,8 +251,6 @@ static int iris_probe(struct platform_device *pdev) > return core->irq; > > core->iris_platform_data = of_device_get_match_data(core->dev); > - core->iris_firmware_desc = core->iris_platform_data->firmware_desc; > - core->iris_firmware_data = core->iris_firmware_desc->firmware_data; > > core->ubwc_cfg = qcom_ubwc_config_get_data(); > if (IS_ERR(core->ubwc_cfg)) > @@ -271,8 +269,6 @@ static int iris_probe(struct platform_device *pdev) > if (ret) > return ret; > > - iris_session_init_caps(core); > - > ret = v4l2_device_register(dev, &core->v4l2_dev); > if (ret) > return ret; > diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c > index 14d63dc76c9b..33edbc5cab8f 100644 > --- a/drivers/media/platform/qcom/iris/iris_vidc.c > +++ b/drivers/media/platform/qcom/iris/iris_vidc.c > @@ -9,6 +9,7 @@ > #include > #include > > +#include "iris_ctrls.h" > #include "iris_vidc.h" > #include "iris_instance.h" > #include "iris_vdec.h" Reviewed-by: Vishnu Reddy