From patchwork Thu Jun 17 11:15:53 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: 462526 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 AE347C49361 for ; Thu, 17 Jun 2021 11:16:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9A5C0613BF for ; Thu, 17 Jun 2021 11:16:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232467AbhFQLST (ORCPT ); Thu, 17 Jun 2021 07:18:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232453AbhFQLSS (ORCPT ); Thu, 17 Jun 2021 07:18:18 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DF4FC061574 for ; Thu, 17 Jun 2021 04:16:10 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id df12so975552edb.2 for ; Thu, 17 Jun 2021 04:16:10 -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=hvNXqtq5mdZJpJK7jpCUZ+hsh9G2TDoGYYpRx9Mul74=; b=RIin5nZI/rpjSAo5R/hPF0Y/Mqr8Yq4tPJjB9KCgi1NwScGxumI9QfNhDpG/ocMPlL V7hyyE1Ne0mYBRkKYqDLJqQ49roJLNg12GRTc1V/jLkh5BFfQ+jkoD4unN0oWK/yOGAd PHI7FvSo4kzHBf30s/Bi/pVIkUaoSRle68FxqzlpGnpscWmkKNiGyfzMewTAOpBLjGYT yItfwLjrITYcM5owdPmOyrInM6mVSDokQr4zOWs/AGvg/Bzjl+ufk39yZtsvOxk4qRkj BLA3zb7Shrql6XGErODXjemVG5dWF3rolFdDfJSX3qPyLYLHmgqDgj05csKa2J/0ZTfq SI+A== 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=hvNXqtq5mdZJpJK7jpCUZ+hsh9G2TDoGYYpRx9Mul74=; b=NjyIWzkhkjCZzRmzYdmpYYg1Q441LI7QkccDUZa/6goI+EuKBGBg2Xw4dPoWnqsX10 qks76g2e5dnjzh5Xr1eQP75TUB481zSlFs0hkajOApxqwZyoT3lAFdG15MSnJYTG7OPj Xl3oJQoAlOvnaT9rDNQz+i5D/9JsvfPwdUXqWwaXlMfLpu5/l0CtZDbQGry7GSTo5par 1x8KBivNm2+nlgQ6rQilTXkzMTcxQdZXcOzWkuzg71MXVwt7RBNUOy+uEsmK/CsRJz0B oyHEI5wzVenbNqM7S2HS/ZgAYPUDWS5iN+mG06K9FY+qc4uDn4MjfsHgUzebyphPjC4Y xxSg== X-Gm-Message-State: AOAM533vBo6xcoCBE9BaqYRvrHVTvB5ifhxR+rIszf49Se2zUIqMFZ7/ 4OOtrM39vzpidmPnbv80Acw= X-Google-Smtp-Source: ABdhPJxdqm0xly694XIcLjrbZ9A76Y59S2aejU4bGXP1xl8mBcHQH3xduN5/LfUZEksy/oiQuJIoCA== X-Received: by 2002:a05:6402:51:: with SMTP id f17mr5633820edu.359.1623928568856; Thu, 17 Jun 2021 04:16:08 -0700 (PDT) Received: from abel.fritz.box ([2a02:908:1252:fb60:8534:5e76:1ee5:f3ad]) by smtp.gmail.com with ESMTPSA id y10sm3531353ejm.76.2021.06.17.04.16.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:16:08 -0700 (PDT) From: "=?UTF-8?q?Christian=20K=C3=B6nig?=" X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: daniel@ffwll.ch, sumit.semwal@linaro.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org, linux-media@vger.kernel.org Subject: [PATCH 11/16] drm/amdgpu: use the new iterator in amdgpu_sync_resv Date: Thu, 17 Jun 2021 13:15:53 +0200 Message-Id: <20210617111558.28486-12-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210617111558.28486-1-christian.koenig@amd.com> References: <20210617111558.28486-1-christian.koenig@amd.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Simplifying the code a bit. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 44 ++++++++---------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c index 862eb3c1c4c5..031ba20debb9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c @@ -252,41 +252,25 @@ int amdgpu_sync_resv(struct amdgpu_device *adev, struct amdgpu_sync *sync, struct dma_resv *resv, enum amdgpu_sync_mode mode, void *owner) { - struct dma_resv_list *flist; + struct dma_resv_cursor cursor; struct dma_fence *f; - unsigned i; - int r = 0; + int r; if (resv == NULL) return -EINVAL; - /* always sync to the exclusive fence */ - f = dma_resv_excl_fence(resv); - dma_fence_chain_for_each(f, f) { - struct dma_fence_chain *chain = to_dma_fence_chain(f); - - if (amdgpu_sync_test_fence(adev, mode, owner, chain ? - chain->fence : f)) { - r = amdgpu_sync_fence(sync, f); - dma_fence_put(f); - if (r) - return r; - break; - } - } - - flist = dma_resv_shared_list(resv); - if (!flist) - return 0; - - for (i = 0; i < flist->shared_count; ++i) { - f = rcu_dereference_protected(flist->shared[i], - dma_resv_held(resv)); - - if (amdgpu_sync_test_fence(adev, mode, owner, f)) { - r = amdgpu_sync_fence(sync, f); - if (r) - return r; + dma_resv_for_each_fence(resv, &cursor, true, f) { + dma_fence_chain_for_each(f, f) { + struct dma_fence_chain *chain = to_dma_fence_chain(f); + + if (amdgpu_sync_test_fence(adev, mode, owner, chain ? + chain->fence : f)) { + r = amdgpu_sync_fence(sync, f); + dma_fence_put(f); + if (r) + return r; + break; + } } } return 0;