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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 375C4C07E9C for ; Thu, 8 Jul 2021 17:38:45 +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 0B7F16191D for ; Thu, 8 Jul 2021 17:38:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B7F16191D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 BAB7D6E95E; Thu, 8 Jul 2021 17:38:23 +0000 (UTC) Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7C01A6E94B for ; Thu, 8 Jul 2021 17:38:22 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id f9so2862723wrq.11 for ; Thu, 08 Jul 2021 10:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Neep/k8O4rPFqvb2LyTtHB7zNIqSQStnKQ4ditqwKXE=; b=QHEatNCQ3lh7lP5sAUpGkKHp+kq4kV2ALQZa6ff1DLZg0AFRaqu94D8mweMPD8o+SL VDNETuNiFNKR1Is7BdH9++y+E5hLlm6ZTgaqi9NdA6GsSqSSMhWKvKMq0SjvOCMH7WgZ jQIn8hJScysXor+bQ4ZVvRuQ8qSSSZRNX+IHI= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Neep/k8O4rPFqvb2LyTtHB7zNIqSQStnKQ4ditqwKXE=; b=bNkfSJASC6aCoWUMYtVkKCxyD8+V97LQoqA9qXYYgN61LQZLWRTRiFJDhfzL1QUP4h vyh7AyB5m6xMianhKWk5aBdMWf2nsls+AeaDy0LGTkvoWiJ6j9u1f8JsOjRvg3tpu5TM qcMrr5VqojXfwA3dkBEUzrZvtbVSJq/Tq4jBaXL3l4NkYagnIMxa0cqc1SSHurV8sH+0 stCznXtYoHGEO1EVbgwDFszOnPbO4MfZjHtQoNlOgA4PeuQRUfGFV82UqW4TltCBedku 5a6PhKoDV2tJcEbsaO+nWlv0/x73jjGHPMARV4rkaOiQWqCerZf/DILiolaEvk6AN37Q VOdQ== X-Gm-Message-State: AOAM532wg9s5qMCaKPnMc1t/6WKPNo9cX8lP7Z0ZRVxm6CZGN1B/eFHZ M/VLwKCjz8WhFBhLK4NrvHQPK/LS2OfsUw== X-Google-Smtp-Source: ABdhPJwtwvrObnGsaYKi8d7l2en5+rAga6UTNLIcFUfFXEOyUekIOws2dG7pT/j8eOB2YPGJlurJjw== X-Received: by 2002:adf:fc83:: with SMTP id g3mr36877023wrr.154.1625765901207; Thu, 08 Jul 2021 10:38:21 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH v3 13/20] drm/sched: Don't store self-dependencies Date: Thu, 8 Jul 2021 19:37:47 +0200 Message-Id: <20210708173754.3877540-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Jack Zhang , Daniel Vetter , Intel Graphics Development , Luben Tuikov , Alex Deucher , Daniel Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" This is essentially part of drm_sched_dependency_optimized(), which only amdgpu seems to make use of. Use it a bit more. This would mean that as-is amdgpu can't use the dependency helpers, at least not with the current approach amdgpu has for deciding whether a vm_flush is needed. Since amdgpu also has very special rules around implicit fencing it can't use those helpers either, and adding a drm_sched_job_await_fence_always or similar for amdgpu wouldn't be too onerous. That way the special case handling for amdgpu sticks even more out and we have higher chances that reviewers that go across all drivers wont miss it. Reviewed-by: Lucas Stach Signed-off-by: Daniel Vetter Cc: "Christian König" Cc: Daniel Vetter Cc: Luben Tuikov Cc: Andrey Grodzovsky Cc: Alex Deucher Cc: Jack Zhang --- drivers/gpu/drm/scheduler/sched_main.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index ad62f1d2991c..db326a1ebf3c 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -654,6 +654,13 @@ int drm_sched_job_await_fence(struct drm_sched_job *job, if (!fence) return 0; + /* if it's a fence from us it's guaranteed to be earlier */ + if (fence->context == job->entity->fence_context || + fence->context == job->entity->fence_context + 1) { + dma_fence_put(fence); + return 0; + } + /* Deduplicate if we already depend on a fence from the same context. * This lets the size of the array of deps scale with the number of * engines involved, rather than the number of BOs. -- 2.32.0 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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 17E89C07E99 for ; Thu, 8 Jul 2021 17:38:48 +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 DD9CA6191D for ; Thu, 8 Jul 2021 17:38:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD9CA6191D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3081B6E94B; Thu, 8 Jul 2021 17:38:24 +0000 (UTC) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82E6A6E969 for ; Thu, 8 Jul 2021 17:38:22 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id a8so8533095wrp.5 for ; Thu, 08 Jul 2021 10:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Neep/k8O4rPFqvb2LyTtHB7zNIqSQStnKQ4ditqwKXE=; b=QHEatNCQ3lh7lP5sAUpGkKHp+kq4kV2ALQZa6ff1DLZg0AFRaqu94D8mweMPD8o+SL VDNETuNiFNKR1Is7BdH9++y+E5hLlm6ZTgaqi9NdA6GsSqSSMhWKvKMq0SjvOCMH7WgZ jQIn8hJScysXor+bQ4ZVvRuQ8qSSSZRNX+IHI= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Neep/k8O4rPFqvb2LyTtHB7zNIqSQStnKQ4ditqwKXE=; b=rMK6byPgwFpFepcpPE3lesoci+lFEWlxEBqH8SBxoSrXYgE61X9bIaWwWb/17+obtC PNd6gON80/zQOVlRtlG7vfwhtC95WTqnReA8ptJPwajphaAs23Usy+Jlsk0vOwsn+Gno GVD4HpEntGSxyhsKXNgJQrePff+FA49OInR/Yjr+Uf5j69Kytbho4jF1Rd0m3roCcbDI X+MEABYMqXJ5xwMQFI8xtph19MCGWdRUFk2qwrbbvtlmMKQnIgwFX67PUFmlMgm80Wyl 20/ZxL9i0eiJHwZ1IUkwplmI3+9B7oNw+WaSccK88CvR9QY/IP1h0tCcyzo/q6VeHne3 tW1A== X-Gm-Message-State: AOAM530At9tqyhXy6a/Pyki65Y8jDdYYX3JcmOUYXJHln5cZsYwVF9Yk Xg95KxvuJXOkpbKuMhSjsBIXTg== X-Google-Smtp-Source: ABdhPJwtwvrObnGsaYKi8d7l2en5+rAga6UTNLIcFUfFXEOyUekIOws2dG7pT/j8eOB2YPGJlurJjw== X-Received: by 2002:adf:fc83:: with SMTP id g3mr36877023wrr.154.1625765901207; Thu, 08 Jul 2021 10:38:21 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l4sm2521853wme.26.2021.07.08.10.38.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 10:38:20 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 8 Jul 2021 19:37:47 +0200 Message-Id: <20210708173754.3877540-14-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> References: <20210708173754.3877540-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 13/20] drm/sched: Don't store self-dependencies X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrey Grodzovsky , Jack Zhang , Daniel Vetter , Intel Graphics Development , Luben Tuikov , Alex Deucher , Daniel Vetter , =?UTF-8?q?Christian=20K=C3=B6nig?= , Lucas Stach Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" VGhpcyBpcyBlc3NlbnRpYWxseSBwYXJ0IG9mIGRybV9zY2hlZF9kZXBlbmRlbmN5X29wdGltaXpl ZCgpLCB3aGljaApvbmx5IGFtZGdwdSBzZWVtcyB0byBtYWtlIHVzZSBvZi4gVXNlIGl0IGEgYml0 IG1vcmUuCgpUaGlzIHdvdWxkIG1lYW4gdGhhdCBhcy1pcyBhbWRncHUgY2FuJ3QgdXNlIHRoZSBk ZXBlbmRlbmN5IGhlbHBlcnMsIGF0CmxlYXN0IG5vdCB3aXRoIHRoZSBjdXJyZW50IGFwcHJvYWNo IGFtZGdwdSBoYXMgZm9yIGRlY2lkaW5nIHdoZXRoZXIgYQp2bV9mbHVzaCBpcyBuZWVkZWQuIFNp bmNlIGFtZGdwdSBhbHNvIGhhcyB2ZXJ5IHNwZWNpYWwgcnVsZXMgYXJvdW5kCmltcGxpY2l0IGZl bmNpbmcgaXQgY2FuJ3QgdXNlIHRob3NlIGhlbHBlcnMgZWl0aGVyLCBhbmQgYWRkaW5nIGEKZHJt X3NjaGVkX2pvYl9hd2FpdF9mZW5jZV9hbHdheXMgb3Igc2ltaWxhciBmb3IgYW1kZ3B1IHdvdWxk bid0IGJlIHRvbwpvbmVyb3VzLiBUaGF0IHdheSB0aGUgc3BlY2lhbCBjYXNlIGhhbmRsaW5nIGZv ciBhbWRncHUgc3RpY2tzIGV2ZW4KbW9yZSBvdXQgYW5kIHdlIGhhdmUgaGlnaGVyIGNoYW5jZXMg dGhhdCByZXZpZXdlcnMgdGhhdCBnbyBhY3Jvc3MgYWxsCmRyaXZlcnMgd29udCBtaXNzIGl0LgoK UmV2aWV3ZWQtYnk6IEx1Y2FzIFN0YWNoIDxsLnN0YWNoQHBlbmd1dHJvbml4LmRlPgpTaWduZWQt b2ZmLWJ5OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGludGVsLmNvbT4KQ2M6ICJDaHJp c3RpYW4gS8O2bmlnIiA8Y2hyaXN0aWFuLmtvZW5pZ0BhbWQuY29tPgpDYzogRGFuaWVsIFZldHRl ciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KQ2M6IEx1YmVuIFR1aWtvdiA8bHViZW4udHVpa292 QGFtZC5jb20+CkNjOiBBbmRyZXkgR3JvZHpvdnNreSA8YW5kcmV5Lmdyb2R6b3Zza3lAYW1kLmNv bT4KQ2M6IEFsZXggRGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KQ2M6IEphY2sg WmhhbmcgPEphY2suWmhhbmcxQGFtZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3NjaGVkdWxl ci9zY2hlZF9tYWluLmMgfCA3ICsrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMo KykKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL3NjaGVkX21haW4uYyBi L2RyaXZlcnMvZ3B1L2RybS9zY2hlZHVsZXIvc2NoZWRfbWFpbi5jCmluZGV4IGFkNjJmMWQyOTkx Yy4uZGIzMjZhMWViZjNjIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL3Nj aGVkX21haW4uYworKysgYi9kcml2ZXJzL2dwdS9kcm0vc2NoZWR1bGVyL3NjaGVkX21haW4uYwpA QCAtNjU0LDYgKzY1NCwxMyBAQCBpbnQgZHJtX3NjaGVkX2pvYl9hd2FpdF9mZW5jZShzdHJ1Y3Qg ZHJtX3NjaGVkX2pvYiAqam9iLAogCWlmICghZmVuY2UpCiAJCXJldHVybiAwOwogCisJLyogaWYg aXQncyBhIGZlbmNlIGZyb20gdXMgaXQncyBndWFyYW50ZWVkIHRvIGJlIGVhcmxpZXIgKi8KKwlp ZiAoZmVuY2UtPmNvbnRleHQgPT0gam9iLT5lbnRpdHktPmZlbmNlX2NvbnRleHQgfHwKKwkgICAg ZmVuY2UtPmNvbnRleHQgPT0gam9iLT5lbnRpdHktPmZlbmNlX2NvbnRleHQgKyAxKSB7CisJCWRt YV9mZW5jZV9wdXQoZmVuY2UpOworCQlyZXR1cm4gMDsKKwl9CisKIAkvKiBEZWR1cGxpY2F0ZSBp ZiB3ZSBhbHJlYWR5IGRlcGVuZCBvbiBhIGZlbmNlIGZyb20gdGhlIHNhbWUgY29udGV4dC4KIAkg KiBUaGlzIGxldHMgdGhlIHNpemUgb2YgdGhlIGFycmF5IG9mIGRlcHMgc2NhbGUgd2l0aCB0aGUg bnVtYmVyIG9mCiAJICogZW5naW5lcyBpbnZvbHZlZCwgcmF0aGVyIHRoYW4gdGhlIG51bWJlciBv ZiBCT3MuCi0tIAoyLjMyLjAKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2lu dGVsLWdmeAo=