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 70C0E3D301B for ; Mon, 11 May 2026 16:12:56 +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=1778515978; cv=none; b=UvkeiJJXPeSsr/V7H1Gj+KFSMTgIf3U/SbPjAI4PEZdq1Oz3HQs1Tr4NQ/tczSHrLALC6BwCjo56tIsnWWYqsykt4C6uXCggEUTdDvKhH56XWdvLmg8Ew2+7i6cji7RtBW8p+ZsPkfVqTAROB9MT1pMragBu9yWBuE2llB8JmV8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778515978; c=relaxed/simple; bh=YK8HQ4dAvq5iDn6XsqWNkctQxmhG3HE/lEbweCZfAy8=; h=Message-ID:Date:MIME-Version:From:Subject:To:Cc:References: In-Reply-To:Content-Type; b=PNPPSAbKzzd5yhw0R/l5emCGJOsRtc4WgbF9qxalG7bFsNSwfKhAlXp0NvJB+yh1LKtm0YG1YffVGLmPJlG4kadBiGMw0oF+uOD1HUDxLPgMkL4Q7FDGagc9ikWhgMyS0e/5/cyQL667OYXVveAOUg89YRfih1Nc1LLVNR2xcY8= 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=SEElRUja; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=KSUCd/j/; 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="SEElRUja"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="KSUCd/j/" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BD3YGX3332715 for ; Mon, 11 May 2026 16:12:55 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= d+eJmYzUaeJ/3bfG2jTKi/XZgOFYQ5znkrqu/wHG+xo=; b=SEElRUja+FpowlzO 5HNGYG9f0j1SSpXW+1PKIqZMl4oqpRx21hB+5sxMBDF1g3CfD68lL8rUKRHRWraL ysRzVS6kdtyCFtE/yUxBPxVsW/cRr2niWO8dKSNKfd4GjQw17KV+8I5BThgEJngo DdsUT5QRk68Y4KCPqehlg8wFhp8qIePyPYl/g3t4HuTlMMZoXF+UgH1c8j7S0+23 fcTYzF506YzIGJ7ufLKJ8UtRB/nUyQbUHFPrsX8ayPBikTxRzBIyhDSBsEi0ph0w yT8r4EapF8h6vFg/ECAQm1wwW/m5HMJO6YJyGdpgOwQ0RrF/+3WQqPX2bE5fEYOm t2SJXg== Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e3ajgt4v8-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 16:12:55 +0000 (GMT) Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2ba5f794825so37892855ad.0 for ; Mon, 11 May 2026 09:12:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778515974; x=1779120774; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=d+eJmYzUaeJ/3bfG2jTKi/XZgOFYQ5znkrqu/wHG+xo=; b=KSUCd/j/AWQKEFaHPNSofsPe2WmuS0icdZQ5oJ0KNPWk/JbXtouV65jLy2Si9632j4 LdBQQKqs4NqZkVv3mIXrJ8+rX8vKRGUqUU8BaMEqm3YzJbTfp1r3FLqjP+1/Xt6B+LG9 ehvaQrwvm73RBRJAnrnILd1RiLTUmW154tQkji+fmFSOOQMR5Vkl1txhxbp56TtaL45C oKEJWxgxV9UMwDAw43LT7tAFCwLl4H99EUMgV3+ZCRW6pW6FxIF7D02rNm+1cK0d6Cp9 BR0yNxXM/ztM1YOSvZyexEsM+Jr/NTYQNoGeRoD/GUX2Fvr8Yh5fjLm/WzvuQg7vXGhU xa1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778515974; x=1779120774; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:from:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=d+eJmYzUaeJ/3bfG2jTKi/XZgOFYQ5znkrqu/wHG+xo=; b=tSfHGwvJyS1NzwdvEREd/3rINBCLkyVZjX9PJzN1/JeoVkHbULwDqnG7p4Unyamfup MUdkMh09p4My6XU81yRTsTSWNp7fQM7HgrCVQXL8/0i03G50f8cvsY9cHG9HdFPUxDY9 LcvJYye1jGN3Z/UbiDdb7OIbsp9ivJ5MDZGrBx8HhSLuH/FOfewsY281wr4m7JmV7GaO kOxZyySuB1tRTgEUBuJLe0tYHGGav0NjFCC5ENStwyjaBAqoClHBcAeMTwIbLaWSCoz6 lefc/Ua+lP1UQ9cpkjB9awwIU+gcs6MGN7x6+EvdOI6V2d17qgpDzAgNUFem2rZ51wnb rx5Q== X-Forwarded-Encrypted: i=1; AFNElJ90aLkkN1b7Hg6UsrANMszUFpWuJ1J0KZ74Jd6dyEYFADQ0oVxfF7rQ4+U5wdtS/gIhCtmzCA18Y7Fm@vger.kernel.org X-Gm-Message-State: AOJu0YzxlB3gqMfJugSzs188fvGqnWLVCC7KtrNSwhLg8/NvnwWf5yIU UVnQrCkzC7D/qskLvD6nNprhAMqYoM8Bd2CUtLQkhj5Gbia3BzXqGKBU50PJOTol3i3WWUrGPVS z63X52sDlrDnYFFrTcOKboM0QT/5IEIovnwkPzAJOAdEKo5yW1QZD82f3otNUTlAe X-Gm-Gg: Acq92OGnwpOVagWcYKJV4FvKZp+qk3KqadZr8R4nEHJNXUmlyOO/FH2QLHjN0SYIqD2 Fl11oBdk69z6Kvz5Rtf8aU5k0cHGDKnzKPOXuJWmsWold6MEILac83PuSJtnIVysuFfw5/8O2j7 P/GYrZXymBarXqpUWIvobf8QV8ttF2FGgIkcAXq0HxoXVX15xm229oExVNHU8LryTE6jQW3Y9lN Y+Qf0N9JRddQJHCUJ/zoyyQ6ItYdX6qiEUHs05e08EjXMkNPHxoMTrFIedODh0D5G3q43AQQe2M Ke9+gDIiVd7xlTKmQEF9wHZ0i0S9oOXMshZV2l9KuJtjrcpz3sg9ecpH4swivPkrq3WsTF7dFRS y5Ku+hN6+c5WzYsGVtEtKkvpeRCWPb5C/48pHZbZgFdzAgvG8P0Qr9Q== X-Received: by 2002:a17:903:1a28:b0:2b9:f8e9:70e2 with SMTP id d9443c01a7336-2bc7a990b6emr106817325ad.8.1778515974117; Mon, 11 May 2026 09:12:54 -0700 (PDT) X-Received: by 2002:a17:903:1a28:b0:2b9:f8e9:70e2 with SMTP id d9443c01a7336-2bc7a990b6emr106816785ad.8.1778515973476; Mon, 11 May 2026 09:12:53 -0700 (PDT) Received: from [10.206.105.200] ([202.46.23.25]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1ebd0ddsm107795515ad.75.2026.05.11.09.12.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 11 May 2026 09:12:53 -0700 (PDT) Message-ID: Date: Mon, 11 May 2026 21:42:43 +0530 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 From: Vishnu Reddy Subject: Re: [PATCH v5 11/14] media: iris: Add support to select core for dual core platforms To: Dmitry Baryshkov Cc: Vikash Garodia , Dikshita Agarwal , Abhinav Kumar , Bryan O'Donoghue , Mauro Carvalho Chehab , Joerg Roedel , Will Deacon , Robin Murphy , Hans Verkuil , Stefan Schmidt , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stanimir Varbanov , Jorge Ramirez-Ortiz , Del Regno , Bjorn Andersson , Konrad Dybcio , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, Krzysztof Kozlowski , devicetree@vger.kernel.org References: <20260509-glymur-v5-0-7fbb340c5dbd@oss.qualcomm.com> <20260509-glymur-v5-11-7fbb340c5dbd@oss.qualcomm.com> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Authority-Analysis: v=2.4 cv=GfgnWwXL c=1 sm=1 tr=0 ts=6a020007 cx=c_pps a=JL+w9abYAAE89/QcEU+0QA==:117 a=ZePRamnt/+rB5gQjfz0u9A==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_glEPmIy2e8OvE2BGh3C:22 a=EUspDBNiAAAA:8 a=2-zYGZsV2c8AeJLcM-QA:9 a=QEXdDO2ut3YA:10 a=324X-CrmTo6CU4MGRt3R:22 X-Proofpoint-GUID: HaU0S6qJpRt3HjR37Zk3cK-eBEi1PlCJ X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE3NCBTYWx0ZWRfX1t5oVIpfg3fK C6qg9LhpdAb5yzm0G1loxEX+PNHEdK7qktF3fMtS0oIQ/Saur7vXyRvxmAnKygfgwdOAxqO/4Kj hd+5tYC24dyNofZaR+B59T74z6HFMU8P5YMwpP5UezDsfxgAdOWpfYg/8h93HwoxvjBealUeKlC iO+iS9wCO0PCN7h17R4ysY9x2gYq2euTafpQOJv3aes+MiAsWHQ6pb4NrbgdJ60zpL/prg8zzgx dWbGGNJGes0KwkQ9Q+N8OnK7PGEI0rhr3tHYwtiK57aQh52XT7R0UUCoi6IhKgRl9fnVjMvC5au ruNA7HJqInQN/lWZDNXK7sT/czqsqZBx9gDoId3F6fRJvqnajFOVC+6wFok98Emp/PLTPzGdKdr xrpMUbECc1wTjPq8TH0PaMChY8Me0foBY8q10UH5zymdmwuTJ0T9yoenOWZRb3llQcEJn64BfAl Wpxf2FyRd0ukqv8wIuw== X-Proofpoint-ORIG-GUID: HaU0S6qJpRt3HjR37Zk3cK-eBEi1PlCJ 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-05-11_04,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 phishscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110174 On 5/9/2026 2:30 AM, Dmitry Baryshkov wrote: > On Sat, May 09, 2026 at 12:30:00AM +0530, Vishnu Reddy wrote: >> On platforms with dual vcodec cores, select the hardware core for a >> session based on current load. Assign the session to vcodec0 if its >> MBPF/MBPS capacity allows it, otherwise assign to vcodec1. Communicate >> the selected core to firmware using the new HFI_PROP_CORE_ID property. >> >> Signed-off-by: Vishnu Reddy >> --- >> drivers/media/platform/qcom/iris/iris_common.c | 10 +++ >> drivers/media/platform/qcom/iris/iris_common.h | 1 + >> drivers/media/platform/qcom/iris/iris_core.h | 5 ++ >> drivers/media/platform/qcom/iris/iris_hfi_common.h | 1 + >> .../platform/qcom/iris/iris_hfi_gen2_command.c | 19 ++++++ >> .../platform/qcom/iris/iris_hfi_gen2_defines.h | 1 + >> drivers/media/platform/qcom/iris/iris_instance.h | 2 + >> .../platform/qcom/iris/iris_platform_common.h | 1 + >> drivers/media/platform/qcom/iris/iris_power.c | 11 ++-- >> drivers/media/platform/qcom/iris/iris_utils.c | 75 ++++++++++++++++------ >> drivers/media/platform/qcom/iris/iris_vb2.c | 4 ++ >> drivers/media/platform/qcom/iris/iris_vidc.c | 6 +- >> 12 files changed, 113 insertions(+), 23 deletions(-) >> >> diff --git a/drivers/media/platform/qcom/iris/iris_common.c b/drivers/media/platform/qcom/iris/iris_common.c >> index 7f1c7fe144f7..3b3fc482e194 100644 >> --- a/drivers/media/platform/qcom/iris/iris_common.c >> +++ b/drivers/media/platform/qcom/iris/iris_common.c >> @@ -46,6 +46,16 @@ void iris_set_ts_metadata(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf) >> inst->metadata_idx++; >> } >> >> +int iris_set_core_id(struct iris_inst *inst) >> +{ >> + const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; >> + >> + if (!inst->core->iris_platform_data->dual_core) >> + return 0; >> + >> + return hfi_ops->session_set_core_id(inst, inst->core_id); >> +} >> + >> int iris_process_streamon_input(struct iris_inst *inst) >> { >> const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; >> diff --git a/drivers/media/platform/qcom/iris/iris_common.h b/drivers/media/platform/qcom/iris/iris_common.h >> index b2a27b781c9a..34e32c60f768 100644 >> --- a/drivers/media/platform/qcom/iris/iris_common.h >> +++ b/drivers/media/platform/qcom/iris/iris_common.h >> @@ -11,6 +11,7 @@ struct iris_buffer; >> >> int iris_vb2_buffer_to_driver(struct vb2_buffer *vb2, struct iris_buffer *buf); >> void iris_set_ts_metadata(struct iris_inst *inst, struct vb2_v4l2_buffer *vbuf); >> +int iris_set_core_id(struct iris_inst *inst); >> int iris_process_streamon_input(struct iris_inst *inst); >> int iris_process_streamon_output(struct iris_inst *inst); >> int iris_session_streamoff(struct iris_inst *inst, u32 plane); >> diff --git a/drivers/media/platform/qcom/iris/iris_core.h b/drivers/media/platform/qcom/iris/iris_core.h >> index b396c8cf595e..54a8649841e4 100644 >> --- a/drivers/media/platform/qcom/iris/iris_core.h >> +++ b/drivers/media/platform/qcom/iris/iris_core.h >> @@ -30,6 +30,11 @@ enum domain_type { >> DECODER = BIT(1), >> }; >> >> +enum iris_vcodec_core_id { >> + IRIS_VCODEC0 = 1, >> + IRIS_VCODEC1, >> +}; >> + >> /** >> * struct iris_core - holds core parameters valid for all instances >> * >> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_common.h b/drivers/media/platform/qcom/iris/iris_hfi_common.h >> index 3edb5ae582b4..fbaf852a6b99 100644 >> --- a/drivers/media/platform/qcom/iris/iris_hfi_common.h >> +++ b/drivers/media/platform/qcom/iris/iris_hfi_common.h >> @@ -124,6 +124,7 @@ struct iris_hfi_command_ops { >> int (*session_drain)(struct iris_inst *inst, u32 plane); >> int (*session_resume_drain)(struct iris_inst *inst, u32 plane); >> int (*session_close)(struct iris_inst *inst); >> + int (*session_set_core_id)(struct iris_inst *inst, u32 core_id); >> }; >> >> struct iris_hfi_response_ops { >> 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 30bfd90d423b..9d9fae587297 100644 >> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c >> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_command.c >> @@ -1300,6 +1300,24 @@ static int iris_hfi_gen2_session_release_buffer(struct iris_inst *inst, struct i >> inst_hfi_gen2->packet->size); >> } >> >> +static int iris_hfi_gen2_set_core_id(struct iris_inst *inst, u32 core_id) >> +{ >> + struct iris_inst_hfi_gen2 *inst_hfi_gen2 = to_iris_inst_hfi_gen2(inst); >> + u32 payload = core_id; >> + >> + iris_hfi_gen2_packet_session_command(inst, >> + HFI_PROP_CORE_ID, >> + HFI_HOST_FLAGS_NONE, >> + HFI_PORT_NONE, >> + inst->session_id, >> + HFI_PAYLOAD_U32, >> + &payload, >> + sizeof(u32)); >> + >> + return iris_hfi_queue_cmd_write(inst->core, inst_hfi_gen2->packet, >> + inst_hfi_gen2->packet->size); >> +} >> + >> static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = { >> .sys_init = iris_hfi_gen2_sys_init, >> .sys_image_version = iris_hfi_gen2_sys_image_version, >> @@ -1317,6 +1335,7 @@ static const struct iris_hfi_command_ops iris_hfi_gen2_command_ops = { >> .session_drain = iris_hfi_gen2_session_drain, >> .session_resume_drain = iris_hfi_gen2_session_resume_drain, >> .session_close = iris_hfi_gen2_session_close, >> + .session_set_core_id = iris_hfi_gen2_set_core_id, >> }; >> >> void iris_hfi_gen2_command_ops_init(struct iris_core *core) >> diff --git a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h >> index cecf771c55dd..600e9dc07669 100644 >> --- a/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h >> +++ b/drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h >> @@ -56,6 +56,7 @@ >> #define HFI_PROP_BUFFER_HOST_MAX_COUNT 0x03000123 >> #define HFI_PROP_BUFFER_FW_MIN_OUTPUT_COUNT 0x03000124 >> #define HFI_PROP_PIC_ORDER_CNT_TYPE 0x03000128 >> +#define HFI_PROP_CORE_ID 0x030001a9 >> >> enum hfi_rate_control { >> HFI_RC_VBR_CFR = 0x00000000, >> diff --git a/drivers/media/platform/qcom/iris/iris_instance.h b/drivers/media/platform/qcom/iris/iris_instance.h >> index 16965150f427..dd341ca5be57 100644 >> --- a/drivers/media/platform/qcom/iris/iris_instance.h >> +++ b/drivers/media/platform/qcom/iris/iris_instance.h >> @@ -37,6 +37,7 @@ struct iris_fmt { >> * >> * @list: used for attach an instance to the core >> * @core: pointer to core structure >> + * @core_id: specifies the hardware core on which the session runs >> * @session_id: id of current video session >> * @ctx_q_lock: lock to serialize queues related ioctls >> * @lock: lock to seralise forward and reverse threads >> @@ -79,6 +80,7 @@ struct iris_fmt { >> struct iris_inst { >> struct list_head list; >> struct iris_core *core; >> + u32 core_id; >> u32 session_id; >> struct mutex ctx_q_lock;/* lock to serialize queues related ioctls */ >> struct mutex lock; /* lock to serialize forward and reverse threads */ >> diff --git a/drivers/media/platform/qcom/iris/iris_platform_common.h b/drivers/media/platform/qcom/iris/iris_platform_common.h >> index 8995136ad29e..502d7099085c 100644 >> --- a/drivers/media/platform/qcom/iris/iris_platform_common.h >> +++ b/drivers/media/platform/qcom/iris/iris_platform_common.h >> @@ -258,6 +258,7 @@ struct iris_platform_data { >> const struct tz_cp_config *tz_cp_config_data; >> u32 tz_cp_config_data_size; >> u32 core_arch; >> + bool dual_core; >> u32 hw_response_timeout; >> struct ubwc_config_data *ubwc_config; >> u32 num_vpp_pipe; >> diff --git a/drivers/media/platform/qcom/iris/iris_power.c b/drivers/media/platform/qcom/iris/iris_power.c >> index 91aa21d4070e..b72ce5b596b8 100644 >> --- a/drivers/media/platform/qcom/iris/iris_power.c >> +++ b/drivers/media/platform/qcom/iris/iris_power.c >> @@ -77,9 +77,9 @@ static int iris_vote_interconnects(struct iris_inst *inst) >> >> static int iris_set_clocks(struct iris_inst *inst) >> { >> + u64 vcodec0_freq = 0, vcodec1_freq = 0; >> struct iris_core *core = inst->core; >> struct iris_inst *instance; >> - u64 freq = 0; >> int ret; >> >> mutex_lock(&core->lock); >> @@ -87,11 +87,14 @@ static int iris_set_clocks(struct iris_inst *inst) >> if (!instance->max_input_data_size) >> continue; >> >> - freq += instance->power.min_freq; >> + if (instance->core_id == IRIS_VCODEC0) >> + vcodec0_freq += instance->power.min_freq; >> + else >> + vcodec1_freq += instance->power.min_freq; >> } >> >> - core->power.clk_freq = freq; >> - ret = iris_opp_set_rate(core->dev, freq); >> + core->power.clk_freq = max(vcodec0_freq, vcodec1_freq); >> + ret = iris_opp_set_rate(core->dev, core->power.clk_freq); >> mutex_unlock(&core->lock); >> >> return ret; >> diff --git a/drivers/media/platform/qcom/iris/iris_utils.c b/drivers/media/platform/qcom/iris/iris_utils.c >> index cfc5b576ec56..da8a89d3dd41 100644 >> --- a/drivers/media/platform/qcom/iris/iris_utils.c >> +++ b/drivers/media/platform/qcom/iris/iris_utils.c >> @@ -90,40 +90,79 @@ struct iris_inst *iris_get_instance(struct iris_core *core, u32 session_id) >> return NULL; >> } >> >> -int iris_check_core_mbpf(struct iris_inst *inst) >> +static u32 iris_get_mbps(struct iris_inst *inst) >> { >> - struct iris_core *core = inst->core; >> + u32 fps = max(inst->frame_rate, inst->operating_rate); >> + >> + return iris_get_mbpf(inst) * fps; >> +} >> + >> +static int iris_check_and_assign_core(struct iris_inst *inst, bool mbpf) >> +{ >> + const struct iris_platform_data *platform_data = inst->core->iris_platform_data; >> + u32 max_load = mbpf ? platform_data->max_core_mbpf : platform_data->max_core_mbps; >> + u32 max_session_cnt = platform_data->max_session_count; >> + u32 core0_session_cnt = 0, core1_session_cnt = 0; >> + bool dual_core = platform_data->dual_core; > num_cores A num_cores field would require updating all platform data entries. For two cores, a simple boolean flag feels sufficient here. >> + u32 core0_load = 0, core1_load = 0; >> + bool select_core0, select_core1; >> struct iris_inst *instance; >> - u32 total_mbpf = 0; >> + u32 load, new_load; >> >> - mutex_lock(&core->lock); >> - list_for_each_entry(instance, &core->instances, list) >> - total_mbpf += iris_get_mbpf(instance); >> - mutex_unlock(&core->lock); >> + inst->core_id = 0; >> >> - if (total_mbpf > core->iris_platform_data->max_core_mbpf) >> + list_for_each_entry(instance, &inst->core->instances, list) { >> + load = mbpf ? iris_get_mbpf(instance) : iris_get_mbps(instance); >> + >> + if (instance->core_id == IRIS_VCODEC0) { >> + core0_load += load; >> + core0_session_cnt++; >> + } else if (instance->core_id == IRIS_VCODEC1) { >> + core1_load += load; >> + core1_session_cnt++; > Arrays, please. Since we only have two cores, explicit variables feel cleaner and easier to read than arrays. >> + } >> + } >> + >> + new_load = mbpf ? iris_get_mbpf(inst) : iris_get_mbps(inst); >> + >> + select_core0 = core0_load + new_load <= max_load && core0_session_cnt < max_session_cnt; >> + select_core1 = dual_core && core1_load + new_load <= max_load && >> + core1_session_cnt < max_session_cnt; >> + >> + if (select_core0 && select_core1) >> + inst->core_id = (core0_load <= core1_load) ? IRIS_VCODEC0 : IRIS_VCODEC1; >> + else if (select_core0) >> + inst->core_id = IRIS_VCODEC0; >> + else if (select_core1) >> + inst->core_id = IRIS_VCODEC1; >> + else >> return -ENOMEM; >> >> return 0; >> } >> >> -int iris_check_core_mbps(struct iris_inst *inst) >> +int iris_check_core_mbpf(struct iris_inst *inst) >> { >> struct iris_core *core = inst->core; >> - struct iris_inst *instance; >> - u32 total_mbps = 0, fps = 0; >> + int ret; >> >> mutex_lock(&core->lock); >> - list_for_each_entry(instance, &core->instances, list) { >> - fps = max(instance->frame_rate, instance->operating_rate); >> - total_mbps += iris_get_mbpf(instance) * fps; >> - } >> + ret = iris_check_and_assign_core(inst, true); >> mutex_unlock(&core->lock); >> >> - if (total_mbps > core->iris_platform_data->max_core_mbps) >> - return -ENOMEM; >> + return ret; >> +} >> >> - return 0; >> +int iris_check_core_mbps(struct iris_inst *inst) >> +{ >> + struct iris_core *core = inst->core; >> + int ret; >> + >> + mutex_lock(&core->lock); >> + ret = iris_check_and_assign_core(inst, false); >> + mutex_unlock(&core->lock); >> + >> + return ret; >> } >> >> bool is_rotation_90_or_270(struct iris_inst *inst) >> diff --git a/drivers/media/platform/qcom/iris/iris_vb2.c b/drivers/media/platform/qcom/iris/iris_vb2.c >> index bf0b8400996e..5a05f7d65501 100644 >> --- a/drivers/media/platform/qcom/iris/iris_vb2.c >> +++ b/drivers/media/platform/qcom/iris/iris_vb2.c >> @@ -176,6 +176,10 @@ int iris_vb2_start_streaming(struct vb2_queue *q, unsigned int count) >> if (ret) >> goto error; >> >> + ret = iris_set_core_id(inst); >> + if (ret) >> + goto error; >> + >> if (V4L2_TYPE_IS_OUTPUT(q->type)) { >> if (inst->domain == DECODER) >> ret = iris_vdec_streamon_input(inst); >> diff --git a/drivers/media/platform/qcom/iris/iris_vidc.c b/drivers/media/platform/qcom/iris/iris_vidc.c >> index 5eb1786b0737..a1ce3cd524a3 100644 >> --- a/drivers/media/platform/qcom/iris/iris_vidc.c >> +++ b/drivers/media/platform/qcom/iris/iris_vidc.c >> @@ -41,16 +41,20 @@ static void iris_v4l2_fh_deinit(struct iris_inst *inst, struct file *filp) >> >> static void iris_add_session(struct iris_inst *inst) >> { >> + u32 max_session_count = inst->core->iris_platform_data->max_session_count; >> struct iris_core *core = inst->core; >> struct iris_inst *iter; >> u32 count = 0; >> >> + if (inst->core->iris_platform_data->dual_core) >> + max_session_count *= 2; > max_session_count *= num_cores. > >> + >> mutex_lock(&core->lock); >> >> list_for_each_entry(iter, &core->instances, list) >> count++; >> >> - if (count < core->iris_platform_data->max_session_count) >> + if (count < max_session_count) >> list_add_tail(&inst->list, &core->instances); >> >> mutex_unlock(&core->lock); >> >> -- >> 2.34.1 >>