From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86668C25B6B for ; Thu, 26 Oct 2023 04:28:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229638AbjJZE2o (ORCPT ); Thu, 26 Oct 2023 00:28:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbjJZE2n (ORCPT ); Thu, 26 Oct 2023 00:28:43 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3AA81186 for ; Wed, 25 Oct 2023 21:28:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RStaCZOIqfLRa93YqhwPcMgNnCdZHpJxk/TRJ/H4hec5iscfEie+LV0gDmyYeD7Scueupdp3YFzUgs7x4cOYhy6VZjabJgaVhGJtm8uL1RXZSozjcHH+p/Uoc+cifwkr0row1HUOubvQAw8+dfEYgUQpe7Xo3YvXYHE+qvjGYVgmGh/CC63WGD4Lycy6od4bovl0J6lTyKKnbevZTy5M/mwcPoMF0Ola9L6vGYetEzt+QiwMXZpa/iTlb8HBnmwk4QFIrouKWey6gqIXiZc+dIsyCA7QJt01A2Kf1bs6xBRcQ+g+iuHK0WVufXrxm5S+/JuIlGKSa8AW0zDwhvyRxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3M5XkXUByPOgsaukDoabz6/rZw+U9hIezNv5RZDJSQQ=; b=lXL6H8W89XHHrrAS6ajGUPMzakGme2DJ9z5cdIGu9xE3xrUHiJY392GmlYk4ktY59cYjRRVOSFmVlzLHc5GqZ9iXbwZI9AS0opoF97G0Xw3lgr1oTvgiKZfdPMcbzbFn+14IgqLCYFaRf2i6OB2z6sy9+SNF+I9V9jnqy0EbUobJl/f6PNgBxuvU9ioi6XJIJEWnl43OoMqc2WnWSELw+guJTQVCkqlRgN35En6nISAOM0tyPHJSKkrFlo5vd7e4Ty52ABi/ID0N1GdQWbjAmUleWCrXIdx3RfoemlNKt006SUJS6iObY1mCJY6hkeFFIgjtHJFPQoAm8n24wrHN5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3M5XkXUByPOgsaukDoabz6/rZw+U9hIezNv5RZDJSQQ=; b=gVTYrKcIuHPyZ1lvbjneyadjg+vwVCWXogEI2JCjfFkibWeFI0l18Gj5s3zqmVqjw/bdNF9+H4ml00q4x8+aPR0XSSHyHz3WSKsbJJN16Jn2Hs7SpJJwzg2SbeZlAlo7QiiqFeynYXQnHlidmElML7+LfqlNgbGZREiamlGJfX8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM6PR12MB3370.namprd12.prod.outlook.com (2603:10b6:5:38::25) by CH3PR12MB8403.namprd12.prod.outlook.com (2603:10b6:610:133::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33; Thu, 26 Oct 2023 04:28:35 +0000 Received: from DM6PR12MB3370.namprd12.prod.outlook.com ([fe80::b80b:7138:6ceb:9aef]) by DM6PR12MB3370.namprd12.prod.outlook.com ([fe80::b80b:7138:6ceb:9aef%6]) with mapi id 15.20.6907.025; Thu, 26 Oct 2023 04:28:35 +0000 Message-ID: Date: Thu, 26 Oct 2023 00:28:30 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:115.0) Gecko/20100101 Thunderbird/115.3.3 Subject: Re: [PATCH v7 3/6] drm/sched: Convert the GPU scheduler to variable number of run-queues Content-Language: en-CA, en-US To: Matthew Brost , dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: dakr@redhat.com, mcanal@igalia.com, frank.binns@imgtec.com, donald.robson@imgtec.com, sarah.walker@imgtec.com, ketil.johnsen@arm.com, Liviu.Dudau@arm.com, thomas.hellstrom@linux.intel.com, faith.ekstrand@collabora.com, boris.brezillon@collabora.com, airlied@gmail.com, daniel@ffwll.ch, christian.koenig@amd.com, robdclark@chromium.org, lina@asahilina.net, Lucas Stach , Russell King , Qiang Yu , Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Alex Deucher , Emma Anholt , etnaviv@lists.freedesktop.org, lima@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, nouveau@lists.freedesktop.org References: <20231026041236.1273694-1-matthew.brost@intel.com> <20231026041236.1273694-4-matthew.brost@intel.com> From: Luben Tuikov Autocrypt: addr=luben.tuikov@amd.com; keydata= xjMEY1i6jxYJKwYBBAHaRw8BAQdAhfD+Cc+P5t/fiF08Vw25EMLiwUuxULYRiDQAP6H50MTN I0x1YmVuIFR1aWtvdiA8bHViZW4udHVpa292QGFtZC5jb20+wpkEExYKAEEWIQQyyR05VSHw x45E/SoppxulNG8HhgUCY1i6jwIbAwUJCWYBgAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX gAAKCRAppxulNG8Hhk53AP4k4UY5xfcje0c5OF1k22pNv8tErxtVpgKKZgvfetA4xwD+OoAh vesLIYumBDxP0BoLiLN84udxdT15HwPFUGiDmwDOOARjWLqPEgorBgEEAZdVAQUBAQdAzSxY a2EtvvIwd09NckBLSTarSLNDkUthmqPnwolwiDYDAQgHwn4EGBYKACYWIQQyyR05VSHwx45E /SoppxulNG8HhgUCY1i6jwIbDAUJCWYBgAAKCRAppxulNG8HhnBLAP4yjSGpK6PE1mapKhrq 8bSl9reo+F6EqdhE8X2TTHPycAEAt8EkTEstSiaOpM66gneU7r+xxzOYULo1b1XjXayGvwM= In-Reply-To: <20231026041236.1273694-4-matthew.brost@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: YQZPR01CA0144.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:87::22) To DM6PR12MB3370.namprd12.prod.outlook.com (2603:10b6:5:38::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR12MB3370:EE_|CH3PR12MB8403:EE_ X-MS-Office365-Filtering-Correlation-Id: 267760c5-6bb3-4cb2-29ce-08dbd5dc0488 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JhqBU3Zm2F9yl0q/JIFw4usg+FEC6D2o+2Yyb+jjIVETvJhGuyx9KTtoWw8ew2OBS7l59BYjJiCbJPIT8Ur4WsIKDyM+kLXQh8XrUDfrkEbN4cJiv7vIVsntDF9O3qgig4SNTDZIHvTl6md4J1ZxeDKE4SWXiZbVNY8jD+eXo8OpyZlBErTzg8bVesdi7+Ews3XKNEXJDdi96RTZqg/Zz0aIX5CnIPijgB6xGxjWwDQM6sL1VHE8y6109mJ8o7MlM2TXoDG/oQPU/tRHuaVKz11TaonOgybonFNAgI+n94j6+eYuYzRpXN5g6DlkHc7flDPzlBNLq9zkhpMT4IpALyLf3t3/sIaXINYH8yAyefU2/XRUGjj3virmsU1tlcEd2oYXU6M0kJslBgFHRoKnH7MKVolIGo9wPHDAbOw4x0NYKMT24xTsj/mxh/tZZ/VZHwCLeh+91Ztd9xvElRFIsbNgElVVfQm6JPuq9yWakl1NdqAvED2Er2l3noXu6Y+upWkdAspeLGgcJw3TMePzmTAlIWbOZvIIWgenzLYO0EbHVzKkyrpC5yOobjLgObOcgSyfP7SfHz19ggsKa6wlvaTl2ibFNzfqiKkPCHe85YkrEc4zBc3PdqLbRGnYjDerl0IZIPRYrpKc+oiMJdeG/g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR12MB3370.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(136003)(396003)(346002)(366004)(230922051799003)(186009)(64100799003)(451199024)(1800799009)(26005)(31686004)(4001150100001)(38100700002)(2906002)(41300700001)(30864003)(44832011)(31696002)(86362001)(36756003)(5660300002)(8936002)(8676002)(4326008)(7416002)(54906003)(478600001)(2616005)(6506007)(66946007)(316002)(66556008)(66476007)(6486002)(83380400001)(66574015)(53546011)(6512007)(6666004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SjBpR2twMHRQYXQ4Wnh2bVQ0NEdDOE1LVENkNkJjYXBEZjhiUWxSeFh6c3k3?= =?utf-8?B?WXAyQmNTWTA0TWtVa3FOWlNlTEJvVnpJUmticWpnRjc4UUtEREprRDlWZUp1?= =?utf-8?B?YURhQ1VNRUZDZVgyREd0V3g4c2Y4UGNkQ2Fjc3dKZzJHR0RZakphUTViYWZl?= =?utf-8?B?U1BUVVpXQ2pQTERPbngzNlNmbUNoZjk4aVVKd2s0czZMbElXb1o0S05pdmxG?= =?utf-8?B?MFlVbEU1a3ZDOXlaQlMwY2MyU2Z0V2VFaDhucTJoNXhKUGhwZHVGWlF4SldQ?= =?utf-8?B?cEhxaEl4VU5MOGw2UVEzbkxCakUyRmd1UnQ4S1dxeGVOZ2hMaTdGQm0vZmVE?= =?utf-8?B?cTFMYWpiUUZ0NU5CSjN1ZWxkWE9DU3hVcTFEb3BPRFRLN0p1RXdINGphYU9C?= =?utf-8?B?c3VBS2V1WGI2TWd0ZHNUVEZYem1tZmUvMzFwYWMxVVhLaVltQmloVnR4ZFBv?= =?utf-8?B?dXdyNHZUeXBDaXhvR3REdGNFTVZCQjc2K0tzVTZhNGd0a0tadGtxNlpVNGJE?= =?utf-8?B?Sk5XTFNJa2JkQzNGb0p5WjZMTStpMkwxWFVObGF0ay9IUWZvM0wwaVM3QW9G?= =?utf-8?B?UnlxSG9MRnlQdVlnQU8xNGd1YjJSSnlVYjI2NkdPSGxJRVpka3hLd2lTZ3l6?= =?utf-8?B?SUNkVWNuZVhCdUR4TDhOV0JSczVJbXBQbHoyUC8zRERtZUJ2OWJKTkswYUFI?= =?utf-8?B?MTdOLzY1dlYrTE5lQm53WDdCUnVHTW5oanhHZ2VaRGNqVDBVZUlxY1FtcHpJ?= =?utf-8?B?N09GM0RhUlhibWVxSEVVcVhBNFhmamtwME9HQUpjbHM5cjRlUG5pZWhYVnVE?= =?utf-8?B?c2FoK3Z2WFpYNDFMcElZUExoOVE0ZXd6aktzdUxGRWJMTWd2S1lmM1hyQVhs?= =?utf-8?B?cnd5dkxtNS8vU1M0bStNSXV0N3pqaGk5UlZLVTJEa1gwQUxZZFZ5R0RoZ3ZI?= =?utf-8?B?Yit5aytZM1ZGSW5NSlBGdXBrenY3c0I5WGw2RmdoSHVrMmJyeVdYK0JrY3ll?= =?utf-8?B?N0NyVDNQaDJac2xOenRCMUFZeUQzTFIzdVZOVHcyc29Ba2I4Mmw2MFczWVNR?= =?utf-8?B?M284SzkybUwybUpHSjRPVVQ5ZzVJNmJQQi9uUENjcXpVeGVUbUtoYjlQekV3?= =?utf-8?B?SFl2SFEvRHVpYWVoR2V5Tkd1ZC9yaENNNE80WWxYbjY1MEhxYUp5aVcrUEJE?= =?utf-8?B?NGFudjNWZnYzeUlPR0RNZmdlQVZLY1BKcHpnUDdJeEJxRlpMRHE5cTBZWitq?= =?utf-8?B?cEM0Y3h6NnU1OGx6RHFoL3FWY3U0MGkxOWovMUVPb3p3bzk4WHZKM0tMVCtJ?= =?utf-8?B?Y1kzTndoTWVaRGhjbmdWQkZtZytZUXY4aGwzOUdkUFk5M1RDZXFrMVhJanVu?= =?utf-8?B?blYyUlNqRXZEd0lNalVISkhUWjVNMGcwTWlxNlRPVWkwYkdtODUwV2lyNVVX?= =?utf-8?B?K1dDYjZWSGdhRTY5OXY2RWVHOFBxeEwvTitKempjYXZ3cm5WQlhPbWRiTXBP?= =?utf-8?B?dHNxaXV3d0tQdzdOUkJ6K0tER1IyMjhwYm9zRDZrZ3FBVEJTckdxZXR5Tllx?= =?utf-8?B?RlVMVERGSUgxMnpCQTV3ajMrWmhNNFhycDFySDMvUkJla244aFExb3hmeVVE?= =?utf-8?B?MFZwaEd3ZUV3Q3lCYVpCQ2U4OXQzK1ptWmlaUDd5MGhKNHV2cGQ2L1h2TGxl?= =?utf-8?B?RHpHb2MyNXdCa0lvQVQ4ZElZL1BvTTgxTWV1NXI2aTNwNzRzQjI1UWFRTSs0?= =?utf-8?B?UlFJbDZGY0U2UDdRK0Z4UnU2MGltWXlWNjFvTVRWN0lMdU1Mc1lBYTZsVnhT?= =?utf-8?B?VU9sajh6TVd6eTNRTHhkVW5ibFFUUW55bENDSnNyNDk1VXRwUGdiT2VTM0VC?= =?utf-8?B?WDZEaWVLcE5YMnpXRis3ZzN5Yk1lczBpSEYzRjJkcE1ZYXFyTEdlZHpqVG02?= =?utf-8?B?OGlNQ2Q0Sy9DUFFuWS9UUWpZakVHUXBDbVBvS1pQd25aSVBXWkpvK3E3bXpJ?= =?utf-8?B?Nkd2ekNDZFJScDk3TkJBdC96WUFqbVU2aG9obXRRNXJBUkpUK3NaTU9MTld5?= =?utf-8?B?OFVUbFpUc1NJMkFLMk1vN1l5MksrYkc2c1NGOEtYUmRkdlVTRVRzTjdkclo3?= =?utf-8?Q?5TqAYxqGup7IpsXZlVBUuMGY1?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 267760c5-6bb3-4cb2-29ce-08dbd5dc0488 X-MS-Exchange-CrossTenant-AuthSource: DM6PR12MB3370.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 04:28:35.1559 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gYu4jSaTdfYQgzf+tfbS17wGiaS9KJwj0I/5WRAJX4/b7m7En59O0OTmm3d9f7rI X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8403 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2023-10-26 00:12, Matthew Brost wrote: > From: Luben Tuikov > > The GPU scheduler has now a variable number of run-queues, which are set up at > drm_sched_init() time. This way, each driver announces how many run-queues it > requires (supports) per each GPU scheduler it creates. Note, that run-queues > correspond to scheduler "priorities", thus if the number of run-queues is set > to 1 at drm_sched_init(), then that scheduler supports a single run-queue, > i.e. single "priority". If a driver further sets a single entity per > run-queue, then this creates a 1-to-1 correspondence between a scheduler and > a scheduled entity. > > Cc: Lucas Stach > Cc: Russell King > Cc: Qiang Yu > Cc: Rob Clark > Cc: Abhinav Kumar > Cc: Dmitry Baryshkov > Cc: Danilo Krummrich > Cc: Matthew Brost > Cc: Boris Brezillon > Cc: Alex Deucher > Cc: Christian König > Cc: Emma Anholt > Cc: etnaviv@lists.freedesktop.org > Cc: lima@lists.freedesktop.org > Cc: linux-arm-msm@vger.kernel.org > Cc: freedreno@lists.freedesktop.org > Cc: nouveau@lists.freedesktop.org > Cc: dri-devel@lists.freedesktop.org > Signed-off-by: Luben Tuikov > Signed-off-by: Matthew Brost Normally, you'd add your R-B. You should add your S-O-B tag, if you've co-authored/contributed to the commit or are the actual committer to drm-*, as "dim" requires it, but dim will tell you, so generally, I don't do that unless the tool tells me to. :-) So here, feel free to R-B the patch instead of S-O-B, on a patch post. Regards, Luben > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1 + > drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 4 +- > drivers/gpu/drm/etnaviv/etnaviv_sched.c | 3 +- > drivers/gpu/drm/lima/lima_sched.c | 3 +- > drivers/gpu/drm/msm/msm_ringbuffer.c | 3 +- > drivers/gpu/drm/nouveau/nouveau_sched.c | 1 + > drivers/gpu/drm/panfrost/panfrost_job.c | 3 +- > drivers/gpu/drm/scheduler/sched_entity.c | 18 +++++- > drivers/gpu/drm/scheduler/sched_main.c | 75 ++++++++++++++++++---- > drivers/gpu/drm/v3d/v3d_sched.c | 14 ++-- > include/drm/gpu_scheduler.h | 9 ++- > 11 files changed, 102 insertions(+), 32 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index b54c4d771104..94d073bfbd13 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2280,6 +2280,7 @@ static int amdgpu_device_init_schedulers(struct amdgpu_device *adev) > } > > r = drm_sched_init(&ring->sched, &amdgpu_sched_ops, NULL, > + DRM_SCHED_PRIORITY_COUNT, > ring->num_hw_submission, 0, > timeout, adev->reset_domain->wq, > ring->sched_score, ring->name, > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > index 78476bc75b4e..1f357198533f 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c > @@ -325,8 +325,8 @@ void amdgpu_job_stop_all_jobs_on_sched(struct drm_gpu_scheduler *sched) > int i; > > /* Signal all jobs not yet scheduled */ > - for (i = DRM_SCHED_PRIORITY_COUNT - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > - struct drm_sched_rq *rq = &sched->sched_rq[i]; > + for (i = sched->num_rqs - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > + struct drm_sched_rq *rq = sched->sched_rq[i]; > spin_lock(&rq->lock); > list_for_each_entry(s_entity, &rq->entities, list) { > while ((s_job = to_drm_sched_job(spsc_queue_pop(&s_entity->job_queue)))) { > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_sched.c b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > index 618a804ddc34..396334984e4d 100644 > --- a/drivers/gpu/drm/etnaviv/etnaviv_sched.c > +++ b/drivers/gpu/drm/etnaviv/etnaviv_sched.c > @@ -134,7 +134,8 @@ int etnaviv_sched_init(struct etnaviv_gpu *gpu) > { > int ret; > > - ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops, NULL, > + ret = drm_sched_init(&gpu->sched, &etnaviv_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, > etnaviv_hw_jobs_limit, etnaviv_job_hang_limit, > msecs_to_jiffies(500), NULL, NULL, > dev_name(gpu->dev), gpu->dev); > diff --git a/drivers/gpu/drm/lima/lima_sched.c b/drivers/gpu/drm/lima/lima_sched.c > index 8d858aed0e56..23a6276f1332 100644 > --- a/drivers/gpu/drm/lima/lima_sched.c > +++ b/drivers/gpu/drm/lima/lima_sched.c > @@ -488,7 +488,8 @@ int lima_sched_pipe_init(struct lima_sched_pipe *pipe, const char *name) > > INIT_WORK(&pipe->recover_work, lima_sched_recover_work); > > - return drm_sched_init(&pipe->base, &lima_sched_ops, NULL, 1, > + return drm_sched_init(&pipe->base, &lima_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, 1, > lima_job_hang_limit, > msecs_to_jiffies(timeout), NULL, > NULL, name, pipe->ldev->dev); > diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c > index 1097f8e93d6b..935154979fc2 100644 > --- a/drivers/gpu/drm/msm/msm_ringbuffer.c > +++ b/drivers/gpu/drm/msm/msm_ringbuffer.c > @@ -94,7 +94,8 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id, > /* currently managing hangcheck ourselves: */ > sched_timeout = MAX_SCHEDULE_TIMEOUT; > > - ret = drm_sched_init(&ring->sched, &msm_sched_ops, NULL, > + ret = drm_sched_init(&ring->sched, &msm_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, > num_hw_submissions, 0, sched_timeout, > NULL, NULL, to_msm_bo(ring->bo)->name, > gpu->dev->dev); > diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c > index 4c959dec42b3..c4ba56b1a6dd 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_sched.c > +++ b/drivers/gpu/drm/nouveau/nouveau_sched.c > @@ -436,6 +436,7 @@ int nouveau_sched_init(struct nouveau_drm *drm) > return -ENOMEM; > > return drm_sched_init(sched, &nouveau_sched_ops, NULL, > + DRM_SCHED_PRIORITY_COUNT, > NOUVEAU_SCHED_HW_SUBMISSIONS, 0, job_hang_limit, > NULL, NULL, "nouveau_sched", drm->dev->dev); > } > diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c > index 934b7b930c76..205d62c04f96 100644 > --- a/drivers/gpu/drm/panfrost/panfrost_job.c > +++ b/drivers/gpu/drm/panfrost/panfrost_job.c > @@ -852,7 +852,8 @@ int panfrost_job_init(struct panfrost_device *pfdev) > js->queue[j].fence_context = dma_fence_context_alloc(1); > > ret = drm_sched_init(&js->queue[j].sched, > - &panfrost_sched_ops, NULL, > + &panfrost_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, > nentries, 0, > msecs_to_jiffies(JOB_TIMEOUT_MS), > pfdev->reset.wq, > diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c > index a42763e1429d..409e4256f6e7 100644 > --- a/drivers/gpu/drm/scheduler/sched_entity.c > +++ b/drivers/gpu/drm/scheduler/sched_entity.c > @@ -75,8 +75,20 @@ int drm_sched_entity_init(struct drm_sched_entity *entity, > RCU_INIT_POINTER(entity->last_scheduled, NULL); > RB_CLEAR_NODE(&entity->rb_tree_node); > > - if(num_sched_list) > - entity->rq = &sched_list[0]->sched_rq[entity->priority]; > + if (!sched_list[0]->sched_rq) { > + /* Warn drivers not to do this and to fix their DRM > + * calling order. > + */ > + pr_warn("%s: called with uninitialized scheduler\n", __func__); > + } else if (num_sched_list) { > + /* The "priority" of an entity cannot exceed the number > + * of run-queues of a scheduler. > + */ > + if (entity->priority >= sched_list[0]->num_rqs) > + entity->priority = max_t(u32, sched_list[0]->num_rqs, > + DRM_SCHED_PRIORITY_MIN); > + entity->rq = sched_list[0]->sched_rq[entity->priority]; > + } > > init_completion(&entity->entity_idle); > > @@ -533,7 +545,7 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity) > > spin_lock(&entity->rq_lock); > sched = drm_sched_pick_best(entity->sched_list, entity->num_sched_list); > - rq = sched ? &sched->sched_rq[entity->priority] : NULL; > + rq = sched ? sched->sched_rq[entity->priority] : NULL; > if (rq != entity->rq) { > drm_sched_rq_remove_entity(entity->rq, entity); > entity->rq = rq; > diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c > index 3a955b8acc4e..b22157e920d4 100644 > --- a/drivers/gpu/drm/scheduler/sched_main.c > +++ b/drivers/gpu/drm/scheduler/sched_main.c > @@ -641,8 +641,14 @@ int drm_sched_job_init(struct drm_sched_job *job, > struct drm_sched_entity *entity, > void *owner) > { > - if (!entity->rq) > + if (!entity->rq) { > + /* This will most likely be followed by missing frames > + * or worse--a blank screen--leave a trail in the > + * logs, so this can be debugged easier. > + */ > + drm_err(job->sched, "%s: entity has no rq!\n", __func__); > return -ENOENT; > + } > > job->entity = entity; > job->s_fence = drm_sched_fence_alloc(entity, owner); > @@ -680,7 +686,7 @@ void drm_sched_job_arm(struct drm_sched_job *job) > sched = entity->rq->sched; > > job->sched = sched; > - job->s_priority = entity->rq - sched->sched_rq; > + job->s_priority = entity->priority; > job->id = atomic64_inc_return(&sched->job_id_count); > > drm_sched_fence_init(job->s_fence, job->entity); > @@ -897,10 +903,10 @@ drm_sched_select_entity(struct drm_gpu_scheduler *sched) > return NULL; > > /* Kernel run queue has higher priority than normal run queue*/ > - for (i = DRM_SCHED_PRIORITY_COUNT - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > + for (i = sched->num_rqs - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > entity = drm_sched_policy == DRM_SCHED_POLICY_FIFO ? > - drm_sched_rq_select_entity_fifo(&sched->sched_rq[i]) : > - drm_sched_rq_select_entity_rr(&sched->sched_rq[i]); > + drm_sched_rq_select_entity_fifo(sched->sched_rq[i]) : > + drm_sched_rq_select_entity_rr(sched->sched_rq[i]); > if (entity) > break; > } > @@ -1065,6 +1071,7 @@ static void drm_sched_main(struct work_struct *w) > * @ops: backend operations for this scheduler > * @submit_wq: workqueue to use for submission. If NULL, an ordered wq is > * allocated and used > + * @num_rqs: number of runqueues, one for each priority, up to DRM_SCHED_PRIORITY_COUNT > * @hw_submission: number of hw submissions that can be in flight > * @hang_limit: number of times to allow a job to hang before dropping it > * @timeout: timeout value in jiffies for the scheduler > @@ -1079,11 +1086,12 @@ static void drm_sched_main(struct work_struct *w) > int drm_sched_init(struct drm_gpu_scheduler *sched, > const struct drm_sched_backend_ops *ops, > struct workqueue_struct *submit_wq, > - unsigned hw_submission, unsigned hang_limit, > + u32 num_rqs, unsigned hw_submission, unsigned hang_limit, > long timeout, struct workqueue_struct *timeout_wq, > atomic_t *score, const char *name, struct device *dev) > { > - int i; > + int i, ret; > + > sched->ops = ops; > sched->hw_submission_limit = hw_submission; > sched->name = name; > @@ -1102,8 +1110,36 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, > sched->hang_limit = hang_limit; > sched->score = score ? score : &sched->_score; > sched->dev = dev; > - for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_COUNT; i++) > - drm_sched_rq_init(sched, &sched->sched_rq[i]); > + > + if (num_rqs > DRM_SCHED_PRIORITY_COUNT) { > + /* This is a gross violation--tell drivers what the problem is. > + */ > + drm_err(sched, "%s: num_rqs cannot be greater than DRM_SCHED_PRIORITY_COUNT\n", > + __func__); > + return -EINVAL; > + } else if (sched->sched_rq) { > + /* Not an error, but warn anyway so drivers can > + * fine-tune their DRM calling order, and return all > + * is good. > + */ > + drm_warn(sched, "%s: scheduler already initialized!\n", __func__); > + return 0; > + } > + > + sched->sched_rq = kmalloc_array(num_rqs, sizeof(*sched->sched_rq), > + GFP_KERNEL | __GFP_ZERO); > + if (!sched->sched_rq) { > + drm_err(sched, "%s: out of memory for sched_rq\n", __func__); > + return -ENOMEM; > + } > + sched->num_rqs = num_rqs; > + ret = -ENOMEM; > + for (i = DRM_SCHED_PRIORITY_MIN; i < sched->num_rqs; i++) { > + sched->sched_rq[i] = kzalloc(sizeof(*sched->sched_rq[i]), GFP_KERNEL); > + if (!sched->sched_rq[i]) > + goto Out_unroll; > + drm_sched_rq_init(sched, sched->sched_rq[i]); > + } > > init_waitqueue_head(&sched->job_scheduled); > INIT_LIST_HEAD(&sched->pending_list); > @@ -1117,6 +1153,14 @@ int drm_sched_init(struct drm_gpu_scheduler *sched, > > sched->ready = true; > return 0; > + > +Out_unroll: > + for (--i ; i >= DRM_SCHED_PRIORITY_MIN; i--) > + kfree(sched->sched_rq[i]); > + kfree(sched->sched_rq); > + sched->sched_rq = NULL; > + drm_err(sched, "%s: Failed to setup GPU scheduler--out of memory\n", __func__); > + return ret; > } > EXPORT_SYMBOL(drm_sched_init); > > @@ -1134,8 +1178,8 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched) > > drm_sched_wqueue_stop(sched); > > - for (i = DRM_SCHED_PRIORITY_COUNT - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > - struct drm_sched_rq *rq = &sched->sched_rq[i]; > + for (i = sched->num_rqs - 1; i >= DRM_SCHED_PRIORITY_MIN; i--) { > + struct drm_sched_rq *rq = sched->sched_rq[i]; > > spin_lock(&rq->lock); > list_for_each_entry(s_entity, &rq->entities, list) > @@ -1146,7 +1190,7 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched) > */ > s_entity->stopped = true; > spin_unlock(&rq->lock); > - > + kfree(sched->sched_rq[i]); > } > > /* Wakeup everyone stuck in drm_sched_entity_flush for this scheduler */ > @@ -1158,6 +1202,8 @@ void drm_sched_fini(struct drm_gpu_scheduler *sched) > if (sched->own_submit_wq) > destroy_workqueue(sched->submit_wq); > sched->ready = false; > + kfree(sched->sched_rq); > + sched->sched_rq = NULL; > } > EXPORT_SYMBOL(drm_sched_fini); > > @@ -1184,9 +1230,10 @@ void drm_sched_increase_karma(struct drm_sched_job *bad) > if (bad->s_priority != DRM_SCHED_PRIORITY_KERNEL) { > atomic_inc(&bad->karma); > > - for (i = DRM_SCHED_PRIORITY_MIN; i < DRM_SCHED_PRIORITY_KERNEL; > + for (i = DRM_SCHED_PRIORITY_MIN; > + i < min_t(typeof(sched->num_rqs), sched->num_rqs, DRM_SCHED_PRIORITY_KERNEL); > i++) { > - struct drm_sched_rq *rq = &sched->sched_rq[i]; > + struct drm_sched_rq *rq = sched->sched_rq[i]; > > spin_lock(&rq->lock); > list_for_each_entry_safe(entity, tmp, &rq->entities, list) { > diff --git a/drivers/gpu/drm/v3d/v3d_sched.c b/drivers/gpu/drm/v3d/v3d_sched.c > index 38e092ea41e6..175c3e30647a 100644 > --- a/drivers/gpu/drm/v3d/v3d_sched.c > +++ b/drivers/gpu/drm/v3d/v3d_sched.c > @@ -388,7 +388,7 @@ v3d_sched_init(struct v3d_dev *v3d) > int ret; > > ret = drm_sched_init(&v3d->queue[V3D_BIN].sched, > - &v3d_bin_sched_ops, NULL, > + &v3d_bin_sched_ops, DRM_SCHED_PRIORITY_COUNT, NULL, > hw_jobs_limit, job_hang_limit, > msecs_to_jiffies(hang_limit_ms), NULL, > NULL, "v3d_bin", v3d->drm.dev); > @@ -396,15 +396,15 @@ v3d_sched_init(struct v3d_dev *v3d) > return ret; > > ret = drm_sched_init(&v3d->queue[V3D_RENDER].sched, > - &v3d_render_sched_ops, NULL, > - hw_jobs_limit, job_hang_limit, > + &v3d_render_sched_ops, DRM_SCHED_PRIORITY_COUNT, > + NULL, hw_jobs_limit, job_hang_limit, > msecs_to_jiffies(hang_limit_ms), NULL, > NULL, "v3d_render", v3d->drm.dev); > if (ret) > goto fail; > > ret = drm_sched_init(&v3d->queue[V3D_TFU].sched, > - &v3d_tfu_sched_ops, NULL, > + &v3d_tfu_sched_ops, DRM_SCHED_PRIORITY_COUNT, NULL, > hw_jobs_limit, job_hang_limit, > msecs_to_jiffies(hang_limit_ms), NULL, > NULL, "v3d_tfu", v3d->drm.dev); > @@ -413,7 +413,8 @@ v3d_sched_init(struct v3d_dev *v3d) > > if (v3d_has_csd(v3d)) { > ret = drm_sched_init(&v3d->queue[V3D_CSD].sched, > - &v3d_csd_sched_ops, NULL, > + &v3d_csd_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, > hw_jobs_limit, job_hang_limit, > msecs_to_jiffies(hang_limit_ms), NULL, > NULL, "v3d_csd", v3d->drm.dev); > @@ -421,7 +422,8 @@ v3d_sched_init(struct v3d_dev *v3d) > goto fail; > > ret = drm_sched_init(&v3d->queue[V3D_CACHE_CLEAN].sched, > - &v3d_cache_clean_sched_ops, NULL, > + &v3d_cache_clean_sched_ops, > + DRM_SCHED_PRIORITY_COUNT, NULL, > hw_jobs_limit, job_hang_limit, > msecs_to_jiffies(hang_limit_ms), NULL, > NULL, "v3d_cache_clean", v3d->drm.dev); > diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h > index 211bd3cdabdc..1d52b8bbb06c 100644 > --- a/include/drm/gpu_scheduler.h > +++ b/include/drm/gpu_scheduler.h > @@ -472,7 +472,9 @@ struct drm_sched_backend_ops { > * @hw_submission_limit: the max size of the hardware queue. > * @timeout: the time after which a job is removed from the scheduler. > * @name: name of the ring for which this scheduler is being used. > - * @sched_rq: priority wise array of run queues. > + * @num_rqs: Number of run-queues. This is at most DRM_SCHED_PRIORITY_COUNT, > + * as there's usually one run-queue per priority, but could be less. > + * @sched_rq: An allocated array of run-queues of size @num_rqs; > * @job_scheduled: once @drm_sched_entity_do_release is called the scheduler > * waits on this wait queue until all the scheduled jobs are > * finished. > @@ -502,7 +504,8 @@ struct drm_gpu_scheduler { > uint32_t hw_submission_limit; > long timeout; > const char *name; > - struct drm_sched_rq sched_rq[DRM_SCHED_PRIORITY_COUNT]; > + u32 num_rqs; > + struct drm_sched_rq **sched_rq; > wait_queue_head_t job_scheduled; > atomic_t hw_rq_count; > atomic64_t job_id_count; > @@ -525,7 +528,7 @@ struct drm_gpu_scheduler { > int drm_sched_init(struct drm_gpu_scheduler *sched, > const struct drm_sched_backend_ops *ops, > struct workqueue_struct *submit_wq, > - uint32_t hw_submission, unsigned hang_limit, > + u32 num_rqs, uint32_t hw_submission, unsigned hang_limit, > long timeout, struct workqueue_struct *timeout_wq, > atomic_t *score, const char *name, struct device *dev); >