From patchwork Tue May 4 13:27:27 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: 12238093 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.6 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,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 56370C43460 for ; Tue, 4 May 2021 13:27:59 +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 12E52611AC for ; Tue, 4 May 2021 13:27:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12E52611AC 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 41FA26EB08; Tue, 4 May 2021 13:27:45 +0000 (UTC) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by gabe.freedesktop.org (Postfix) with ESMTPS id C08A26EADE for ; Tue, 4 May 2021 13:27:39 +0000 (UTC) Received: by mail-ed1-x534.google.com with SMTP id g14so10417039edy.6 for ; Tue, 04 May 2021 06:27:39 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=3btEsmLTilUPtyBakr3FBUicMoZVn4WGzuTm981fE28=; b=uv0+ttDbjAP2gv69Pv1bUldIxykUwMJMcQH4FQF4jzqoo6j72yhsO1qa/wAUsL9FEg SPmgKWi5keRFBXzUvhvL3ht4bqy5I0dUxFl5n+d7jjCWFhqzSNsff4cpXWcydhk62H6p odC5OeDfoNWl5/Lp85yrz46ItwXUdc8QCWJ6b0sbvnsSjCqbHacqI6FXhyy4H8xhvCse FP1nyo+4zujaESgnd0DdZlEhjGvodQEXK4K3uPvKebV9zV3EkOrlVRLwYsSEQnEBqELS gXapI0oo7KIJXATdMDKi4AyteDl/6Q/vkboXE4rItApx9nXgOs21hMhdG6fj2x7SkXXy QiSQ== 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=3btEsmLTilUPtyBakr3FBUicMoZVn4WGzuTm981fE28=; b=P4uPbG73YR38HSiJU5I72Ri8TrWg/N03hKDXPObZS3rr+8lI9/6c0/JKNVvnfffXu8 U2GbEk52WT9pC+qSDgCkMadnb282IJJfzyoNC//EiLteE9Md2CVwY1AW16MX1Di7xFl1 xLL+QIPxz2A/wUYiCkgMttD0bMDvjy98kftvTj23oGHW9TplrkML+zPdTfOBJos6N/SK L6vSZJsHeRjIZAQ9OAWy1t4nbd9Ccc5iue3HYKIdpkUfgi9pEzadhV7HqbyLOZ0WPYg+ 80ayYdOUs2C5mmGAkE+KN9dw/fkxNNDHedza/5kY2cvkFY5c0GKHmDd2TepSCTbhq1Q5 IZvg== X-Gm-Message-State: AOAM531+PVfBZLlg5I8+518UXSaQxOsZhb7747vQmRrCegvgzFi1VKPM eYre4wiKdEBtfZy/Ocdd50FdgszM1eQ= X-Google-Smtp-Source: ABdhPJxgohc+ZI0uW+mjnyHeCI7C30U96eG+w9AzGzxgLklIizxH9hBFbVrjhuR0gZAYobru76nFuA== X-Received: by 2002:aa7:cf8d:: with SMTP id z13mr26491797edx.104.1620134858507; Tue, 04 May 2021 06:27:38 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:4a5c:1943:c73d:c4c9]) by smtp.gmail.com with ESMTPSA id q18sm3114036edd.3.2021.05.04.06.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 06:27:38 -0700 (PDT) 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 Subject: [PATCH 10/12] drm/panfrost: add DMA-buf user fence support Date: Tue, 4 May 2021 15:27:27 +0200 Message-Id: <20210504132729.2046-11-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210504132729.2046-1-christian.koenig@amd.com> References: <20210504132729.2046-1-christian.koenig@amd.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Just add the call before taking locks. Signed-off-by: Christian König --- drivers/gpu/drm/panfrost/panfrost_job.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c index 6003cfeb1322..9174ceb1d16d 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c @@ -216,6 +216,18 @@ static void panfrost_attach_object_fences(struct drm_gem_object **bos, dma_resv_add_excl_fence(bos[i]->resv, fence); } +static int panfrost_sync_user_fences(struct drm_gem_object **bos, int bo_count) +{ + int i, ret; + + for (i = 0; i < bo_count; i++) { + ret = dma_resv_sync_user_fence(bos[i]->resv); + if (ret) + return ret; + } + return 0; +} + int panfrost_job_push(struct panfrost_job *job) { struct panfrost_device *pfdev = job->pfdev; @@ -224,6 +236,10 @@ int panfrost_job_push(struct panfrost_job *job) struct ww_acquire_ctx acquire_ctx; int ret = 0; + ret = panfrost_sync_user_fences(job->bos, job->bo_count); + if (ret) + return ret; + mutex_lock(&pfdev->sched_lock); ret = drm_gem_lock_reservations(job->bos, job->bo_count,