From nobody Tue Apr 7 14:36:44 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 A41DD34B676 for ; Fri, 13 Mar 2026 03:30:49 +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=1773372651; cv=none; b=Uscv+BJgiFbncS+l8c4F2oeN4ocuL1m4MQ4hqkAMkO6BVmj/w4IUm9MP9Rp5jbBKV//Ug36fOWZS28/mWY8YWj4W8zu7grc2r3xmWzcsIu80nbBkoCHrzZ/h2r3Y/u+bNlNuPcb+dxEttp7gF5DEaW3qyLgsC5jTFjt8r6mMYTQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773372651; c=relaxed/simple; bh=gaEN/iRx+uND/rQB+n50KYRije5zgiGEMO79+6560uA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nMKKUQBm+ILsB51mFU13FjyEep83fgEWpP34ZEFsFNU3lz6A4wTsmCPVgmQM1aSQP5VIqnNaNvXJJ3uEAML20qKz1BnhbP2TUF39kjShlVEDjOcxcuaIHiXrir0zIeIdaGX/IST6csjzVyvspqaj3ww6t9r2eLkOORaxMedBdjE= 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=OI2ojqg+; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=cPa8U1js; 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="OI2ojqg+"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="cPa8U1js" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62CINNGk4132664 for ; Fri, 13 Mar 2026 03:30:49 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= UE1Bky9/QQPUrhOj5AxnExP2mYHshOHuCas4gxsHHCQ=; b=OI2ojqg+jVp5OxfD 4YM+T2fY9ReSBvB3Hu8+k1Xm9WTVD5JGN9uyh8SiXBP7mB/VMNPTt/G597O/Dx2K 4s5O7vtLLepxTQe9x4EpVGLegoSowtpQcAPrBE9Ka7rovHHWzGPIS0xhlZIVCIIE 10OZ1wZWMa+hlKP+fUofrogFeXrtG6Odxx2VqFkZzb3Hoc4dCKu/QAV05RyL5ySf rKlnqs9oe8/615XNWGgwU1/hJtLRoQBBp6ysSRy/lxnfJsfWt/Cw0YQsfZOpq4cJ 0GnTTs6YtsGSdGhBWrRM6gZWbQfPbhFY2PvGhfPyABwRKr0cKVdm8eAjZUW+fJSY 4fduEg== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cuh4w4bjt-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 13 Mar 2026 03:30:48 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8cd849cd562so1095450885a.0 for ; Thu, 12 Mar 2026 20:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773372648; x=1773977448; 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=UE1Bky9/QQPUrhOj5AxnExP2mYHshOHuCas4gxsHHCQ=; b=cPa8U1jssoHVGX1Q7Oe3D7uXnkNcna4BLKVUexM+BpQt4gemsDZX1FKdau5O8rPDtH 3rV9VJzv+Ha2cZiFEnrdmbS4JYxDsPRb1h84T5DqTT93No+Z68+20VGBWVN90xx9LIHT oJFWrBcIHw90HUTkzj3ZOnF8gwJ6robKdkPcIhMmPVeMHfeCmOy4d4e/aS5qXU6/jedz Qj84JHIzbOFsxkwSdziAZK4ZpTswv+LQXfx3Klv3e11cklhaHaBqmS33AzgbmWBGI50j 0DLTP8RwG6hE7+QoSFO84csA8lMrATp2A2E1ro0rWBXrQVBYBSbtHmzl1WcOxRRb0qW3 yr3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773372648; x=1773977448; 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=UE1Bky9/QQPUrhOj5AxnExP2mYHshOHuCas4gxsHHCQ=; b=jT6fyJWEjFyfUvvQCOP8oI5CxuQztXxYYduQ6NlyfojIlS8BbOhgTqP14V/T9HqGyE okyFi3g9IbtVUBWKGBZnYUX17+7f5NgzGKcCPmBQxM8dAJj2PPQb6Xx9d6Uwcft+wXHA 5TlUbYV2gL2qYt8wQSFrWgG7NV8Lrx2jdqvTsPPJ5LHlT924377Yum72DH2oqLxbR7YQ fE3oa0Xc2dgGvQpr7GeaY8MQl/64VQIMFeaKXj6hI9V0TJ3vspnOFjqp/QjecB4IUtTy spq1nFTOzq28zQyv++UGDohgyd2J3sZvnChcmIdaJYCg7zYocCjCV3pzMhJbA6QOjZnc 8IfQ== X-Forwarded-Encrypted: i=1; AJvYcCVHzhUVG6XqnFvT4L5q2SjM4OoP5o4PX+MOUooLC9MvRnyVPQwg2+gB26dAKZ4AT7IggbWCXIOj+IH+EwA=@vger.kernel.org X-Gm-Message-State: AOJu0YxXD2QL1ReQ0uUEB/hAd5wzUvvb/7jRkYuMeU/Aw3Eeu2QwYED/ XPMMdmLczNolaUOhy4lc8p/CMyEYgvwqOv037yrIdM60goIjQrezH18r+BjWu1ScKVVedroYl3p GsbynPn9v7QOJrFB5NhfrY0142n5ToREypNn34KBZ+rBLv3nqO/ekeMgwBCW7+lSs0R8= X-Gm-Gg: ATEYQzzq2DsHeGPIBaV0tXC7myKcCFxy3vHTDUWiAuBz77+UZZuKLQ2LAieX27KDK7M c+JFpKElI+J6wr4d1cqjhzWMtQm7X/RpTAGwtsm+xl6h90vsBFYSxaid9XVKvUa0Ld6rryC8iW+ ne61xYG6mmCyYuZfH1BGjKGJYAN87RESsFv4rnCBH8RH1zzfDe1F/nY1XZR6Yl88p4QuCmhfiZs a50nZb2cC9DdgAtg9SPnGn5u4Sn4HuM5s5iEjEyrGldMgbFoDlZIpcNVNg8JbVlRQj6Ta0h3iKy eYhqhJ4sEadOIKlQZW2XffMZmU0wblJpQfYjd281R7jl5N2ktdYrCfNpnvSCrk0uYBeK3jH3lqp dX7XDu1UEN5j05sI4+2QzUlQvMt6Tve/DS4FA7TkxE5/IPrxrmVDNhmLr4qD95TnhnNOrS7xHpo X0WJb0gcyvEppL7nEfQ7mu8vvv/70laKlEKyE= X-Received: by 2002:a05:620a:4691:b0:8cd:8f04:50ec with SMTP id af79cd13be357-8cdb5a5479cmr275440185a.2.1773372647827; Thu, 12 Mar 2026 20:30:47 -0700 (PDT) X-Received: by 2002:a05:620a:4691:b0:8cd:8f04:50ec with SMTP id af79cd13be357-8cdb5a5479cmr275438485a.2.1773372647327; Thu, 12 Mar 2026 20:30:47 -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-38a67d93576sm11254901fa.11.2026.03.12.20.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 20:30:45 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 13 Mar 2026 05:30:23 +0200 Subject: [PATCH v4 6/8] media: qcom: iris: move get_instance to iris_hfi_sys_ops 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: <20260313-iris-platform-data-v4-6-14927df4906d@oss.qualcomm.com> References: <20260313-iris-platform-data-v4-0-14927df4906d@oss.qualcomm.com> In-Reply-To: <20260313-iris-platform-data-v4-0-14927df4906d@oss.qualcomm.com> To: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=9129; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=gaEN/iRx+uND/rQB+n50KYRije5zgiGEMO79+6560uA=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBps4TMjkGNLswTxxfFF+g9ExHv5rrXzQD9mj5Gi Uf1pzbU9sGJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabOEzAAKCRCLPIo+Aiko 1WD3B/4zavzahlGIWOA9P19FKYegihFGVdOxUIynM4OumSg8otmRCa6AueJZGdgVYv9bkxSXgj+ /JdN5kpZQXRT61VLryaq57ckj1PXzdIf8wiUWwy9LjYVMwOaiRB9o7+jh4YWmKI/mb7bIGKXyPW vZt2I3T0qoMN+K6ARJ4gWVPDOktkFDbl+1Mh8JqGlF1pUsVYypSNCpt1HliZkufWcvZ0n+WpXQ5 XEONNPGtQLU09yGxXg3dDp4vZPJjDQai7eJw7kJ/yWrs4EzYojp8JPPNrM1BoRjOFkPfffYc0bA 5AOxCvp4Keo3hNqCPFXeTeLZ6qGAelErRmNKjgUuC6dwRExb X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: tIYignzxxExFQiOJU5oZ6NKqZvaHa65S X-Authority-Analysis: v=2.4 cv=Cpays34D c=1 sm=1 tr=0 ts=69b384e8 cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=65xn1vM8G5_EQ4liwbMA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-ORIG-GUID: tIYignzxxExFQiOJU5oZ6NKqZvaHa65S X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEzMDAyNiBTYWx0ZWRfXynfpjQoQ4uR0 dez6p8gN9eUC6eUBF9AZgsK8HMwGofoxyUB77TEU4KTuntldSFFr+vqoxVXDK8jrGtWLg+tl2qU lvdKtpqWOnGkRuZAh4a0ouAbdD385Ne9BPue+qW89oPAzEXIy2EFKS/7fWcCP41C4jEJbB9N3vG P00wXFonRhMhtYOEEg/eL7F/WFv8aZxFD81TI2oex+O599m11USp5u4NsfJgZoF7gsomB/tbKEy embJ1CL/YIUbia2q3X8Bmn4UcUxOdXD3t51Om6iTvFyn4FMVKopKs6JyQ8IonbKuo8Aw2Kx9ot+ nhbfKFwO8ylU+d6HuWjRJ3AyqHmC3O6x5ULokhriopdh58p61J0ZrrZldh1f5nFDPYVD+zpE0bv aLTaLDiGIOmLyGxu9Nw9oeEIP2/c3xf+IecJQulQ1eNpByZAQlZw8OWnrqITNa20wsNxIalosHa L3z1HQGM/PreLfj5O8g== 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-12_03,2026-03-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603130026 The get_instance() is a callback tightly connected to the HFI implementation. Move it into the new iris_hfi_sys_ops structure, merging all core callbacks into a single vtable. Signed-off-by: Dmitry Baryshkov Reviewed-by: Dikshita Agarwal --- drivers/media/platform/qcom/iris/iris_hfi_common.h | 2 ++ drivers/media/platform/qcom/iris/iris_hfi_gen1.h | 2 -- .../platform/qcom/iris/iris_hfi_gen1_command.c | 28 ++++++++++--------= -- drivers/media/platform/qcom/iris/iris_hfi_gen2.h | 1 - .../platform/qcom/iris/iris_hfi_gen2_command.c | 30 ++++++++++++------= ---- .../platform/qcom/iris/iris_platform_common.h | 1 - .../media/platform/qcom/iris/iris_platform_gen1.c | 2 -- .../media/platform/qcom/iris/iris_platform_gen2.c | 4 --- drivers/media/platform/qcom/iris/iris_vidc.c | 2 +- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/m= edia/platform/qcom/iris/iris_hfi_common.h index 9aa84a1d8f95..a27447eb2519 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_common.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h @@ -112,6 +112,8 @@ struct iris_hfi_sys_ops { int (*sys_pc_prep)(struct iris_core *core); =20 void (*sys_hfi_response_handler)(struct iris_core *core); + + struct iris_inst *(*sys_get_instance)(void); }; =20 struct iris_hfi_session_ops { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h b/drivers/med= ia/platform/qcom/iris/iris_hfi_gen1.h index 38e9d262d7df..c37adf65055a 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1.h @@ -7,10 +7,8 @@ #define __IRIS_HFI_GEN1_H__ =20 struct iris_core; -struct iris_inst; =20 void iris_hfi_gen1_sys_ops_init(struct iris_core *core); void iris_hfi_gen1_response_handler(struct iris_core *core); -struct iris_inst *iris_hfi_gen1_get_instance(void); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen1_command.c index 26b7feb05d15..0017ade4adbd 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c @@ -1076,6 +1076,19 @@ static const struct iris_hfi_session_ops iris_hfi_ge= n1_session_ops =3D { .session_close =3D iris_hfi_gen1_session_close, }; =20 +static struct iris_inst *iris_hfi_gen1_get_instance(void) +{ + struct iris_inst *out; + + out =3D kzalloc_obj(*out); + if (!out) + return NULL; + + out->hfi_session_ops =3D &iris_hfi_gen1_session_ops; + + return out; +} + static const struct iris_hfi_sys_ops iris_hfi_gen1_sys_ops =3D { .sys_init =3D iris_hfi_gen1_sys_init, .sys_image_version =3D iris_hfi_gen1_sys_image_version, @@ -1083,22 +1096,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen1_= sys_ops =3D { .sys_pc_prep =3D iris_hfi_gen1_sys_pc_prep, =20 .sys_hfi_response_handler =3D iris_hfi_gen1_response_handler, + + .sys_get_instance =3D iris_hfi_gen1_get_instance, }; =20 void iris_hfi_gen1_sys_ops_init(struct iris_core *core) { core->hfi_sys_ops =3D &iris_hfi_gen1_sys_ops; } - -struct iris_inst *iris_hfi_gen1_get_instance(void) -{ - struct iris_inst *out; - - out =3D kzalloc_obj(*out); - if (!out) - return NULL; - - out->hfi_session_ops =3D &iris_hfi_gen1_session_ops; - - return out; -} diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h b/drivers/med= ia/platform/qcom/iris/iris_hfi_gen2.h index 6cc6d9890c12..21ab58e0aa84 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2.h @@ -36,6 +36,5 @@ struct iris_inst_hfi_gen2 { =20 void iris_hfi_gen2_sys_ops_init(struct iris_core *core); void iris_hfi_gen2_response_handler(struct iris_core *core); -struct iris_inst *iris_hfi_gen2_get_instance(void); =20 #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/dri= vers/media/platform/qcom/iris/iris_hfi_gen2_command.c index 0c98d680bf09..639b75fca1ab 100644 --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c @@ -1315,6 +1315,20 @@ static const struct iris_hfi_session_ops iris_hfi_ge= n2_session_ops =3D { .session_close =3D iris_hfi_gen2_session_close, }; =20 +static struct iris_inst *iris_hfi_gen2_get_instance(void) +{ + struct iris_inst_hfi_gen2 *out; + + /* The allocation is intentionally larger than struct iris_inst. */ + out =3D kzalloc_obj(*out); + if (!out) + return NULL; + + out->inst.hfi_session_ops =3D &iris_hfi_gen2_session_ops; + + return &out->inst; +} + static const struct iris_hfi_sys_ops iris_hfi_gen2_sys_ops =3D { .sys_init =3D iris_hfi_gen2_sys_init, .sys_image_version =3D iris_hfi_gen2_sys_image_version, @@ -1322,23 +1336,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen2_= sys_ops =3D { .sys_pc_prep =3D iris_hfi_gen2_sys_pc_prep, =20 .sys_hfi_response_handler =3D iris_hfi_gen2_response_handler, + + .sys_get_instance =3D iris_hfi_gen2_get_instance, }; =20 void iris_hfi_gen2_sys_ops_init(struct iris_core *core) { core->hfi_sys_ops =3D &iris_hfi_gen2_sys_ops; } - -struct iris_inst *iris_hfi_gen2_get_instance(void) -{ - struct iris_inst_hfi_gen2 *out; - - /* The allocation is intentionally larger than struct iris_inst. */ - out =3D kzalloc_obj(*out); - if (!out) - return NULL; - - out->inst.hfi_session_ops =3D &iris_hfi_gen2_session_ops; - - return &out->inst; -} diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/driv= ers/media/platform/qcom/iris/iris_platform_common.h index 6b76a9046f9a..d1daef2d874b 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_common.h +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h @@ -203,7 +203,6 @@ enum platform_pm_domain_type { =20 struct iris_platform_data { void (*init_hfi_ops)(struct iris_core *core); - struct iris_inst *(*get_instance)(void); u32 (*get_vpu_buffer_size)(struct iris_inst *inst, enum iris_buffer_type = buffer_type); const struct vpu_ops *vpu_ops; const struct icc_info *icc_tbl; diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen1.c b/driver= s/media/platform/qcom/iris/iris_platform_gen1.c index dc74da04771b..9925a893b404 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen1.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen1.c @@ -333,7 +333,6 @@ static const u32 sm8250_enc_ip_int_buf_tbl[] =3D { }; =20 const struct iris_platform_data sm8250_data =3D { - .get_instance =3D iris_hfi_gen1_get_instance, .init_hfi_ops =3D &iris_hfi_gen1_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu_buf_size, .vpu_ops =3D &iris_vpu2_ops, @@ -385,7 +384,6 @@ const struct iris_platform_data sm8250_data =3D { }; =20 const struct iris_platform_data sc7280_data =3D { - .get_instance =3D iris_hfi_gen1_get_instance, .init_hfi_ops =3D &iris_hfi_gen1_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu_buf_size, .vpu_ops =3D &iris_vpu2_ops, diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/driver= s/media/platform/qcom/iris/iris_platform_gen2.c index 19e99e1c2aff..10a972f96cbe 100644 --- a/drivers/media/platform/qcom/iris/iris_platform_gen2.c +++ b/drivers/media/platform/qcom/iris/iris_platform_gen2.c @@ -907,7 +907,6 @@ static const u32 sm8550_enc_op_int_buf_tbl[] =3D { }; =20 const struct iris_platform_data sm8550_data =3D { - .get_instance =3D iris_hfi_gen2_get_instance, .init_hfi_ops =3D iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu_buf_size, .vpu_ops =3D &iris_vpu3_ops, @@ -1006,7 +1005,6 @@ const struct iris_platform_data sm8550_data =3D { * - fwname to "qcom/vpu/vpu33_p4.mbn" */ const struct iris_platform_data sm8650_data =3D { - .get_instance =3D iris_hfi_gen2_get_instance, .init_hfi_ops =3D iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu33_buf_size, .vpu_ops =3D &iris_vpu33_ops, @@ -1100,7 +1098,6 @@ const struct iris_platform_data sm8650_data =3D { }; =20 const struct iris_platform_data sm8750_data =3D { - .get_instance =3D iris_hfi_gen2_get_instance, .init_hfi_ops =3D iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu33_buf_size, .vpu_ops =3D &iris_vpu35_ops, @@ -1196,7 +1193,6 @@ const struct iris_platform_data sm8750_data =3D { * - inst_caps to platform_inst_cap_qcs8300 */ const struct iris_platform_data qcs8300_data =3D { - .get_instance =3D iris_hfi_gen2_get_instance, .init_hfi_ops =3D iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size =3D iris_vpu_buf_size, .vpu_ops =3D &iris_vpu3_ops, diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/p= latform/qcom/iris/iris_vidc.c index 7e03d63578e1..ecd8a20fedbf 100644 --- a/drivers/media/platform/qcom/iris/iris_vidc.c +++ b/drivers/media/platform/qcom/iris/iris_vidc.c @@ -156,7 +156,7 @@ int iris_open(struct file *filp) =20 pm_runtime_put_sync(core->dev); =20 - inst =3D core->iris_platform_data->get_instance(); + inst =3D core->hfi_sys_ops->sys_get_instance(); if (!inst) return -ENOMEM; =20 --=20 2.47.3