From patchwork Tue May 4 13:27:20 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: 12238063 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 6CE87C433ED for ; Tue, 4 May 2021 13:27:47 +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 2FD3D611AC for ; Tue, 4 May 2021 13:27:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FD3D611AC 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 10F176E44E; Tue, 4 May 2021 13:27:37 +0000 (UTC) Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 469086E44E for ; Tue, 4 May 2021 13:27:35 +0000 (UTC) Received: by mail-ej1-x62a.google.com with SMTP id b25so13159578eju.5 for ; Tue, 04 May 2021 06:27:35 -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=jAD11aE5x8UuJF7B6T96XJzi1TBVlQUcGjgr07Irahw=; b=ipNuqzGGCOOkmfzxqbWJY7za4lUk2He9QTr3wfSD0nlweEiGgzApe2pBBEuzijaAUJ xJZb3Nwajj4+j/TTlaemZ/F2wIaVhRmJdx6TwK3B1affaYBSjj16MxVkMLp/5JcfEQo9 qniZTuzqrn9IPo1qo8jK33/JJYjHPeW48pDpJkTkRGwc2uKYQVJEjpM0MYt/CXxias4j uGPe6kmjn6XDbla0tnpL5URPJal8A+gH/0xDH0Vc4NOA65kZPBSiL2lCg2WYCLIM/4fI GgP52nxkfuqAeC5eRSPl4WWN2HeY08AAsNsuu4jkyHb4FHuU2eE/trcWvMLP6bFApICP mYOQ== 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=jAD11aE5x8UuJF7B6T96XJzi1TBVlQUcGjgr07Irahw=; b=LwRk4ArRDhy1+Xjk0/JZpY/mnUkqYf2OJbuCBoB0CmY/AIm9gqWHNc7KbmBGBNocIZ BHVyDBH1pcKy1zUDuZ51XAL04MiFD1XWKbuB05IgrfiL0qA+JnE05MYZO4UgFR/yx55z zs1FObwFB5mnrUUuDGgU3P7iaPrAYN8fymc8nwW5DI+YuSYJ6l4s3rjVIFtdG5gwAFJ5 YZz9PTgLHwmemU9jmYiSJlacjn+XatIRLYtV7EYkA6HD8ngM1uhvaYcklUr539ipkgVv CcHTzMaTtIx8X4JHSn6oSHGXfm2QnbfoaV3qGY901WRBhLS9v34Kdu7dpC7a8G+0MAgF qv4w== X-Gm-Message-State: AOAM531elHg0qIS18E8yPOLgnGQl57ZJb0A8E+ec68zYKfipZUWICNEn rkqzVGdV5F7S+GfX8SIzSd0ZX6XMji4= X-Google-Smtp-Source: ABdhPJzr+6H6RmbNdXZ3ZE4eeiMMULnBMXcvBV7rYmwRRYTDSJtcpYRMboB9FS4H569IsUcRZK3tOA== X-Received: by 2002:a17:906:3989:: with SMTP id h9mr21665420eje.309.1620134853963; Tue, 04 May 2021 06:27:33 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 06:27:33 -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 03/12] drm/amdgpu: add DMA-buf user fence support Date: Tue, 4 May 2021 15:27:20 +0200 Message-Id: <20210504132729.2046-4-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/amd/amdgpu/amdgpu_cs.c | 7 +++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index b5c766998045..afd58c6d88a4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -534,6 +534,13 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, return r; } + /* Sync to user fences */ + amdgpu_bo_list_for_each_entry(e, p->bo_list) { + r = dma_resv_sync_user_fence(e->tv.bo->base.resv); + if (r) + return r; + } + /* One for TTM and one for the CS job */ amdgpu_bo_list_for_each_entry(e, p->bo_list) e->tv.num_shared = 2; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 9a2f811450ed..3edd6dbae71f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -181,6 +181,12 @@ int amdgpu_display_crtc_page_flip_target(struct drm_crtc *crtc, obj = fb->obj[0]; new_abo = gem_to_amdgpu_bo(obj); + r = dma_resv_sync_user_fence(obj->resv); + if (unlikely(r)) { + DRM_ERROR("failed to wait for user fence before flip\n"); + goto cleanup; + } + /* pin the new buffer */ r = amdgpu_bo_reserve(new_abo, false); if (unlikely(r != 0)) {