From nobody Mon Apr 6 10:42:15 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 9B3F12F3C19 for ; Fri, 20 Mar 2026 01:55:14 +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=1773971721; cv=none; b=UpihH1pntA+m3kbeuYG1vAZLI5SAWrMVyvYSgQkkjXdyvoAUtENl4cZe+21y4iD5a0gsEaIRY44m27WzE2BCSJ10joOwb9J0BPMZVfacvR1lCzc63N20P89sybYeaMumMyB6b7maRz9taaa1BcQDPWgPJYTPNWgVoae5fHVmj2s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773971721; c=relaxed/simple; bh=mN2B8mMErlly0rhOY6EnYewAknm6tdZRVcCuF6xiQiQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=p5IhgGWi/U8wNti4m9A/PnxaS79rqe8TdoWPKb+/X3rAYcOjtkU6b59tw3+SuArvSnPCs+9rzhZ4Dqd2IpzaZd9B3QZO++P1I9G48iRfbRGKXIUeqD4J6+eUX5eos1qeJTld1tpZBH4J1j7yfFkO0n2Ilbxw8nG+2SyUfkZ6QQg= 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=ek/dLCgy; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=TFmkIeqi; 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="ek/dLCgy"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="TFmkIeqi" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62JJdXGG2759548 for ; Fri, 20 Mar 2026 01:55:13 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= X3roVKO9HbGyFQCP9qFC8PS8kvPsGONebIVZO3TAK2Y=; b=ek/dLCgyX7ODmMzt VERYmoZIMhFOyfAg5+ZY05V6EmCnM20KFDDe0YnG95z/AjamHACnbMuI4i5McZQm nMxnReqfVrRYxsK9qOnMgraR9zobqkE3RMcqrfW7v7bEeagMUJTypODIOdWiz6aM Bxr6yGQLj4IAEmOou16eG9fW9aDY89gi55QlkPRC81zIlIpewWROoW5kAE0KsF0S 0JEVPyld2V1y9cfWZayTYWNl1RQ5Z35GBQgXq8XvayhSY4AlQC2zzGk5PjZN0TLA GM6OBWoLPzKOXKSkxsFxeOARvWL+NT6lf8LtTBQ+/CWNipg3GGmSNksh7uMr++qR 5WGifg== 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 4d0qg78tkj-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 20 Mar 2026 01:55:13 +0000 (GMT) Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-50939597b85so45228871cf.2 for ; Thu, 19 Mar 2026 18:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773971712; x=1774576512; 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=X3roVKO9HbGyFQCP9qFC8PS8kvPsGONebIVZO3TAK2Y=; b=TFmkIeqibcjitixwYhsixtnNTW79x2d7DPeMN3laSuhk5qXi0PwOqmc07n6aohgq70 tLKY0eeM3kG4OgUNCIjUoMnUrYbyH+fA9EShes98JEPrbGEBreIt6aTAad+k+Qsl82n1 1FfIwdotX0S46j2rcK75NZaAyPOgyhxkxnJJuYk2eGnSUirPpkRCS9KtuxxaTGK5v2TW omVgfL7/qihBk9AiAOsqrg0a0yT6BExwLO4QCALeRcg/anKvZQqrLWjRZvv8AMT7y5o+ zyWcRRfPF3dLpvk28twwvS1xyfXiylK4OK31VXCs6j34MeUMiHKA+AnbzMx/wpEv2JcX KBCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773971712; x=1774576512; 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=X3roVKO9HbGyFQCP9qFC8PS8kvPsGONebIVZO3TAK2Y=; b=BB7JgUKJCSeMclWLceSjgFBe8mghiPJw5KuxX5eU5/lLfVqxous0ozEQEtLC2a5Jt3 +KY5u5yRnK/w4oyMNq83qEEeXcQQybqGmvqfRAxZaCxIat5S3yVZYrRvKExp0xOU+B/y N898eACpTKJn2YMfsPXidwShnHkW0KVzCa3iJDHosNjS+DG1KXCS5Lc33Ai+Yyl+VY/+ css8N4lDEiLeAGvfGtZ2RVztNTNBOWI1GxdeGbmzVvgfRjQJFaMMEkmfbKoZXNfqpsVF smgTTzoqWbgiF5sTxixV6Xqnj9BMv4wUuf1aKRRtr2+RT2xIynQLi/GdkmFhE9TVltbP +cEg== X-Forwarded-Encrypted: i=1; AJvYcCVGFQY7u0Ep1tT3ibgGx43XPdUyFxAy1oYAoxKrZOOf6hnzDJSHixJtTyPrKYXsxXF4uNUz3+kE6lqBRgc=@vger.kernel.org X-Gm-Message-State: AOJu0YxuBzp6NJe64xPyFZUjaCzrIWZmFZdFcoTcTRIXE4gzsSeVFZBS wsppbjQOFyROTndcbsxjm3MS1k0tBMx1Q3urj0AkzIIxGy0aZaJiHPhDddwLov6OIBEIgDlGs8j UfMm/tl4OYDMFTjrMJuT1/xQI982wUGdPVczSG2PzBTul32ZlvxiNjPt2HILKTjVm8w14tceu2s c= X-Gm-Gg: ATEYQzyJvt1vFuU6DMfjBznQb10yv+6SqqaDIO6Lvx8uU3dhx8L+/gpq3ZN/ZqgxdT5 ZznNPsxG7t9Schg0NIygasaa5NebeP4x9YZCUXTKTWrjCHTTuKSbwphE6bfeiG2zkUt/X0bufys SMyKO7ju6Pd4/UIz++mk05vUCci8KrPhSut90KNhNm/U/8GiH+4POLKz7IbSFoOkOrqbqN0XExX s5yUUBbDsPX+A7Q4UYxZNgoVi6OTnB1kQg+4hvZgk2dHPMLCOcKX2r2PJabGrjdhPqYVqtxDFB3 RHLbTltJDy0Np9j1p4dcsCmSwYDxANJpN4/JxS3HroFc2LSc1mQ/Bdy3V2NFQPfwRhS0+xr0ztq ggCLzBAxmh32pkK2zGbOyNQPee3elttfm29T16KQ0PcKXwpoPBnC6KmgdoMR3j1zL/JOBKECdrw XnRbHAm12HJ1xtdEr6cOgAMbl3l1rBd7zy2lc= X-Received: by 2002:a05:622a:2c9:b0:509:172f:bd5 with SMTP id d75a77b69052e-50b3739f59fmr22974191cf.4.1773971711869; Thu, 19 Mar 2026 18:55:11 -0700 (PDT) X-Received: by 2002:a05:622a:2c9:b0:509:172f:bd5 with SMTP id d75a77b69052e-50b3739f59fmr22973831cf.4.1773971711369; Thu, 19 Mar 2026 18:55:11 -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-5a285305eefsm232344e87.70.2026.03.19.18.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 18:55:09 -0700 (PDT) From: Dmitry Baryshkov Date: Fri, 20 Mar 2026 03:54:46 +0200 Subject: [PATCH v9 06/11] 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: <20260320-iris-platform-data-v9-6-3939967f4752@oss.qualcomm.com> References: <20260320-iris-platform-data-v9-0-3939967f4752@oss.qualcomm.com> In-Reply-To: <20260320-iris-platform-data-v9-0-3939967f4752@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=9259; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=mN2B8mMErlly0rhOY6EnYewAknm6tdZRVcCuF6xiQiQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpvKjlV5cEIj/b45jjRTfOXH0aOfIFDW+UqC7HM KI2/OoSMeSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabyo5QAKCRCLPIo+Aiko 1QOVB/9toPdsDlmGwV4AN2A69C4k3fTHZWsBUdoQgHzmEVA+a0/GjHv54lFeoxuLO6I8jdJ4KDl mXDFatCyrYwffGmp+eG2xOknRZGDrUKxZB3gjuT8V/v9zXqc11kvVqF+4OQUDTdVnuMN1wq7KvD WQrxxgE1Lv2IQBWyPOj0xPd7b12wf8YH1oBLHyhcrRCLV2mjGRcbU2/+lZQ7Z6iNbBJYWj9l1lT 5VNFCxbrpMRwzWSr+yoDoC6nZwExYgVzrR1X9YxdsgUKyajRcaW6L8XVj/WXZyLxK05lxw99a8B qiuc3g/JmEYk2YV1rt6JUm6aCyzMWv72BH3hbgWgB7m5hJGi X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: 5_4byB9wrUXHkCyYbDzSZVgqbRzYm5c6 X-Proofpoint-GUID: 5_4byB9wrUXHkCyYbDzSZVgqbRzYm5c6 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzIwMDAxMyBTYWx0ZWRfXzbBpoD/sRBOP Y+GWKXzvE+b9SnyAwbJ1jPmVZIvWQoZEcX3sRM7nXG2pnSDBFjTghCJoPAOrgWdTil5adZPLwiK SuogZvGTCJ5WSs66yz5qhDNcVbXBSPsClbv5iWzsy7dk3LWwZwOvGfEIKRqKrV/g+Ye+1PM1lXR mpYlMTkYyQqepeROiGRbQdCl4YKrkE76ZcXmAgkDdXgGtnsNDMuElw7LJZs1K/lPwTtr3hxARD+ wSh8b/wFXqTKU07ZfEPezj84nldhSmWuus5gsg6zrvsZ6yCcNzAta/V+Wp/lAL/5XxvT528UoCK 6qH7X5zYmc7ZvlFTPnm2x32YGbSHevbYQaKMaSSXHV96p9G36Gqv1WJPfQ14ooqgr/oVtA2Q6ZM L1+adBniOmJPdGcZDlmWBrcqT6ehOWD17D0GKnO2x4BWSRPMCUw+eifTvAb6CuUZ07FHTpLQyVY XhMOzqnmnojUXoooziA== X-Authority-Analysis: v=2.4 cv=fdGgCkQF c=1 sm=1 tr=0 ts=69bca901 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=YMgV9FUhrdKAYTUUvYB2:22 a=EUspDBNiAAAA:8 a=2oeCRJBNelE_HTcD8YQA:9 a=QEXdDO2ut3YA:10 a=dawVfQjAaf238kedN5IG: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-19_04,2026-03-19_05,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 spamscore=0 adultscore=0 bulkscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603200013 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. Reviewed-by: Dikshita Agarwal Reviewed-by: Vikash Garodia 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 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