From patchwork Mon Jul 12 17:53:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 12372233 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.6 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 C9EA5C07E9C for ; Mon, 12 Jul 2021 20:02:33 +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 961A5611CC for ; Mon, 12 Jul 2021 20:02:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 961A5611CC 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 555FB89E32; Mon, 12 Jul 2021 20:02:14 +0000 (UTC) Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3759789E06 for ; Mon, 12 Jul 2021 20:02:11 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id t5so13410828wrw.12 for ; Mon, 12 Jul 2021 13:02:11 -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=ezhaA8hTBUICMyc9KfH8N0Ki2qpVtTK3oPL1/iX+DhE=; b=WvivAdaKsVfa79rAQx/9iAZ2ztB0DCmwcyARgn/20xmhYqF4sqZA7xQ1e3vLrWAbir 675MS66KN4C77TJVv66ZnEkHCn6nIX/Y4WBG0hIAlozl+vkh+eL07Olf7MELbvxedSaK LInOPpE+XOQwc5/ldMFb4xJEnWkmkipU9Yv1I= 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=ezhaA8hTBUICMyc9KfH8N0Ki2qpVtTK3oPL1/iX+DhE=; b=JL7iieCkxLZoMSEY46N9cxFIibOYBHN4oh0tTnRGRTw9ANjsyvRviq1s1ZGI5PX1NL 5FRieECzRyWx3CYNG5dLvJNPmklyo4BkKiuSrFNAjLgn0SGUflt4orQ6UvAstGcjCrZE A1zxhMTf6PbYPtEisN1RCLT7vC4hO0jYJslWssxU5QWZaGIofoU7TwYaTCGFogdXsxna kw5IhjNvxwwSyGiVsx+CfByqWKWZGeHAMG0os2JLN6iHP98HmkCtPFjhFaxWW0gXAmWI XczBrDwaLLWmnLCw0Myc7DwYkYIIV+FMUX/NxgwANHFeZAniWp/Ig61WeidQ7c6diLEc 0Nig== X-Gm-Message-State: AOAM532PhGrDDtJwdgxSrd2ib130qAg1gJ6JZxqhkUEddtvbdaEmyjrP 9aetm6tc1Fb4ox/c2nRStikqucPuHYtLzA== X-Google-Smtp-Source: ABdhPJzz6Ty+0HbQQD5KqOZq4W2JOaXsv4E/IUMIyzLnldbgzh6U9YV/u0HOsJaD5B3+exw82XQkag== X-Received: by 2002:adf:de84:: with SMTP id w4mr885712wrl.104.1626120129933; Mon, 12 Jul 2021 13:02:09 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id l14sm9858221wrs.22.2021.07.12.13.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 13:02:09 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH v4 12/18] drm/sched: Don't store self-dependencies Date: Mon, 12 Jul 2021 19:53:46 +0200 Message-Id: <20210712175352.802687-13-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712175352.802687-1-daniel.vetter@ffwll.ch> References: <20210712175352.802687-1-daniel.vetter@ffwll.ch> 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: Jack Zhang , Daniel Vetter , Intel Graphics Development , Luben Tuikov , Alex Deucher , Daniel Vetter , =?utf-8?q?Christian_K=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 84c30badb78e..fd52db906b90 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -660,6 +660,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.