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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 5FD4CC3A5A0 for ; Wed, 21 Aug 2019 12:31:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 340AC22D6D for ; Wed, 21 Aug 2019 12:31:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GLfbiDkf" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728280AbfHUMb4 (ORCPT ); Wed, 21 Aug 2019 08:31:56 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:43702 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726371AbfHUMb4 (ORCPT ); Wed, 21 Aug 2019 08:31:56 -0400 Received: by mail-wr1-f67.google.com with SMTP id y8so1848590wrn.10 for ; Wed, 21 Aug 2019 05:31:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=byMlpBQbF3xVofh0lp2jF4TITt+perQZbz2APhqasSc=; b=GLfbiDkfSe/jJ4+8lnG4Ss4t3NH78q/f0NgMoBe3PR6g2vyVF6LPqmkOg5dLwMzq22 7/rZaqj3bAEH6E+7/qBjb9hc7Ot8yTbAO0pA6BXFFZqwdX81uDvi8MDHAmOtLcRUUlqx T8D+U75/EYIgD54eIHMzfKAIf/uRvo4mjR5FzbYYFdT+kQXsOX/qbEo1nNLT1FkHvGAE S9NsHh26tpU1LuH49GJV+OBfb+EiVL24WnzgSDiuG6CA1f6aeNLk9G/M82S76i335D7w juO5WLd+XTHS8VJbtU8LxsbiUnK7nsKQpCsnzDlFeNFsfbXyWfuPa3tjO2aCBMqVsVkE ZMQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=byMlpBQbF3xVofh0lp2jF4TITt+perQZbz2APhqasSc=; b=H1d3E6YTXT8nBj8Fzy/T1tC0MVq7otZSgnaQUiEwSCron1X+9wY9kYb99C6lkNkJIp cbxZ5CPaO7cJT2YgIXBc8rV9odAOVDd0fcmS0ULGqlPRHmN3NFHAz/rLa22S0y2Nf7zG xm5y6aQKQjO978ZISMp0D2ZxM5wT83QAze6lji0odbjB5XHsWZstI35wqElwwcdZnRHD seg0XMyi3b/hso0DcuRhRI+6mEHX7hEcoDLEjqvE3B1AXRV5zHoi6DM1z19y4FGpdK+a xe4ZDBTmrKYg1boFPvgBpFsz7SGBgjHppWrS5jai/8V5mTjceviLKpolLO9li1U6kdue AKYg== X-Gm-Message-State: APjAAAXxbxlYFQngJDVqPe1tYmR/lAMSr9gfp+8OH5uhWF7tBXRNlqz6 6PTb3GC+8lBEXBKxzR40OuI= X-Google-Smtp-Source: APXvYqwNErrT3VpJ56IEwwDi6ZOxVcfM0i0WoOtcvyeOpdiiTb+T1UcsF4wj8z/pUdF2Mx6eA42Eog== X-Received: by 2002:a5d:4448:: with SMTP id x8mr993728wrr.119.1566390714544; Wed, 21 Aug 2019 05:31:54 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:8189:dd33:a934:c4fa]) by smtp.gmail.com with ESMTPSA id v3sm23084571wrq.34.2019.08.21.05.31.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 05:31:54 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?UTF-8?q?Christian=20K=C3=B6nig?= To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, daniel.vetter@ffwll.ch, sumit.semwal@linaro.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 06/10] dma-buf/resv: stop pruning shared fences when exclusive is added Date: Wed, 21 Aug 2019 14:31:43 +0200 Message-Id: <20190821123147.110736-7-christian.koenig@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821123147.110736-1-christian.koenig@amd.com> References: <20190821123147.110736-1-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org First step towards new shared fence container implementation. Signed-off-by: Christian König --- drivers/dma-buf/dma-resv.c | 16 +--------------- drivers/gpu/drm/msm/msm_gem.c | 14 ++++++-------- drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 24adc32d36d4..d3a9a3bb15f0 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -271,32 +271,18 @@ EXPORT_SYMBOL(dma_resv_add_shared_fence); void dma_resv_add_excl_fence(struct dma_resv *obj, struct dma_fence *fence) { struct dma_fence *old_fence = dma_resv_get_excl(obj); - struct dma_resv_list *old; - u32 i = 0; dma_resv_assert_held(obj); - old = dma_resv_get_list(obj); - if (old) - i = old->shared_count; - - if (fence) - dma_fence_get(fence); + dma_fence_get(fence); preempt_disable(); write_seqcount_begin(&obj->seq); /* write_seqcount_begin provides the necessary memory barrier */ RCU_INIT_POINTER(obj->fence_excl, fence); - if (old) - old->shared_count = 0; write_seqcount_end(&obj->seq); preempt_enable(); - /* inplace update, no shared fences */ - while (i--) - dma_fence_put(rcu_dereference_protected(old->shared[i], - dma_resv_held(obj))); - dma_fence_put(old_fence); } EXPORT_SYMBOL(dma_resv_add_excl_fence); diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 348a7ad2c044..90e3dc3b927a 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -668,14 +668,12 @@ int msm_gem_sync_object(struct drm_gem_object *obj, int i, ret; fobj = dma_resv_get_list(obj->resv); - if (!fobj || (fobj->shared_count == 0)) { - fence = dma_resv_get_excl(obj->resv); - /* don't need to wait on our own fences, since ring is fifo */ - if (fence && (fence->context != fctx->context)) { - ret = dma_fence_wait(fence, true); - if (ret) - return ret; - } + fence = dma_resv_get_excl(obj->resv); + /* don't need to wait on our own fences, since ring is fifo */ + if (fence && (fence->context != fctx->context)) { + ret = dma_fence_wait(fence, true); + if (ret) + return ret; } if (!exclusive || !fobj) diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 8df390078c85..42ddddbb49e4 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -350,7 +350,7 @@ nouveau_fence_sync(struct nouveau_bo *nvbo, struct nouveau_channel *chan, bool e fobj = dma_resv_get_list(resv); fence = dma_resv_get_excl(resv); - if (fence && (!exclusive || !fobj || !fobj->shared_count)) { + if (fence) { struct nouveau_channel *prev = NULL; bool must_wait = true; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" Subject: [PATCH 06/10] dma-buf/resv: stop pruning shared fences when exclusive is added Date: Wed, 21 Aug 2019 14:31:43 +0200 Message-ID: <20190821123147.110736-7-christian.koenig@amd.com> References: <20190821123147.110736-1-christian.koenig@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22E006E316 for ; Wed, 21 Aug 2019 12:31:56 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id u16so1890777wrr.0 for ; Wed, 21 Aug 2019 05:31:56 -0700 (PDT) In-Reply-To: <20190821123147.110736-1-christian.koenig@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, chris@chris-wilson.co.uk, daniel.vetter@ffwll.ch, sumit.semwal@linaro.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org List-Id: dri-devel@lists.freedesktop.org Rmlyc3Qgc3RlcCB0b3dhcmRzIG5ldyBzaGFyZWQgZmVuY2UgY29udGFpbmVyIGltcGxlbWVudGF0 aW9uLgoKU2lnbmVkLW9mZi1ieTogQ2hyaXN0aWFuIEvDtm5pZyA8Y2hyaXN0aWFuLmtvZW5pZ0Bh bWQuY29tPgotLS0KIGRyaXZlcnMvZG1hLWJ1Zi9kbWEtcmVzdi5jICAgICAgICAgICAgICB8IDE2 ICstLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9tc20vbXNtX2dlbS5jICAgICAgICAg ICB8IDE0ICsrKysrKy0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9ub3V2ZWF1X2Zl bmNlLmMgfCAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDI0IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtcmVzdi5jIGIvZHJpdmVy cy9kbWEtYnVmL2RtYS1yZXN2LmMKaW5kZXggMjRhZGMzMmQzNmQ0Li5kM2E5YTNiYjE1ZjAgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvZG1hLWJ1Zi9kbWEtcmVzdi5jCisrKyBiL2RyaXZlcnMvZG1hLWJ1 Zi9kbWEtcmVzdi5jCkBAIC0yNzEsMzIgKzI3MSwxOCBAQCBFWFBPUlRfU1lNQk9MKGRtYV9yZXN2 X2FkZF9zaGFyZWRfZmVuY2UpOwogdm9pZCBkbWFfcmVzdl9hZGRfZXhjbF9mZW5jZShzdHJ1Y3Qg ZG1hX3Jlc3YgKm9iaiwgc3RydWN0IGRtYV9mZW5jZSAqZmVuY2UpCiB7CiAJc3RydWN0IGRtYV9m ZW5jZSAqb2xkX2ZlbmNlID0gZG1hX3Jlc3ZfZ2V0X2V4Y2wob2JqKTsKLQlzdHJ1Y3QgZG1hX3Jl c3ZfbGlzdCAqb2xkOwotCXUzMiBpID0gMDsKIAogCWRtYV9yZXN2X2Fzc2VydF9oZWxkKG9iaik7 CiAKLQlvbGQgPSBkbWFfcmVzdl9nZXRfbGlzdChvYmopOwotCWlmIChvbGQpCi0JCWkgPSBvbGQt PnNoYXJlZF9jb3VudDsKLQotCWlmIChmZW5jZSkKLQkJZG1hX2ZlbmNlX2dldChmZW5jZSk7CisJ ZG1hX2ZlbmNlX2dldChmZW5jZSk7CiAKIAlwcmVlbXB0X2Rpc2FibGUoKTsKIAl3cml0ZV9zZXFj b3VudF9iZWdpbigmb2JqLT5zZXEpOwogCS8qIHdyaXRlX3NlcWNvdW50X2JlZ2luIHByb3ZpZGVz IHRoZSBuZWNlc3NhcnkgbWVtb3J5IGJhcnJpZXIgKi8KIAlSQ1VfSU5JVF9QT0lOVEVSKG9iai0+ ZmVuY2VfZXhjbCwgZmVuY2UpOwotCWlmIChvbGQpCi0JCW9sZC0+c2hhcmVkX2NvdW50ID0gMDsK IAl3cml0ZV9zZXFjb3VudF9lbmQoJm9iai0+c2VxKTsKIAlwcmVlbXB0X2VuYWJsZSgpOwogCi0J LyogaW5wbGFjZSB1cGRhdGUsIG5vIHNoYXJlZCBmZW5jZXMgKi8KLQl3aGlsZSAoaS0tKQotCQlk bWFfZmVuY2VfcHV0KHJjdV9kZXJlZmVyZW5jZV9wcm90ZWN0ZWQob2xkLT5zaGFyZWRbaV0sCi0J CQkJCQlkbWFfcmVzdl9oZWxkKG9iaikpKTsKLQogCWRtYV9mZW5jZV9wdXQob2xkX2ZlbmNlKTsK IH0KIEVYUE9SVF9TWU1CT0woZG1hX3Jlc3ZfYWRkX2V4Y2xfZmVuY2UpOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2VtLmMgYi9kcml2ZXJzL2dwdS9kcm0vbXNtL21zbV9n ZW0uYwppbmRleCAzNDhhN2FkMmMwNDQuLjkwZTNkYzNiOTI3YSAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL21zbS9tc21fZ2VtLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZ2Vt LmMKQEAgLTY2OCwxNCArNjY4LDEyIEBAIGludCBtc21fZ2VtX3N5bmNfb2JqZWN0KHN0cnVjdCBk cm1fZ2VtX29iamVjdCAqb2JqLAogCWludCBpLCByZXQ7CiAKIAlmb2JqID0gZG1hX3Jlc3ZfZ2V0 X2xpc3Qob2JqLT5yZXN2KTsKLQlpZiAoIWZvYmogfHwgKGZvYmotPnNoYXJlZF9jb3VudCA9PSAw KSkgewotCQlmZW5jZSA9IGRtYV9yZXN2X2dldF9leGNsKG9iai0+cmVzdik7Ci0JCS8qIGRvbid0 IG5lZWQgdG8gd2FpdCBvbiBvdXIgb3duIGZlbmNlcywgc2luY2UgcmluZyBpcyBmaWZvICovCi0J CWlmIChmZW5jZSAmJiAoZmVuY2UtPmNvbnRleHQgIT0gZmN0eC0+Y29udGV4dCkpIHsKLQkJCXJl dCA9IGRtYV9mZW5jZV93YWl0KGZlbmNlLCB0cnVlKTsKLQkJCWlmIChyZXQpCi0JCQkJcmV0dXJu IHJldDsKLQkJfQorCWZlbmNlID0gZG1hX3Jlc3ZfZ2V0X2V4Y2wob2JqLT5yZXN2KTsKKwkvKiBk b24ndCBuZWVkIHRvIHdhaXQgb24gb3VyIG93biBmZW5jZXMsIHNpbmNlIHJpbmcgaXMgZmlmbyAq LworCWlmIChmZW5jZSAmJiAoZmVuY2UtPmNvbnRleHQgIT0gZmN0eC0+Y29udGV4dCkpIHsKKwkJ cmV0ID0gZG1hX2ZlbmNlX3dhaXQoZmVuY2UsIHRydWUpOworCQlpZiAocmV0KQorCQkJcmV0dXJu IHJldDsKIAl9CiAKIAlpZiAoIWV4Y2x1c2l2ZSB8fCAhZm9iaikKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZmVuY2UuYyBiL2RyaXZlcnMvZ3B1L2RybS9ub3V2 ZWF1L25vdXZlYXVfZmVuY2UuYwppbmRleCA4ZGYzOTAwNzhjODUuLjQyZGRkZGJiNDllNCAxMDA2 NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbm91dmVhdV9mZW5jZS5jCisrKyBiL2Ry aXZlcnMvZ3B1L2RybS9ub3V2ZWF1L25vdXZlYXVfZmVuY2UuYwpAQCAtMzUwLDcgKzM1MCw3IEBA IG5vdXZlYXVfZmVuY2Vfc3luYyhzdHJ1Y3Qgbm91dmVhdV9ibyAqbnZibywgc3RydWN0IG5vdXZl YXVfY2hhbm5lbCAqY2hhbiwgYm9vbCBlCiAJZm9iaiA9IGRtYV9yZXN2X2dldF9saXN0KHJlc3Yp OwogCWZlbmNlID0gZG1hX3Jlc3ZfZ2V0X2V4Y2wocmVzdik7CiAKLQlpZiAoZmVuY2UgJiYgKCFl eGNsdXNpdmUgfHwgIWZvYmogfHwgIWZvYmotPnNoYXJlZF9jb3VudCkpIHsKKwlpZiAoZmVuY2Up IHsKIAkJc3RydWN0IG5vdXZlYXVfY2hhbm5lbCAqcHJldiA9IE5VTEw7CiAJCWJvb2wgbXVzdF93 YWl0ID0gdHJ1ZTsKIAotLSAKMi4xNy4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWw=