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 X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2B5AC10DCE for ; Fri, 13 Mar 2020 13:56:13 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C7A26206B7 for ; Fri, 13 Mar 2020 13:56:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lBpkRjrs" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C7A26206B7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=amd-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 857806E9C6; Fri, 13 Mar 2020 13:56:13 +0000 (UTC) Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 21BBB6E9CD for ; Fri, 13 Mar 2020 13:56:12 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id n15so12189981wrw.13 for ; Fri, 13 Mar 2020 06:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u0GgHaYgbggulpXN04aqnnAYazE8GFQHyGN/prFFhsE=; b=lBpkRjrs0SGJzR9hXnwx9V6WP7YAoCnfaqfc0E1WPsUL5FVZETgII1WLM6xdIQT3ml lVfOeWBI5jvEEl8CiLM4NeLdYZpO6QUmK2c3WkstFuknxdVr1ekVsmCfkMiqY2f2Scw1 SqWtEXVa3bpsZ8ZbG6l4TuqFzOZVmTQ72Vf2y6gYlDgh7n/wa0Bmm+CIAMLCmJx3ITIH gQXPdDdPKPwlxDABfEVKQz7wz1J/ZZggYribL/Tbjgd+6InF9zMkJnCVr3dXLxymdMyr wGhgfAGd8ZBUYsFce/hWRds5fgai38oVAlATvLbJ0u2T0F4vLe5Ll15dJdBzefblEbF6 OmhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=u0GgHaYgbggulpXN04aqnnAYazE8GFQHyGN/prFFhsE=; b=qlRhtnKY2yWxjBoGTx7pKPAWEVe0h3y5AGfLh9nhQTuBt4imcS52By5UHMsjl+05Kg rdUlnjZNfEzZe6kYMPHYOa3PYrJIMES0YiP/nJ+9cTiwRWkrNx0XmL1OMnTu2UoSvqrK sk2vNmFr4b8me+FWRlzwsPnqzCDmt/vu5GbRY1oGcpTsqDKw/I8GGBNuuPr9gl76i7og 0bsacRW4vqnO4N20wV6b4QMkHoLa2s1KoS+9SiDGYs/9e0BYrDj1GAc5HUWgUlXmfKxW 6Qwz7EmswJFh+gGSD2OJ9u7ysPBYDchjVpOKfokU233R8OILJWIzXD43Y3ZYtDe4T+4b z88Q== X-Gm-Message-State: ANhLgQ0O14B//GdI+wfJ99+ZwVqVCpeHJEgcqRdgYDzqj7BkJrurGcB6 2i2CIPMdKDM6obqTyW9d7SAYrjig8yLhUgFJ X-Google-Smtp-Source: ADFU+vsNJBNFOYTkcOrhS6yjDGvczzr6gxPASdppViWZjJGiX9unFTJRPPS2Xw1nw5LluVAyB/AU8Q== X-Received: by 2002:adf:cf08:: with SMTP id o8mr17079313wrj.192.1584107770371; Fri, 13 Mar 2020 06:56:10 -0700 (PDT) Received: from brihaspati.fritz.box (p200300C58F29A900DB158106D933A960.dip0.t-ipconnect.de. [2003:c5:8f29:a900:db15:8106:d933:a960]) by smtp.gmail.com with ESMTPSA id v10sm7309467wmh.17.2020.03.13.06.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 06:56:09 -0700 (PDT) From: Nirmoy Das X-Google-Original-From: Nirmoy Das To: amd-gfx@lists.freedesktop.org Subject: [PATCH v2 1/2] drm/sched: implement and export drm_sched_pick_best Date: Fri, 13 Mar 2020 14:59:52 +0100 Message-Id: <20200313135953.68418-1-nirmoy.das@amd.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Boyuan.Zhang@amd.com, nirmoy.das@amd.com, alexander.deucher@amd.com, James.Zhu@amd.com, Leo.Liu@amd.com, christian.koenig@amd.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" Remove drm_sched_entity_get_free_sched() and use the logic of picking the least loaded drm scheduler from a drm scheduler list to implement drm_sched_pick_best(). This patch also exports drm_sched_pick_best() so that it can be utilized by other drm drivers. Signed-off-by: Nirmoy Das --- drivers/gpu/drm/scheduler/sched_entity.c | 40 ++++-------------------- drivers/gpu/drm/scheduler/sched_main.c | 35 +++++++++++++++++++++ include/drm/gpu_scheduler.h | 3 ++ 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index d631521a9679..ffc8adb6ff25 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -137,38 +137,6 @@ bool drm_sched_entity_is_ready(struct drm_sched_entity *entity) return true; } -/** - * drm_sched_entity_get_free_sched - Get the rq from rq_list with least load - * - * @entity: scheduler entity - * - * Return the pointer to the rq with least load. - */ -static struct drm_sched_rq * -drm_sched_entity_get_free_sched(struct drm_sched_entity *entity) -{ - struct drm_sched_rq *rq = NULL; - unsigned int min_jobs = UINT_MAX, num_jobs; - int i; - - for (i = 0; i < entity->num_sched_list; ++i) { - struct drm_gpu_scheduler *sched = entity->sched_list[i]; - - if (!entity->sched_list[i]->ready) { - DRM_WARN("sched%s is not ready, skipping", sched->name); - continue; - } - - num_jobs = atomic_read(&sched->num_jobs); - if (num_jobs < min_jobs) { - min_jobs = num_jobs; - rq = &entity->sched_list[i]->sched_rq[entity->priority]; - } - } - - return rq; -} - /** * drm_sched_entity_flush - Flush a context entity * @@ -479,7 +447,8 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity) void drm_sched_entity_select_rq(struct drm_sched_entity *entity) { struct dma_fence *fence; - struct drm_sched_rq *rq; + struct drm_gpu_scheduler *sched; + struct drm_sched_rq *rq = NULL; if (spsc_queue_count(&entity->job_queue) || entity->num_sched_list <= 1) return; @@ -489,7 +458,10 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity) return; spin_lock(&entity->rq_lock); - rq = drm_sched_entity_get_free_sched(entity); + sched = drm_sched_pick_best(entity->sched_list, entity->num_sched_list); + if (sched) + rq = &sched->sched_rq[entity->priority]; + 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 3fad5876a13f..d640f4087795 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -705,6 +705,41 @@ drm_sched_get_cleanup_job(struct drm_gpu_scheduler *sched) return job; } +/** + * drm_sched_pick_best - Get a drm sched from a sched_list with the least load + * @sched_list: list of drm_gpu_schedulers + * @num_sched_list: number of drm_gpu_schedulers in the sched_list + * + * Returns pointer of the sched with the least load or NULL if none of the + * drm_gpu_schedulers are ready + */ +struct drm_gpu_scheduler * +drm_sched_pick_best(struct drm_gpu_scheduler **sched_list, + unsigned int num_sched_list) +{ + struct drm_gpu_scheduler *sched, *picked_sched = NULL; + int i; + unsigned int min_jobs = UINT_MAX, num_jobs; + + for (i = 0; i < num_sched_list; ++i) { + sched = sched_list[i]; + + if (!sched->ready) { + DRM_WARN("sched%s is not ready, skipping", sched->name); + continue; + } + + num_jobs = atomic_read(&sched->num_jobs); + if (num_jobs < min_jobs) { + min_jobs = num_jobs; + picked_sched = sched; + } + } + + return picked_sched; +} +EXPORT_SYMBOL(drm_sched_pick_best); + /** * drm_sched_blocked - check if the scheduler is blocked * diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h index ae39eacee250..ca6b8b01fac9 100644 --- a/include/drm/gpu_scheduler.h +++ b/include/drm/gpu_scheduler.h @@ -341,5 +341,8 @@ void drm_sched_fence_finished(struct drm_sched_fence *fence); unsigned long drm_sched_suspend_timeout(struct drm_gpu_scheduler *sched); void drm_sched_resume_timeout(struct drm_gpu_scheduler *sched, unsigned long remaining); +struct drm_gpu_scheduler * +drm_sched_pick_best(struct drm_gpu_scheduler **sched_list, + unsigned int num_sched_list); #endif -- 2.25.0 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx