From nobody Wed Apr 8 02:48:26 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 E0CD2322B8A for ; Wed, 11 Mar 2026 05:05:22 +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=1773205524; cv=none; b=nDD97NBXjxcq7VB600fzyE2Zvt88LToVVcxLSM00BSJZ22+o6Bl3fOZt5EJ2lUy4qtqg/D3Mz2Ztnxlg14NsAwtsw93UuI4iXv0xoA5hXHw/WtDjPNAO/k5dt79Nm/LkR7MYYrwoyt2AzrV7x+2JyiTXvZVnyHZpItPpG51Y75Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773205524; c=relaxed/simple; bh=CtWOxxNLvINQuoxRDW5FqCzOjuGwRgb6qMA/H9WAPS8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TadgJq2Mxj6sRiFM2nz3fgj05uBlssiSRWtKwVPpG9j9ER/kXORJZadSilFxs5fK0AAg5CYs9dhnjYHWdNRowr9jZC3IVX0hfETKtb+c3pPo+pHpS8zfZNOw64vrUf3g5pYn4Tp6lbvdr2sL1ENj9/eboY8enhR7mgYV6BnuQP4= 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=Twgb65T9; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DE7kdIkC; 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="Twgb65T9"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DE7kdIkC" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62B497hn3417129 for ; Wed, 11 Mar 2026 05:05:22 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= 5FbvBkSXHPmm0gZPtLIZSX2dSpBh1f3huzQHvkqUVcs=; b=Twgb65T9vaDPTARr GqaQS16RJS9dWwow6YmS7nDuY4WbdxYaQ0SG9ov5p4WJK15UWObcmJKo//0n6f28 VVvrZG9LnyFR9bk/BEidy6HYEp5qBb9b6Fhj5e5Xzahh/+Umcr8FhPLPNzglhL6G jKoMGGuY442q0ZhW3uQiMeGef+q98MqK7mFSycJrIcJmVLA9nDvpM9JNs7k/jyBK bhdgsHAun6S1hr/nhFnHmZW7XtQf6uRO3axP+vJLL2NsUjQhEZDvbqOND6sWNCoy nlFBZCnyo+Nlv4mxRk/8QeU3Mht3wEyC4OhVROhuYtr2zsoPZQSTFj0XbKr4Qtu2 AcOmRA== Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ctja2beq7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 11 Mar 2026 05:05:21 +0000 (GMT) Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cb0595def4so449370985a.0 for ; Tue, 10 Mar 2026 22:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773205521; x=1773810321; 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=5FbvBkSXHPmm0gZPtLIZSX2dSpBh1f3huzQHvkqUVcs=; b=DE7kdIkCOYxLy5F9KzVyTgGWq47OF90ICvoiuMITBr4/+0q/tG9UkmewajYR4P6+7F s19LiPjL9oiav6CSa1xs4FnW++frLGc/mMbuSoT2Rq6cErmajQag5JCe6GgPvrDLcxln k8lSg1MJ7tTCBS93dagBU4iSJ8bDEKcc9FvIiaab43NKmXAip9w/8tjZSttgtODkV0tW nBAKMKPXd+og66SBj0+5TUrVqTBL+Naj7koHk0SHNxxgPNjAE17WjP4zdfK9nFo5sefr dcU+wvnWTN7EJuxboBasopSwiHLHGHQoIeaN4rR3sMnE87F/Dxl93tO+wLatoyerZQY+ J3lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773205521; x=1773810321; 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=5FbvBkSXHPmm0gZPtLIZSX2dSpBh1f3huzQHvkqUVcs=; b=ICnjb0ldEm9eSjAspz0RKsys1EPrnZmVTtjkjSS595w3WmHcYARAtdF4zlVJTTgDH7 RGG3cO3NOTFRe85NVFvSCkJr0dGkHdsaysvjlD5+m3uIbPaUIe5UKSRyMhgYf28UFMJr g5fw0SBCfTsMCFvsa8qajrJ9QMl+mzMYTMUae7bfK9z6jPIJ8/23Ir7Kj8pLxtHPlV8q NKNSir5Xt8wbZS+qZMLo7FYSS0KJWL7unomNkMaZ1LyPZ5veW4kLaQaz7Ju48fR+944y xQGXgAQ7USw9kbpmh6GTIV3V3IUSG/gjJY5Zp3HV5Sa+8gq7BszPZuLbQcsd5RL4h/mG h43A== X-Forwarded-Encrypted: i=1; AJvYcCVNZOuGFd8CUuPCykxuNJ1TeV8qydnrtnyrV7k8sQOoSQgcU7fLpb5kAh4Lh5LWX6M4xvALeTO9QtJM1dk=@vger.kernel.org X-Gm-Message-State: AOJu0YzN2JgoktuahaBhQeZESRS7PwADC7G9t7ByALthCDBrgh8Xo8n5 3pb2fZrTDYneOctDjQE+TFO6qPNz9uJXo0dIBiEPS+6cPPPk+MHh9Jvii+fk5a3hRTouV661odP hnWLVsHPR65CawCkUqQHg00O4WZrBbnwDLeaquck3kUn9Ji7r28ppvLVhgYNAgGjVdnc= X-Gm-Gg: ATEYQzwjeVrlzbgrR7JWJFE/Gj0Lrw/nIx/C/1stnQ4rpWuB3T5f2P5I4++fBTRA+9n fAiRhTuYe/aWNxMc1ySfNGehQX7eO+9LOs/wuIsyV5ZbCKRuddacKeGpZjkJLT9G9FT4NJvrez+ kT9/J1KTchU4ytqsUkVNdp9ljKimTRF9gPFkhCzFiFEn+/DLz7g5TTLI3YbplvnTp3PuHGMA4N9 zs/6pQW7I1mVeOniq536AHHHM8Ay+MEPZSDW+QmqpQ/QnxmpCxaPpEIlFIgSfy8SVQ19ij3tr5L gesZloXGZozS1Iv5AXlnjRS9F02ep5M+ozT0WtMZTVmGq70fAvZTcUPaLSUoVrwjpQkUqXOTJl9 MFwyKo3ECH2xV9IJo2jTli+QxvLGYy9yM8V84dDs7Y0czvPSAk1LIrXmnUIy12ZIz09HKzOhYIM 15DRl/TLv06gmkDZ8vXASa0tujgOe/X9jRY5w= X-Received: by 2002:a05:620a:1999:b0:8cd:8ce4:c0ad with SMTP id af79cd13be357-8cd93bec8a6mr676377585a.22.1773205521135; Tue, 10 Mar 2026 22:05:21 -0700 (PDT) X-Received: by 2002:a05:620a:1999:b0:8cd:8ce4:c0ad with SMTP id af79cd13be357-8cd93bec8a6mr676375985a.22.1773205520659; Tue, 10 Mar 2026 22:05:20 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5a15635805bsm199240e87.65.2026.03.10.22.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 22:05:19 -0700 (PDT) From: Dmitry Baryshkov Date: Wed, 11 Mar 2026 07:05:07 +0200 Subject: [PATCH v3 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: <20260311-iris-platform-data-v3-6-f02258c4d4ed@oss.qualcomm.com> References: <20260311-iris-platform-data-v3-0-f02258c4d4ed@oss.qualcomm.com> In-Reply-To: <20260311-iris-platform-data-v3-0-f02258c4d4ed@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=9065; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=CtWOxxNLvINQuoxRDW5FqCzOjuGwRgb6qMA/H9WAPS8=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpsPgBTDXsV4Y6pXIpaOh6SDciDbGkRiky1nT3g M+blNc0MM+JATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabD4AQAKCRCLPIo+Aiko 1RZyCACx3PRUZdRyszanPrb28JzBKc3jk7ZhAfmWbw6OVbTsYbwYJDzFbYL2jCXBdgSIDW0gbgf bzt8im7CdaBsx2Ufpaiytb9QKJUHaPfoNkk6juQxQG22jsKJVLh5lno553xMIzLOtmjWlslBOyI /QMbWPWJEvgpU4RBvPTPsWaQLWmnd0WTs8bLSCTE8TYmzGvtyVVUXJINtpPsS9RLLbDZWOwh2Lf +GQmfn5YkUHPVitCG6vy5dHQeNe3XizrdFmt8vJq3nxLCZU7Lx8e7zVuXATKm7rZr+URtEmAm+h +s3xqayZnw5BSlyoVPyxY6cm3jwBkDhwIB5mkOOaAPFfVLDF X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Authority-Analysis: v=2.4 cv=c9WmgB9l c=1 sm=1 tr=0 ts=69b0f811 cx=c_pps a=HLyN3IcIa5EE8TELMZ618Q==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=65xn1vM8G5_EQ4liwbMA:9 a=QEXdDO2ut3YA:10 a=bTQJ7kPSJx9SKPbeHEYW:22 X-Proofpoint-ORIG-GUID: qUHtiw6pFOYQ86HV8hePY4ZQTGb-fXzm X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzExMDA0MCBTYWx0ZWRfX0wt8fzViQBw/ 7xSUnyaLARiT1b+54Ex5y5LQn05hJ4dvUlptUTBkqPje+PjVJXUocAHXzYBapQE9F6iAja0v2P9 5zu1Q0Q99qkoUNgzd0dHCtLgghkfxL6gyD03KR8s2dL2y1MtKxhGO8X3r73jycqR4505A5SpS0A IAChVgn70CUwriDRmhVeCx3OpqVgib/5mZpTgYa+tUBI0ldU8okNICId1Pkio/BCyNbrBHiiZwD 7RNXgDzE7TBRBygyRmJOROysFHWnLmV64YXs7CC8vgLBh+pInLrF/r7BC0iuULPkwcwm2pBWUbT M9u3WOux1tuCphvPX3nQaGrhoC9BUMfwvJFpl/O1pY/ZZVZ/Zwi/zdOppJQfIVt/QNpre3DhN9u c3Y8Se1SVaw8UJGQX5G9mIPiJs/Boxx+cDKhiyOk6HpAIpxq37u3TL2sPU10e2mIaW5WHrfgZuX Zv5D/lcfA+cH4rPrfUg== X-Proofpoint-GUID: qUHtiw6pFOYQ86HV8hePY4ZQTGb-fXzm 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-10_05,2026-03-09_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 clxscore=1015 impostorscore=0 phishscore=0 bulkscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603110040 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 --- 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 1c970243532a..0479ba442b09 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_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 eea9cc3e5904..abf02f589a28 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_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_= 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_ops_init(struct iris_core *core) { core->hfi_sys_ops =3D &iris_hfi_gen1_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 b981a1ba6954..f1d293759bc6 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_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 a875fa906193..6ce94f4dfe08 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_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_= 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_ops_init(struct iris_core *core) { core->hfi_sys_ops =3D &iris_hfi_gen2_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 75dd496e2984..d8d205fbd61b 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_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_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 d72d397a2c2b..0f8d67473c3a 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_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_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_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_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