{"id":2227352,"url":"http://patchwork.ozlabs.org/api/patches/2227352/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-tegra/patch/20260423-glymur-v2-10-0296bccb9f4e@oss.qualcomm.com/","project":{"id":21,"url":"http://patchwork.ozlabs.org/api/projects/21/?format=json","name":"Linux Tegra Development","link_name":"linux-tegra","list_id":"linux-tegra.vger.kernel.org","list_email":"linux-tegra@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260423-glymur-v2-10-0296bccb9f4e@oss.qualcomm.com>","list_archive_url":null,"date":"2026-04-23T13:29:39","name":"[v2,10/13] media: iris: Add support to select core for dual core platforms","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"93363a58bbb18985e2701b6f153a00d8b38995d3","submitter":{"id":93161,"url":"http://patchwork.ozlabs.org/api/people/93161/?format=json","name":"Vishnu Reddy","email":"busanna.reddy@oss.qualcomm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-tegra/patch/20260423-glymur-v2-10-0296bccb9f4e@oss.qualcomm.com/mbox/","series":[{"id":501197,"url":"http://patchwork.ozlabs.org/api/series/501197/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-tegra/list/?series=501197","date":"2026-04-23T13:29:29","name":"media: iris: Add support for glymur platform","version":2,"mbox":"http://patchwork.ozlabs.org/series/501197/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227352/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227352/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-tegra@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.a=rsa-sha256\n header.s=qcppdkim1 header.b=Ou1L+JEe;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.a=rsa-sha256 header.s=google header.b=holnh90q;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c09:e001:a7::12fc:5321; helo=sto.lore.kernel.org;\n envelope-from=linux-tegra+bounces-13927-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com\n header.b=\"Ou1L+JEe\";\n\tdkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.b=\"holnh90q\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=205.220.168.131","smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=oss.qualcomm.com"],"Received":["from sto.lore.kernel.org (sto.lore.kernel.org\n [IPv6:2600:3c09:e001:a7::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g1cVq1xKLz1yCv\n\tfor ; Thu, 23 Apr 2026 23:33:39 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id C15F73030876\n\tfor ; Thu, 23 Apr 2026 13:31:38 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id F20F13033E7;\n\tThu, 23 Apr 2026 13:31:37 +0000 (UTC)","from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com\n [205.220.168.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 81F692F6911\n\tfor ; Thu, 23 Apr 2026 13:31:33 +0000 (UTC)","from pps.filterd (m0279866.ppops.net [127.0.0.1])\n\tby mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id\n 63N94wAs2319682\n\tfor ; Thu, 23 Apr 2026 13:31:32 GMT","from mail-pl1-f198.google.com (mail-pl1-f198.google.com\n [209.85.214.198])\n\tby mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dqgfss1ef-1\n\t(version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT)\n\tfor ; Thu, 23 Apr 2026 13:31:31 +0000 (GMT)","by mail-pl1-f198.google.com with SMTP id\n d9443c01a7336-2b465bf993cso69149105ad.1\n for ;\n Thu, 23 Apr 2026 06:31:31 -0700 (PDT)","from hu-bvisredd-hyd.qualcomm.com ([202.46.22.19])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b5fab0cbaasm198795635ad.54.2026.04.23.06.31.19\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 23 Apr 2026 06:31:27 -0700 (PDT)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1776951096; cv=none;\n b=CEDBqgh2WRFmaCAqtm+6W7R1wkkfupk4MCOmEuPTRrBrKxhwTQAzrcDQw7wX/C9vab55MQwAWOjMcOpW74c+3+uLk6a22TYCh5ny1wk28KkavR+hIWJGeupd0vK+mR+Hbxwm5WTSM37ndkrzB+TAWoYA2mI82eULL4riNhd+6lY=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1776951096; c=relaxed/simple;\n\tbh=PdPE7KqUQFuwPsQRz26oiYLnLc9ew3D9O8MAtZ75eWw=;\n\th=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:\n\t In-Reply-To:To:Cc;\n b=ukCx97MIXaDPXP5VngktzAALsbS62f2H53x53WTUR8ukzNdlrSEscumZhbwJO8RX3+nLrwOiHA47DfwV2boMGUPnyqjfX/FCohDuGEFk57r2zDDslHFbfDJGmxvPQl4DB3LDQoP0KHNPuKC3wZO5mTAgOqSviPR5Lgz9rFV400M=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com;\n spf=pass smtp.mailfrom=oss.qualcomm.com;\n dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com\n header.b=Ou1L+JEe;\n dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com\n header.b=holnh90q; arc=none smtp.client-ip=205.220.168.131","DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h=\n\tcc:content-transfer-encoding:content-type:date:from:in-reply-to\n\t:message-id:mime-version:references:subject:to; s=qcppdkim1; bh=\n\tUCyS/VSZ598bgRvBororH4kzu2wJIntee/DjGCCJkUA=; b=Ou1L+JEeJU6MbIKI\n\t20PGOoNTYvsyMdxzlYGyJ9kq7WniVsEPfbjt8jX4NIn4S8VZgaUPCLXKSlBrHP9I\n\teYJa3dm1iWqQ/G+MkYFsIi1IYUIfsfZ4JJ9rTkk2QiadNTNXxLcZmvER/DHrq6tm\n\tQbfnRHrnWnbYa5/2s01/BVDp7bapY5lx/8LgLg5yU/0ZfHGRxx65L5LBxwGC9RgZ\n\tD9rqeFyPz0WIfHEhvXOD3jPRFzoCZlHWwYeALhbJBTeFikC4sW6cPr0juo0nqaUb\n\tdbX7rt8WJXvjnFl4wlm+kXQTsATInldn4HxRaLXjLLfGrKpdW4k06ZPRuyf9+JIN\n\tZ+ypug==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=oss.qualcomm.com; s=google; t=1776951091; x=1777555891;\n darn=vger.kernel.org;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:from:to:cc:subject:date:message-id\n :reply-to;\n bh=UCyS/VSZ598bgRvBororH4kzu2wJIntee/DjGCCJkUA=;\n b=holnh90qMPWRwv4se7cvwJDJMHVwDADePBF2w25NZ5jpIIjQTLEHx4uJB+pFApnPiS\n 87ORTDr/+je+/8+k+wm/T2Wq95zKin9zUWSHqOWKDXkZeLfOOMu4KgFDm1MJQs9z8vo2\n HEsMNcnYTvrq1hulBinCjF0GBULWSwH++lyiJxRpcD+FkeKTI5SDU/zaYeLGkJNgnMUs\n 7UdP+eo3TwGHMnrvGn9j4XdNVGwLYMBXqZ19VHdDS1tqHbXDeF82H5e2jAGhMEuPF3Mx\n U5TYNqV25MGtTGp1T0tUT4XP7zJcLOQPh+qu5iEwr+w9KQHnpXXJowvQ5ehx6NEcIZ9J\n xD5Q=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776951091; x=1777555891;\n h=cc:to:in-reply-to:references:message-id:content-transfer-encoding\n :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to\n :cc:subject:date:message-id:reply-to;\n bh=UCyS/VSZ598bgRvBororH4kzu2wJIntee/DjGCCJkUA=;\n b=PrR+0b1SDPtosthHY4FiLKPBaQMzzXQwlYgpRc+qFsvycNQefTeAisUffSsU5aj4sq\n WhSrp4WQjV1L5RP9dP2LqN4OoviEmpWJcA7k7tEbT/1EINal4fllnfXXsJxtdjJyguj6\n W7W1GKHO4u6KtJUFQEcegk9Dt6BaZwZPjJ37MjWNKZnyp/JFbtLYmGV/3mcl7c87e56P\n j3Xj+b3zZO+nfQbK+6r21KNKMBDhf0hZQSPlt2FJNv45RNi3rxqHHk1mTh55aqD56p4l\n 7xAgl8oWayZv5PZTUe4UmhszG3DisiY7MtDiuKmesXtX1OQiIhLVkZUn/xr5BNyEabOy\n biZA==","X-Forwarded-Encrypted":"i=1;\n AFNElJ9SMbK67ANyjQ+sJa+I/npWa+aSo6guefcWIU0GjbbzCGxgRw6tnJBpuCUzJjSRuU/PcD7B8sChGykxSw==@vger.kernel.org","X-Gm-Message-State":"AOJu0Yy++QIq7dYzEGaY7AaPcwjS51SbGhFVpdgjMdigKwsWFIRK1prv\n\tYVplb9QvjBnqMREEsjvZhUeIqZgSNWgRk+umet/a0yvKVEbBod5Z0dx7gKa0Qol8IoS0060geAZ\n\tCOhbhTwQLdbZ3tvYXdIvVT+sagnmzy6mLctsKBsQ/LEy3dqTpLYeYQfAJKL7l5JVNAQ==","X-Gm-Gg":"AeBDieuVOr/5Eel0hxg1jJpBrh4qAHdwG9N2MX8lXatb0n9DBcF/Iqv9v7I0+kttYXG\n\tPU3Q7i+RvIUnkflfgQJiFQlT64zRHzZcm0XE6zBEVI9NW+jdoPkuuoMRwMxfp3BcXbBrU3M4MGM\n\tGZQ6Aa/ZLsgVhJKrZkxpEUU7FyVjrO1HhUYfR8FONDEKttNwQsJjaUPvV3EWVHqRXlt24ejrfGu\n\tRVbhlFl466CiwmeogBmJc0qczycjGT8pl1rkKvw4PdCzT1VR82UdhOpA1y262Z18yDKYtPsXu43\n\tgd28Rc3RqesBwPTMjk8Px1Fcp674xq4d/1jgTgmg7Kee8IwH7sl0UV6gxNXeCHJ1lZdgUVaR7Wa\n\tyB2uqHPc9oM6WdnI6aW+41tZZAZjdt6CfSBgo9aptqWWZ46vEXjzO7hU2TdenLzLjRQ==","X-Received":["by 2002:a17:902:cec6:b0:2b2:49a7:a5ca with SMTP id\n d9443c01a7336-2b5f9e8f561mr281602245ad.5.1776951090759;\n Thu, 23 Apr 2026 06:31:30 -0700 (PDT)","by 2002:a17:902:cec6:b0:2b2:49a7:a5ca with SMTP id\n d9443c01a7336-2b5f9e8f561mr281599595ad.5.1776951088360;\n Thu, 23 Apr 2026 06:31:28 -0700 (PDT)"],"From":"Vishnu Reddy ","Date":"Thu, 23 Apr 2026 18:59:39 +0530","Subject":"[PATCH v2 10/13] media: iris: Add support to select core for dual\n core platforms","Precedence":"bulk","X-Mailing-List":"linux-tegra@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":"<20260423-glymur-v2-10-0296bccb9f4e@oss.qualcomm.com>","References":"<20260423-glymur-v2-0-0296bccb9f4e@oss.qualcomm.com>","In-Reply-To":"<20260423-glymur-v2-0-0296bccb9f4e@oss.qualcomm.com>","To":"Bryan O'Donoghue ,\n Vikash Garodia ,\n Dikshita Agarwal ,\n Abhinav Kumar ,\n Mauro Carvalho Chehab ,\n Rob Herring ,\n Krzysztof Kozlowski ,\n Conor Dooley , Joerg Roedel ,\n Will Deacon , Robin Murphy ,\n Bjorn Andersson ,\n Konrad Dybcio ,\n Stefan Schmidt ,\n Hans Verkuil ,\n Greg Kroah-Hartman ,\n \"Rafael J. Wysocki\" ,\n Danilo Krummrich ,\n Thierry Reding ,\n Mikko Perttunen ,\n David Airlie , Simona Vetter ,\n Jonathan Hunter ","Cc":"linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org,\n devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,\n iommu@lists.linux.dev, driver-core@lists.linux.dev,\n dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org,\n Vishnu Reddy ","X-Mailer":"b4 0.14.3","X-Developer-Signature":"v=1; a=ed25519-sha256; t=1776950985; l=13641;\n i=busanna.reddy@oss.qualcomm.com; s=20260216; h=from:subject:message-id;\n bh=PdPE7KqUQFuwPsQRz26oiYLnLc9ew3D9O8MAtZ75eWw=;\n b=ImYzh5zI6yr2cxuvnsS3NP1ZxtpA4Gb5upNYrdl8KmojLsvNQS0KxwJWnSCqn0T4niPiCmIXd\n OmPsDqBaNvDCwc23rFgUnqkYj4LCtnAuz6yD325zsNO/VMxRMifTHN4","X-Developer-Key":"i=busanna.reddy@oss.qualcomm.com; a=ed25519;\n pk=9vmy9HahBKVAa+GBFj1yHVbz0ey/ucIs1hrlfx+qtok=","X-Proofpoint-ORIG-GUID":"UmMJ0wpLcLadGqU1YDFXUSWBAOkB_7x4","X-Proofpoint-Spam-Details-Enc":"AW1haW4tMjYwNDIzMDEzNCBTYWx0ZWRfXzyBFo5tlR6Bq\n M96sUY4Tt4VovsE5F7xsBBKfgklxbeghECjNdsYotGDIZf3axdPdhUAP2q/KeNCO+qWzm7pzkO6\n ebr0DmH3uwFYRs+M3ewe0qucszdjO+xCm/K2bNmeRV72dJfI1UV/PHt+BJE5aQqimMnrACOH9v4\n fRKAxC1DovWOSEgSKl3x9WjQZX36pORxJ1Mcou0S+qy3ewSt3HX3WR0Kuv5KminIFxKo6DLS+ds\n /dbQRupAsOTOy3o8svXUJqjv57WLItQpu1dx1ALTFiKHxsmcxZ1Fvf+291BfiDIW8BcStHypC84\n mloQTHj7PvGhWYffBEPw3FPqVcN2dj5c9yYwUyn8aL7h7FCLxtYLwQNl1p7NPoahBu7avcnCUM/\n cgXd0b2frujNrN1FLQWBMBkjbhwB/JIkxzjrw3RS17olHkCTPBIXS+LwPyFPBTRHqNMvdUgjvc/\n do9mzOUrP2NbddjeGLg==","X-Authority-Analysis":"v=2.4 cv=AvbeGu9P c=1 sm=1 tr=0 ts=69ea1f33 cx=c_pps\n a=MTSHoo12Qbhz2p7MsH1ifg==:117 a=fChuTYTh2wq5r3m49p7fHw==:17\n a=IkcTkHD0fZMA:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10\n a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22\n a=EUspDBNiAAAA:8 a=SR9mA3E-jA3Ceylw1tAA:9 a=QEXdDO2ut3YA:10\n a=GvdueXVYPmCkWapjIL-Q:22","X-Proofpoint-GUID":"UmMJ0wpLcLadGqU1YDFXUSWBAOkB_7x4","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49\n definitions=2026-04-23_03,2026-04-21_02,2025-10-01_01","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n priorityscore=1501 impostorscore=0 phishscore=0 suspectscore=0\n lowpriorityscore=0 spamscore=0 clxscore=1015 malwarescore=0 bulkscore=0\n adultscore=0 classifier=typeunknown authscore=0 authtc= authcc=\n route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000\n definitions=main-2604230134"},"content":"On platforms with dual vcodec cores, select the hardware core for a\nsession based on current load. Assign the session to vcodec0 if its\nMBPF/MBPS capacity allows it, otherwise assign to vcodec1. Communicate\nthe selected core to firmware using the new HFI_PROP_CORE_ID property.\n\nSigned-off-by: Vishnu Reddy \n---\n drivers/media/platform/qcom/iris/iris_common.c | 10 +++\n drivers/media/platform/qcom/iris/iris_common.h | 1 +\n drivers/media/platform/qcom/iris/iris_core.h | 5 ++\n drivers/media/platform/qcom/iris/iris_hfi_common.h | 1 +\n .../platform/qcom/iris/iris_hfi_gen2_command.c | 19 +++++\n .../platform/qcom/iris/iris_hfi_gen2_defines.h | 1 +\n drivers/media/platform/qcom/iris/iris_instance.h | 2 +\n .../platform/qcom/iris/iris_platform_common.h | 1 +\n drivers/media/platform/qcom/iris/iris_power.c | 11 ++-\n drivers/media/platform/qcom/iris/iris_utils.c | 87 +++++++++++++++++-----\n drivers/media/platform/qcom/iris/iris_vb2.c | 4 +\n drivers/media/platform/qcom/iris/iris_vidc.c | 6 +-\n 12 files changed, 123 insertions(+), 25 deletions(-)","diff":"diff --git a/drivers/media/platform/qcom/iris/iris_common.c b/drivers/media/platform/qcom/iris/iris_common.c\nindex 7f1c7fe144f7..3b3fc482e194 100644\n--- a/drivers/media/platform/qcom/iris/iris_common.c\n+++ b/drivers/media/platform/qcom/iris/iris_common.c\n@@ -46,6 +46,16 @@ void iris_set_ts_metadata(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf)\n \tinst->metadata_idx++;\n }\n \n+int iris_set_core_id(struct iris_inst *inst)\n+{\n+\tconst struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;\n+\n+\tif (!inst->core->iris_platform_data->dual_core)\n+\t\treturn 0;\n+\n+\treturn hfi_ops->session_set_core_id(inst, inst->core_id);\n+}\n+\n int iris_process_streamon_input(struct iris_inst *inst)\n {\n \tconst struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;\ndiff --git a/drivers/media/platform/qcom/iris/iris_common.h b/drivers/media/platform/qcom/iris/iris_common.h\nindex b2a27b781c9a..34e32c60f768 100644\n--- a/drivers/media/platform/qcom/iris/iris_common.h\n+++ b/drivers/media/platform/qcom/iris/iris_common.h\n@@ -11,6 +11,7 @@ struct iris_buffer;\n \n int iris_vb2_buffer_to_driver(struct vb2_buffer *vb2, struct iris_buffer *buf);\n void iris_set_ts_metadata(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf);\n+int iris_set_core_id(struct iris_inst *inst);\n int iris_process_streamon_input(struct iris_inst *inst);\n int iris_process_streamon_output(struct iris_inst *inst);\n int iris_session_streamoff(struct iris_inst *inst, u32 plane);\ndiff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h\nindex b396c8cf595e..54a8649841e4 100644\n--- a/drivers/media/platform/qcom/iris/iris_core.h\n+++ b/drivers/media/platform/qcom/iris/iris_core.h\n@@ -30,6 +30,11 @@ enum domain_type {\n \tDECODER\t= BIT(1),\n };\n \n+enum iris_vcodec_core_id {\n+\tIRIS_VCODEC0 = 1,\n+\tIRIS_VCODEC1,\n+};\n+\n /**\n * struct iris_core - holds core parameters valid for all instances\n *\ndiff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h\nindex 3edb5ae582b4..fbaf852a6b99 100644\n--- a/drivers/media/platform/qcom/iris/iris_hfi_common.h\n+++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h\n@@ -124,6 +124,7 @@ struct iris_hfi_command_ops {\n \tint (*session_drain)(struct iris_inst *inst, u32 plane);\n \tint (*session_resume_drain)(struct iris_inst *inst, u32 plane);\n \tint (*session_close)(struct iris_inst *inst);\n+\tint (*session_set_core_id)(struct iris_inst *inst, u32 core_id);\n };\n \n struct iris_hfi_response_ops {\ndiff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c\nindex 30bfd90d423b..9d9fae587297 100644\n--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c\n+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c\n@@ -1300,6 +1300,24 @@ static int iris_hfi_gen2_session_release_buffer(struct iris_inst *inst, struct i\n \t\t\t\t\tinst_hfi_gen2->packet->size);\n }\n \n+static int iris_hfi_gen2_set_core_id(struct iris_inst *inst, u32 core_id)\n+{\n+\tstruct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst);\n+\tu32 payload = core_id;\n+\n+\tiris_hfi_gen2_packet_session_command(inst,\n+\t\t\t\t\t HFI_PROP_CORE_ID,\n+\t\t\t\t\t HFI_HOST_FLAGS_NONE,\n+\t\t\t\t\t HFI_PORT_NONE,\n+\t\t\t\t\t inst->session_id,\n+\t\t\t\t\t HFI_PAYLOAD_U32,\n+\t\t\t\t\t &payload,\n+\t\t\t\t\t sizeof(u32));\n+\n+\treturn iris_hfi_queue_cmd_write(inst->core, inst_hfi_gen2->packet,\n+\t\t\t\t\tinst_hfi_gen2->packet->size);\n+}\n+\n static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {\n \t.sys_init = iris_hfi_gen2_sys_init,\n \t.sys_image_version = iris_hfi_gen2_sys_image_version,\n@@ -1317,6 +1335,7 @@ static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = {\n \t.session_drain = iris_hfi_gen2_session_drain,\n \t.session_resume_drain = iris_hfi_gen2_session_resume_drain,\n \t.session_close = iris_hfi_gen2_session_close,\n+\t.session_set_core_id = iris_hfi_gen2_set_core_id,\n };\n \n void iris_hfi_gen2_command_ops_init(struct iris_core *core)\ndiff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h\nindex cecf771c55dd..600e9dc07669 100644\n--- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h\n+++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h\n@@ -56,6 +56,7 @@\n #define HFI_PROP_BUFFER_HOST_MAX_COUNT\t\t0x03000123\n #define HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT\t0x03000124\n #define HFI_PROP_PIC_ORDER_CNT_TYPE\t\t0x03000128\n+#define HFI_PROP_CORE_ID\t\t\t0x030001a9\n \n enum hfi_rate_control {\n \tHFI_RC_VBR_CFR\t\t= 0x00000000,\ndiff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h\nindex 16965150f427..dd341ca5be57 100644\n--- a/drivers/media/platform/qcom/iris/iris_instance.h\n+++ b/drivers/media/platform/qcom/iris/iris_instance.h\n@@ -37,6 +37,7 @@ struct iris_fmt {\n *\n * @list: used for attach an instance to the core\n * @core: pointer to core structure\n+ * @core_id: specifies the hardware core on which the session runs\n * @session_id: id of current video session\n * @ctx_q_lock: lock to serialize queues related ioctls\n * @lock: lock to seralise forward and reverse threads\n@@ -79,6 +80,7 @@ struct iris_fmt {\n struct iris_inst {\n \tstruct list_head\t\tlist;\n \tstruct iris_core\t\t*core;\n+\tu32\t\t\t\tcore_id;\n \tu32\t\t\t\tsession_id;\n \tstruct mutex\t\t\tctx_q_lock;/* lock to serialize queues related ioctls */\n \tstruct mutex\t\t\tlock; /* lock to serialize forward and reverse threads */\ndiff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h\nindex 8995136ad29e..502d7099085c 100644\n--- a/drivers/media/platform/qcom/iris/iris_platform_common.h\n+++ b/drivers/media/platform/qcom/iris/iris_platform_common.h\n@@ -258,6 +258,7 @@ struct iris_platform_data {\n \tconst struct tz_cp_config *tz_cp_config_data;\n \tu32 tz_cp_config_data_size;\n \tu32 core_arch;\n+\tbool dual_core;\n \tu32 hw_response_timeout;\n \tstruct ubwc_config_data *ubwc_config;\n \tu32 num_vpp_pipe;\ndiff --git a/drivers/media/platform/qcom/iris/iris_power.c b/drivers/media/platform/qcom/iris/iris_power.c\nindex 91aa21d4070e..0e116c63f529 100644\n--- a/drivers/media/platform/qcom/iris/iris_power.c\n+++ b/drivers/media/platform/qcom/iris/iris_power.c\n@@ -77,9 +77,9 @@ static int iris_vote_interconnects(struct iris_inst *inst)\n \n static int iris_set_clocks(struct iris_inst *inst)\n {\n+\tu64 vcodec0_freq = 0, vcodec1_freq = 0;\n \tstruct iris_core *core = inst->core;\n \tstruct iris_inst *instance;\n-\tu64 freq = 0;\n \tint ret;\n \n \tmutex_lock(&core->lock);\n@@ -87,11 +87,14 @@ static int iris_set_clocks(struct iris_inst *inst)\n \t\tif (!instance->max_input_data_size)\n \t\t\tcontinue;\n \n-\t\tfreq += instance->power.min_freq;\n+\t\tif (instance->core_id == IRIS_VCODEC0)\n+\t\t\tvcodec0_freq += instance->power.min_freq;\n+\t\telse if (instance->core_id == IRIS_VCODEC1)\n+\t\t\tvcodec1_freq += instance->power.min_freq;\n \t}\n \n-\tcore->power.clk_freq = freq;\n-\tret = iris_opp_set_rate(core->dev, freq);\n+\tcore->power.clk_freq = vcodec0_freq > vcodec1_freq ? vcodec0_freq : vcodec1_freq;\n+\tret = iris_opp_set_rate(core->dev, core->power.clk_freq);\n \tmutex_unlock(&core->lock);\n \n \treturn ret;\ndiff --git a/drivers/media/platform/qcom/iris/iris_utils.c b/drivers/media/platform/qcom/iris/iris_utils.c\nindex cfc5b576ec56..1be4cfd7d9af 100644\n--- a/drivers/media/platform/qcom/iris/iris_utils.c\n+++ b/drivers/media/platform/qcom/iris/iris_utils.c\n@@ -90,40 +90,87 @@ struct iris_inst *iris_get_instance(struct iris_core *core, u32 session_id)\n \treturn NULL;\n }\n \n-int iris_check_core_mbpf(struct iris_inst *inst)\n+static u32 iris_get_mbps(struct iris_inst *inst)\n {\n-\tstruct iris_core *core = inst->core;\n-\tstruct iris_inst *instance;\n-\tu32 total_mbpf = 0;\n+\tu32 fps = max(inst->frame_rate, inst->operating_rate);\n+\n+\treturn iris_get_mbpf(inst) * fps;\n+}\n+\n+static void iris_get_core_load(struct iris_core *core, u32 *core_load, u32 *core_session, bool mbpf)\n+{\n+\tbool dual_core = core->iris_platform_data->dual_core;\n+\tstruct iris_inst *inst;\n+\tu32 load;\n+\n+\tcore_load[0] = 0;\n+\tcore_load[1] = 0;\n+\tcore_session[0] = 0;\n+\tcore_session[1] = 0;\n \n \tmutex_lock(&core->lock);\n-\tlist_for_each_entry(instance, &core->instances, list)\n-\t\ttotal_mbpf += iris_get_mbpf(instance);\n+\tlist_for_each_entry(inst, &core->instances, list) {\n+\t\tif (mbpf)\n+\t\t\tload = iris_get_mbpf(inst);\n+\t\telse\n+\t\t\tload = iris_get_mbps(inst);\n+\n+\t\tif (inst->core_id == IRIS_VCODEC0) {\n+\t\t\tcore_load[0] += load;\n+\t\t\tcore_session[0]++;\n+\t\t} else if (dual_core && inst->core_id == IRIS_VCODEC1) {\n+\t\t\tcore_load[1] += load;\n+\t\t\tcore_session[1]++;\n+\t\t}\n+\t}\n \tmutex_unlock(&core->lock);\n+}\n+\n+static int iris_select_core_id(struct iris_inst *inst, u32 *core_load, u32 *core_session,\n+\t\t\t u32 max_load, u32 new_load)\n+{\n+\tu32 max_session = inst->core->iris_platform_data->max_session_count;\n+\tbool dual_core = inst->core->iris_platform_data->dual_core;\n+\tu32 core_index;\n+\n+\tcore_index = (core_load[0] > core_load[1] && dual_core) ? 1 : 0;\n+\n+\tif (core_session[core_index] >= max_session)\n+\t\tcore_index = core_index == 0 && dual_core ? 1 : 0;\n \n-\tif (total_mbpf > core->iris_platform_data->max_core_mbpf)\n+\tif (core_session[core_index] >= max_session)\n+\t\treturn -ENOMEM;\n+\n+\tif (core_load[core_index] + new_load <= max_load)\n+\t\tinst->core_id = core_index == 0 ? IRIS_VCODEC0 : IRIS_VCODEC1;\n+\telse\n \t\treturn -ENOMEM;\n \n \treturn 0;\n }\n \n-int iris_check_core_mbps(struct iris_inst *inst)\n+int iris_check_core_mbpf(struct iris_inst *inst)\n {\n-\tstruct iris_core *core = inst->core;\n-\tstruct iris_inst *instance;\n-\tu32 total_mbps = 0, fps = 0;\n+\tu32 max_core_mbpf = inst->core->iris_platform_data->max_core_mbpf;\n+\tu32 core_mbpf[2], core_session[2], new_mbpf;\n \n-\tmutex_lock(&core->lock);\n-\tlist_for_each_entry(instance, &core->instances, list) {\n-\t\tfps = max(instance->frame_rate, instance->operating_rate);\n-\t\ttotal_mbps += iris_get_mbpf(instance) * fps;\n-\t}\n-\tmutex_unlock(&core->lock);\n+\tinst->core_id = 0;\n+\tiris_get_core_load(inst->core, core_mbpf, core_session, true);\n+\tnew_mbpf = iris_get_mbpf(inst);\n \n-\tif (total_mbps > core->iris_platform_data->max_core_mbps)\n-\t\treturn -ENOMEM;\n+\treturn iris_select_core_id(inst, core_mbpf, core_session, max_core_mbpf, new_mbpf);\n+}\n \n-\treturn 0;\n+int iris_check_core_mbps(struct iris_inst *inst)\n+{\n+\tu32 max_core_mbps = inst->core->iris_platform_data->max_core_mbps;\n+\tu32 core_mbps[2] = {0, 0}, core_session[2], new_mbps;\n+\n+\tinst->core_id = 0;\n+\tiris_get_core_load(inst->core, core_mbps, core_session, false);\n+\tnew_mbps = iris_get_mbps(inst);\n+\n+\treturn iris_select_core_id(inst, core_mbps, core_session, max_core_mbps, new_mbps);\n }\n \n bool is_rotation_90_or_270(struct iris_inst *inst)\ndiff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c\nindex bf0b8400996e..5a05f7d65501 100644\n--- a/drivers/media/platform/qcom/iris/iris_vb2.c\n+++ b/drivers/media/platform/qcom/iris/iris_vb2.c\n@@ -176,6 +176,10 @@ int iris_vb2_start_streaming(struct vb2_queue *q, unsigned int count)\n \tif (ret)\n \t\tgoto error;\n \n+\tret = iris_set_core_id(inst);\n+\tif (ret)\n+\t\tgoto error;\n+\n \tif (V4L2_TYPE_IS_OUTPUT(q->type)) {\n \t\tif (inst->domain == DECODER)\n \t\t\tret = iris_vdec_streamon_input(inst);\ndiff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c\nindex bd38d84c9cc7..eb167cede4c0 100644\n--- a/drivers/media/platform/qcom/iris/iris_vidc.c\n+++ b/drivers/media/platform/qcom/iris/iris_vidc.c\n@@ -41,16 +41,20 @@ static void iris_v4l2_fh_deinit(struct iris_inst *inst, struct file *filp)\n \n static void iris_add_session(struct iris_inst *inst)\n {\n+\tu32 max_session_count = inst->core->iris_platform_data->max_session_count;\n \tstruct iris_core *core = inst->core;\n \tstruct iris_inst *iter;\n \tu32 count = 0;\n \n+\tif (inst->core->iris_platform_data->dual_core)\n+\t\tmax_session_count *= 2;\n+\n \tmutex_lock(&core->lock);\n \n \tlist_for_each_entry(iter, &core->instances, list)\n \t\tcount++;\n \n-\tif (count < core->iris_platform_data->max_session_count)\n+\tif (count < max_session_count)\n \t\tlist_add_tail(&inst->list, &core->instances);\n \n \tmutex_unlock(&core->lock);\n","prefixes":["v2","10/13"]}