From patchwork Tue May 4 13:27:25 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: 12238091 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 2AA7CC433B4 for ; Tue, 4 May 2021 13:27:58 +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 E7F3E610FC for ; Tue, 4 May 2021 13:27:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7F3E610FC 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 30D3A6EAF0; Tue, 4 May 2021 13:27:45 +0000 (UTC) Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F31D6EADC for ; Tue, 4 May 2021 13:27:38 +0000 (UTC) Received: by mail-ej1-x635.google.com with SMTP id b25so13159872eju.5 for ; Tue, 04 May 2021 06:27:38 -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=IDgRUHJwicRUiun+FrCDeqYmcPNSG89xMILj1rEOdww=; b=M0uHIm8+sTc3gANiNC0mkVCOPLizdMx76fZ0EPENotHLmlid5eN/5OjOwo32oKT6u0 tKVYzhxzRCHHzlDA2wzhLdleT9XqlcuDlNsGDXAiBidFz9hA56kL0OrGhp3d+ezTBe4U 07hDTggqaNDxnSN3txipS/OMebi3CsOpsq7xQrW6hPa21MsKm47bSROtvztxUFi9C+7w ooa0U08CAuk+9ee0Balm7BIKI3H+E18Mj+zqd0nUp/tlQCYmnm8VrT11D8di7nhcBnA8 enUiKp0GQJOD3+Kh6mkrLP7svc45FzP4idwa6HQsnlK+B0e32r52iTw7dVCNKtNnk0Rq JuvA== 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=IDgRUHJwicRUiun+FrCDeqYmcPNSG89xMILj1rEOdww=; b=HApQ5dQQHZq+UTXo7JnjHfWTvrZIOnlsLDiLCRr4393LAjZNm0UfN+UsoSpusp6bwR lbXTh4YuMEkHowacGrSQcgXpVHdg2VsWbogjAXYANtrBWm5hdv66UsdsOwO6wVQQo0Dd X5bnAJbOTK2rIlN46RDyNZrqTb2B9c/8ymfIkua29oEZNIwP1gglXBFOSW69uQ3Ypwfv +jXcuX4K6GIBe1fVhuMKKuHtELmgu7Cao1M8FKvgDu1z0RsJy/fIyz+3RpAcL65dqqER JzgybUdL5lMezDY2EbNCAACFcWwjg+xnrC2BW3345/FvtW1yOF5fmLZIklrTd3IEjdtd uIsA== X-Gm-Message-State: AOAM530RQrHzGC1z2CmiTH1FRxWunPv+m85az/QY+nM5gNdMmFVw7ZTI sjG/jatYYkogAZsVpfru/z6SK6rGNAA= X-Google-Smtp-Source: ABdhPJxNBhm1kwbAr94iVfgKGVBTIYGAXactpfsemSkX3vsq2DiEqE27hPS4wovSl9eoOdg9kF3XbA== X-Received: by 2002:a17:906:a103:: with SMTP id t3mr22356706ejy.334.1620134857254; Tue, 04 May 2021 06:27:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 May 2021 06:27:36 -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 08/12] drm/msm: add DMA-buf user fence support Date: Tue, 4 May 2021 15:27:25 +0200 Message-Id: <20210504132729.2046-9-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/msm/msm_gem_submit.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c index 5480852bdeda..a77389ce23d0 100644 --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -285,6 +285,20 @@ static int submit_lock_objects(struct msm_gem_submit *submit) return ret; } +static int submit_sync_user_fence(struct msm_gem_submit *submit) +{ + int i, ret; + + for (i = 0; i < submit->nr_bos; i++) { + struct msm_gem_object *msm_obj = submit->bos[i].obj; + + ret = dma_resv_sync_user_fence(msm_obj->base.resv); + if (ret) + return ret; + } + return 0; +} + static int submit_fence_sync(struct msm_gem_submit *submit, bool no_implicit) { int i, ret = 0; @@ -769,6 +783,10 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, */ pm_runtime_get_sync(&gpu->pdev->dev); + ret = submit_sync_user_fence(submit); + if (ret) + goto out; + /* copy_*_user while holding a ww ticket upsets lockdep */ ww_acquire_init(&submit->ticket, &reservation_ww_class); has_ww_ticket = true;