From mboxrd@z Thu Jan 1 00:00:00 1970 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 2C52C35A392 for ; Thu, 19 Mar 2026 06:00:08 +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=1773900010; cv=none; b=A6dvEKkqMG1byvJvcZjsXfHdtlFWL+Ref7FPmeGBlafL16vPyV/wZV3XZ/TPoh0UqzV+QMtB5CP3gii/uKMwpAmKrzpRqtcMRfiNOICNfTj+iVYDn+eeHVL49t6gV4wi6Lb8b9kyO6XC/4QOFJiYi4NWYTmi2Vqs15gZ9O0WwPo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773900010; c=relaxed/simple; bh=Knwl9TIGW90PmwXP68VpHHyknWQzY2+lfOIWG1iTcOE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lYpB1Bv3LT+8UwbipcuaWtY/XWYH4MM84WLVBkrRupFifFgmVwNyPhb6szEKX90HvZe8WQUr2F6abT1uLrAsHpWPadOeXTmqRFp1NBjEosWAfZoEilVYuGYRbNnrIiW2MTGaKBR/nkw8CD/5f9/wJD2910We4wcxV9nG1XkE81c= 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=hE/L3eFC; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=eX4GkUNj; 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="hE/L3eFC"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="eX4GkUNj" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62J5XtPc1802729 for ; Thu, 19 Mar 2026 06:00:08 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= WkIxi4+/C28jrvf8ES6/SIOuPsWcpSdm1apYAbDQVp0=; b=hE/L3eFCuJiTyox/ YB+yFfz1OdNSOkbbiagntjmyCCGWmt/EriikMEDDR8xS9xdRh6ggKDvAknv6Lirq dXX7pm9aqLb3E68vslUkapSwMKWV0wfxYQRi4sQon/WP7r26/7qetcxDQ3Hq0k78 9ooNxtwVol8N55ZHaydDYZNiWsN7irWkqs0ve0ukwWRsQH6VLOoNstpUDkLYO3te PddB40nSFkZIUpOnyPtVL5qBgaQ/WpuUlpoq2eRs70h7CoYMQ6K/vJdSjXMEkUwL YccunYqCuKdXU4OEAXPdo4ox1m7fIZOgGMjy8Pc7DbGQDRZTwsF6dKESgTS6sZrR L3moVg== 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 4cyscb3te6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 19 Mar 2026 06:00:07 +0000 (GMT) Received: by mail-qt1-f200.google.com with SMTP id d75a77b69052e-50925fed647so49685931cf.3 for ; Wed, 18 Mar 2026 23:00:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773900007; x=1774504807; 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=WkIxi4+/C28jrvf8ES6/SIOuPsWcpSdm1apYAbDQVp0=; b=eX4GkUNjDS3UvCme/xGK6GkuZLHheNM6KjGTPL/VCBvxF9vf3Y+dbQL6hyRtBz+Rcj v/3O4UX0Pd1Rl8H2WDWhU+H4p6XeTh/DX04s/QGgytcCZ4Hj5N+7AP0FJGTh2fAo6Qlh u8LG8kHiZ/oDGh8TBN9LaswwoClcwHzmcDsTWx/m37o2rYHfq12Nvpyqia6UYctZH/FA fq/KDMOmFuobT09N4BrJhl6pwklOVYNVUomgiXw0UB/ekh0nxAAsAnSYUx1Sigy2h8HY qph9vC+SSq4jdzcPn0g6Mzi7v7SpMiyxHJC5i38c5/1ySANBelMI+fbLmKBPWLAHkeFG 5Rdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773900007; x=1774504807; 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=WkIxi4+/C28jrvf8ES6/SIOuPsWcpSdm1apYAbDQVp0=; b=ZgJ7gXDH08qEetsl+lGSOdm46uc3RYgbWycbsbPYbocS/P+7bBsxfH8kQYni6BvQMI ++y3k6CKS224+VTa+q5wrrp8XW91q2MWzPs6QwkJ9QgZkDQJZUrJdMjvp/l7BRm45dOh nzYTaa/JMRdgZyKkb6rsTXEW37GzEW/CFJ+6zKFNlk7IVTawp0d2exGIEkIGQ/ca89mk v5qnRabR8JzAdEzailJPG7+IajnKDxckFcHz1vqWQKKwlKxh5G8lkj56EHa7hC5XxeZm PIO6dsrIwT0dC1TL8IuddIEQuSqdSr5dAE6AZgKr+JNsSMSQWB3pbOx0gFS5B8KPNkRy s+bw== X-Gm-Message-State: AOJu0Yy3fCcJyJmZmfTY4wkE7lktCX2BuhAMkeBTbhcLHI6w5xubZ2tV SRiXU4QKVZbTo2VGV4VHWsYaBNyr29zwP5bQIze/6thuDVERfhh+Nd1aq2FeR0ryPAB0L+6A0Eq 6+KMifv35aQtTUiLQcnuZCFpZoO0lLMRbMRrfV4yGEvUnnYA0tOj9xD+42b6305cRrQ== X-Gm-Gg: ATEYQzw5br4bvekIXisz1NH3+QjRg/Em81Jh1s/xvQ7/Pd1PmKqXp5lv9VG9W4fANKX kcsayQbEbhum6N3pxOah8pF20op0D2XPg+Sly/L28qKDeSrtXGbiBByX9aFV3csp1EnvWoxzTF5 iGRzEp1EVG0H0V4HYklF6V6llGOHC9+olaeYmoNGUJtWP69Jx84sS1rIjwr0xhfaLnrXc5oLY6F NqxcfEt8v3SgQb2chEptaQEmIAQHqv9dt3oYoBtZ2mlAuNlH6YIlNJPfpF73GaGm5WjNSDESNwZ 5LlI2WVAeLGztlqZH7FUgqsB+D959s2Ngz04Toig//aYzBG/lr8X8QZn5DoK/RCmw3qqcSz0uBo z6UNCg9D1mcDX333psNkmag8CgY6CVjEmaJz99znabKE2bySjg3R+SQINFYpxYAXCmyymHvKPAe t8cFD8MgbGpk4NUI3OOmsrdCL0EnIPVOj1Vtg= X-Received: by 2002:a05:622a:a9d3:20b0:50b:2876:586 with SMTP id d75a77b69052e-50b287626b5mr10772551cf.5.1773900006516; Wed, 18 Mar 2026 23:00:06 -0700 (PDT) X-Received: by 2002:a05:622a:a9d3:20b0:50b:2876:586 with SMTP id d75a77b69052e-50b287626b5mr10772081cf.5.1773900006007; Wed, 18 Mar 2026 23:00:06 -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-5a279c7415asm993174e87.56.2026.03.18.23.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 23:00:04 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 19 Mar 2026 07:59:50 +0200 Subject: [PATCH v8 06/11] media: qcom: iris: move get_instance to iris_hfi_sys_ops Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260319-iris-platform-data-v8-6-55a9566ebf60@oss.qualcomm.com> References: <20260319-iris-platform-data-v8-0-55a9566ebf60@oss.qualcomm.com> In-Reply-To: <20260319-iris-platform-data-v8-0-55a9566ebf60@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=9196; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=Knwl9TIGW90PmwXP68VpHHyknWQzY2+lfOIWG1iTcOE=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBpu5DW3PIRN3USKMEkt1XMTjYHmj98H7Ru003o6 X4jI+aEReuJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCabuQ1gAKCRCLPIo+Aiko 1R4qB/9AbOyXdLtd3uIM0hzJvZxYyBmeh3RnfJxSnj+4aoVRoDE83jeS4eg9VPjMAYpVrxstRiS V+kU1NnMhxSYCVjoaXqde4e8iFrOo1vGVofPvPNHPmQfnnNpIPcRWuZcZf3f3gmjwztj6LJff0p qJgdq6sN+XyLPv7XEuYU8zP8wx+dquYYxbI559kBMfJ+rMZ3UeKf31FVSMs9C9aDxUtjJrdjx// is4VESDjeZ9ujrAdIIvw89RHNYOJJP3oa2xfesnlLso3Li4hJPKx66eYyCY985yaYeffMd/jdRU DdBG0NMXYLTZ2lSmCAwiX1dSesqm7fSPx5NW4ajNYWMcJ776 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: hDPZGZCh7T3MXSnijwGdkcB11qfd_bZd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzE5MDA0NCBTYWx0ZWRfX4GYw3mCvXEWj GpDl7+qa3XpKygNB7BNnh7yy0nyPgzekbapk0cW/N65GMUIOsCFKDcuNgBzMOnCYl5HkxbAwnhz 43aO8OmDX0alOqyaRK4zSpZ2dIEDPIdZjV9sLORs2TsD+5xRSxhO4Y1ktoHrqedEURo0OEQnILD HuUnvubpeZZ2N9pcKxiFyByGfSjKGioCeUNfF0XTx3IEYuVfXuq2dAuFQbidCt0W62JQo0MDEIz 9wqpxeApkRwgtX2qxMcCgZRmpXomKLf/ivwkmQ08joTnrxhoWqJr5visA2wEjYF4KcpdROHbPjJ OX8ExXheuWqZdj1ZbNyp6Qfe+2wcZzqWRcctgC+zVkNWFIUXd7RfWE+vV0t80Neb5PCKFNnqIXf /mFSKNJs+JXAbaBQbcNezX/GaPhXvEhCIiHACSeiQyQWZ+M60cgYXy13JAq50mQXOejacRnQNr0 wXjyh0FXif0TZ7PM0cw== X-Proofpoint-GUID: hDPZGZCh7T3MXSnijwGdkcB11qfd_bZd X-Authority-Analysis: v=2.4 cv=PtCergM3 c=1 sm=1 tr=0 ts=69bb90e7 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=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=65xn1vM8G5_EQ4liwbMA: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-19_01,2026-03-17_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 clxscore=1015 priorityscore=1501 bulkscore=0 lowpriorityscore=0 malwarescore=0 spamscore=0 adultscore=0 suspectscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603190044 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 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/media/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); void (*sys_hfi_response_handler)(struct iris_core *core); + + struct iris_inst *(*sys_get_instance)(void); }; struct iris_hfi_session_ops { diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1.h b/drivers/media/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__ struct iris_core; -struct iris_inst; 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); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c b/drivers/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_gen1_session_ops = { .session_close = iris_hfi_gen1_session_close, }; +static struct iris_inst *iris_hfi_gen1_get_instance(void) +{ + struct iris_inst *out; + + out = kzalloc_obj(*out); + if (!out) + return NULL; + + out->hfi_session_ops = &iris_hfi_gen1_session_ops; + + return out; +} + static const struct iris_hfi_sys_ops iris_hfi_gen1_sys_ops = { .sys_init = iris_hfi_gen1_sys_init, .sys_image_version = iris_hfi_gen1_sys_image_version, @@ -1083,22 +1096,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen1_sys_ops = { .sys_pc_prep = iris_hfi_gen1_sys_pc_prep, .sys_hfi_response_handler = iris_hfi_gen1_response_handler, + + .sys_get_instance = iris_hfi_gen1_get_instance, }; void iris_hfi_gen1_sys_ops_init(struct iris_core *core) { core->hfi_sys_ops = &iris_hfi_gen1_sys_ops; } - -struct iris_inst *iris_hfi_gen1_get_instance(void) -{ - struct iris_inst *out; - - out = kzalloc_obj(*out); - if (!out) - return NULL; - - out->hfi_session_ops = &iris_hfi_gen1_session_ops; - - return out; -} diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2.h b/drivers/media/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 { 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); #endif diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/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_gen2_session_ops = { .session_close = iris_hfi_gen2_session_close, }; +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 = kzalloc_obj(*out); + if (!out) + return NULL; + + out->inst.hfi_session_ops = &iris_hfi_gen2_session_ops; + + return &out->inst; +} + static const struct iris_hfi_sys_ops iris_hfi_gen2_sys_ops = { .sys_init = iris_hfi_gen2_sys_init, .sys_image_version = iris_hfi_gen2_sys_image_version, @@ -1322,23 +1336,11 @@ static const struct iris_hfi_sys_ops iris_hfi_gen2_sys_ops = { .sys_pc_prep = iris_hfi_gen2_sys_pc_prep, .sys_hfi_response_handler = iris_hfi_gen2_response_handler, + + .sys_get_instance = iris_hfi_gen2_get_instance, }; void iris_hfi_gen2_sys_ops_init(struct iris_core *core) { core->hfi_sys_ops = &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 = kzalloc_obj(*out); - if (!out) - return NULL; - - out->inst.hfi_session_ops = &iris_hfi_gen2_session_ops; - - return &out->inst; -} diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/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 { 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/drivers/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[] = { }; const struct iris_platform_data sm8250_data = { - .get_instance = iris_hfi_gen1_get_instance, .init_hfi_ops = &iris_hfi_gen1_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, @@ -385,7 +384,6 @@ const struct iris_platform_data sm8250_data = { }; const struct iris_platform_data sc7280_data = { - .get_instance = iris_hfi_gen1_get_instance, .init_hfi_ops = &iris_hfi_gen1_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu2_ops, diff --git a/drivers/media/platform/qcom/iris/iris_platform_gen2.c b/drivers/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[] = { }; const struct iris_platform_data sm8550_data = { - .get_instance = iris_hfi_gen2_get_instance, .init_hfi_ops = iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, @@ -1006,7 +1005,6 @@ const struct iris_platform_data sm8550_data = { * - fwname to "qcom/vpu/vpu33_p4.mbn" */ const struct iris_platform_data sm8650_data = { - .get_instance = iris_hfi_gen2_get_instance, .init_hfi_ops = iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu33_ops, @@ -1100,7 +1098,6 @@ const struct iris_platform_data sm8650_data = { }; const struct iris_platform_data sm8750_data = { - .get_instance = iris_hfi_gen2_get_instance, .init_hfi_ops = iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size = iris_vpu33_buf_size, .vpu_ops = &iris_vpu35_ops, @@ -1196,7 +1193,6 @@ const struct iris_platform_data sm8750_data = { * - inst_caps to platform_inst_cap_qcs8300 */ const struct iris_platform_data qcs8300_data = { - .get_instance = iris_hfi_gen2_get_instance, .init_hfi_ops = iris_hfi_gen2_sys_ops_init, .get_vpu_buffer_size = iris_vpu_buf_size, .vpu_ops = &iris_vpu3_ops, diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/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) pm_runtime_put_sync(core->dev); - inst = core->iris_platform_data->get_instance(); + inst = core->hfi_sys_ops->sys_get_instance(); if (!inst) return -ENOMEM; -- 2.47.3