From patchwork Fri Mar 5 12:51:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 12118419 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 CCE0FC433E0 for ; Fri, 5 Mar 2021 12:52:00 +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 85C4060233 for ; Fri, 5 Mar 2021 12:52:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85C4060233 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CCBAA6EB72; Fri, 5 Mar 2021 12:51:59 +0000 (UTC) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 133C86EB6C; Fri, 5 Mar 2021 12:51:59 +0000 (UTC) Received: by mail-ej1-x62f.google.com with SMTP id e19so3239535ejt.3; Fri, 05 Mar 2021 04:51:58 -0800 (PST) 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=5+MEzouCAMXKhWa9DB1nA2mB6wC+MMPpqVR3AD5SMWQ=; b=F6S1ERaCNwBPDwWJWujtt+7uXdfe0s/5LTeo17S+6tjnmSroPJS2M/va8o8ex36tKD IzuOGskPrWduikpTfepi8yLd7rOA2KE6KmHZ2FLud0iTDfpKzzXifcJVljmGSdYqOxmd ciKemTeM2//FD3jFTjmTKRJyvFoygo2nwSqrhHwHCypguw83tn21X/b/Pqznztbw6gLX mta4xDHSS5qaZjFWt72a+3P8adk4Kq6PCK2SgpTH7pkBxB4iLjN4l1vuNf2k6fhuCMBn cboIth3SPcDejbJAnomeqLswM8De2og4ZDVAfNnMFTIjAS9djvD3GmFHKWo4so+lYZki EyOg== 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=5+MEzouCAMXKhWa9DB1nA2mB6wC+MMPpqVR3AD5SMWQ=; b=X44/PpinxhaRzlrgfU+6PCAR8cvIn5cNzle5Lq6PQ2/XyuWRVC9fU5wuVf/F77/SH4 Vktt/71KlfbeGEtKZ5poUF1VIzfEoDGqshPYjD1Ae3Eew2P+x18eHG8SZEEq/shgyK+I nsfwDfSmHi95nUJ1azTF1Yqa8SBkHReK6ob1wqBfyaNhoEgH8VRPWOsVSi/TccDVHm2H L4kd6Xx9S5slxMIqxKQD6u/iinPmC8jD5Ni5UcK7oWknxTaVR2c4VR1HedqN9HOQO5kJ dFyDieyGemXZVhxXQb+Kp2QE1JrhomZRhEmpZilaPPtTzV+y11fa2/tXttljpAgDE4en z3/A== X-Gm-Message-State: AOAM531b1vpxZel5ZCB1Ql+34lztJyz99dLd0+w9MtXIJlcriGCat5fb YjO2i6tcAToXXjKG4WzdRJJv8o9OVvBmWA== X-Google-Smtp-Source: ABdhPJzM+RViHYCYdOi4t1ad2gEnzXlkSSOzNd8NcMxY+RZ6whfOQAF3HLkHx5IoUt0EnHjtNao3UQ== X-Received: by 2002:a17:906:e0d6:: with SMTP id gl22mr2071088ejb.444.1614948717801; Fri, 05 Mar 2021 04:51:57 -0800 (PST) Received: from abel.fritz.box ([2a02:908:1252:fb60:d4b7:8d5:a72a:f704]) by smtp.gmail.com with ESMTPSA id si7sm1433909ejb.84.2021.03.05.04.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 04:51:57 -0800 (PST) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH 1/2] drm/sched: select new rq even if there is only one v3 Date: Fri, 5 Mar 2021 13:51:54 +0100 Message-Id: <20210305125155.2312-1-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sonny.jiang@amd.com, Leo.Liu@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is necessary when changing priorities of an entity. v2: test the sched_list instead of num_sched. v3: set the sched_list to NULL when there is only one entry Signed-off-by: Christian König Reviewed-by: Sonny Jiang --- drivers/gpu/drm/scheduler/sched_entity.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 92d965b629c6..f0790e9471d1 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -453,7 +453,7 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity) struct drm_gpu_scheduler *sched; struct drm_sched_rq *rq; - if (spsc_queue_count(&entity->job_queue) || entity->num_sched_list <= 1) + if (spsc_queue_count(&entity->job_queue) || !entity->sched_list) return; fence = READ_ONCE(entity->last_scheduled); @@ -467,8 +467,10 @@ void drm_sched_entity_select_rq(struct drm_sched_entity *entity) drm_sched_rq_remove_entity(entity->rq, entity); entity->rq = rq; } - spin_unlock(&entity->rq_lock); + + if (entity->num_sched_list == 1) + entity->sched_list = NULL; } /**