From patchwork Thu Sep 23 07:55:55 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: 12512491 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.5 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,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 6EE80C433FE for ; Thu, 23 Sep 2021 11:58:30 +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 3423E60F56 for ; Thu, 23 Sep 2021 11:58:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3423E60F56 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 241536ED08; Thu, 23 Sep 2021 11:58:28 +0000 (UTC) Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DC7E6ECF8 for ; Thu, 23 Sep 2021 07:56:21 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id d21so14423279wra.12 for ; Thu, 23 Sep 2021 00:56:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IkVWp2cRgm41mlWFdiuPcdEqOEMHJpLCxm3yFN2dD0Q=; b=ZCqzI2iGAiYMZ92MWXWTeKpcqad2DOXICsCA97M6kyoXWTKBzSYBnw6Ybuq3qBz2/m aUFgr/eGu61FCuxACQd1So6I6QMyQPOmvRcW54LZXLnPTEqlDPSHNlOKCaHstJJJKhTc n+n3AKFapt/X2y1vrG4FZqe+XHdvpc2Y29rGWkeLTDNrotPAAUbfisWqFOOpHBO/1Egc oV3rnRd4aB487LRdQLe7LrUMJMpWHsKZdb6a0KSneTI36+wfXGupCPAla2dsLB2wmM+W ll7pmK0W4cRb870lHomW3DjhzKahK6GqOiBIrHjZWsZCar3WsWl7cTzeu5QlGQMaI4Ij r8YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IkVWp2cRgm41mlWFdiuPcdEqOEMHJpLCxm3yFN2dD0Q=; b=z/J4NZIl335EqvffeK02RRJCMpSPoIpCfeFUqOJDUZa8MWxUB/VC4aFPtSChKN1bJG dktW+6oPcK5abuVQyGM7cbXbFCGDgNosj3q7K6jv67hGSiFWChfWnb3kffetUrOsRAHP ByF8wOAkHXPjcq8TMRakCvJe+Sz/Bg4UZgcKJeCZztKW25au+UJYIoc4hBzGzQIGevYy 8w6X5iNGy/ElbUMt/kh3xDLo70vSGezxlhApjzxJMqLKedml2scLE7dgok9cPsB7X3IE M4V6uX5SbnyseoyCJaRZmbyRx4g1+qdrj4cJPKV28gTe2FlFAidf9wKe0gXbEPKX8deD A6Ng== X-Gm-Message-State: AOAM533IVaOf2wqlqYiO7PqDA4972rifeUvWaL3R2cNqLa2+k5dydcEm W3MKkW7nr6GvxQuC+NpAynKNb2bucLg= X-Google-Smtp-Source: ABdhPJwIpSlbune9RS9q/9SQUhAw0PHqkJmoxUyYa84GRfmIl/ZlQKeA8mjLd377n8ZTrSgXNPxe+A== X-Received: by 2002:adf:f24a:: with SMTP id b10mr3472662wrp.281.1632383779757; Thu, 23 Sep 2021 00:56:19 -0700 (PDT) Received: from abel.fritz.box (p5b0ea1b5.dip0.t-ipconnect.de. [91.14.161.181]) by smtp.gmail.com with ESMTPSA id k19sm4280704wmr.21.2021.09.23.00.56.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Sep 2021 00:56:19 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Sep 2021 09:55:55 +0200 Message-Id: <20210923075608.2873-12-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210923075608.2873-1-christian.koenig@amd.com> References: <20210923075608.2873-1-christian.koenig@amd.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 23 Sep 2021 11:57:22 +0000 Subject: [Intel-gfx] [PATCH 12/25] drm/radeon: use new iterator in radeon_sync_resv X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Simplifying the code a bit. Signed-off-by: Christian König --- drivers/gpu/drm/radeon/radeon_sync.c | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_sync.c b/drivers/gpu/drm/radeon/radeon_sync.c index 9257b60144c4..b991ba1bcd51 100644 --- a/drivers/gpu/drm/radeon/radeon_sync.c +++ b/drivers/gpu/drm/radeon/radeon_sync.c @@ -91,33 +91,17 @@ int radeon_sync_resv(struct radeon_device *rdev, struct dma_resv *resv, bool shared) { - struct dma_resv_list *flist; - struct dma_fence *f; + struct dma_resv_iter cursor; struct radeon_fence *fence; - unsigned i; + struct dma_fence *f; int r = 0; - /* always sync to the exclusive fence */ - f = dma_resv_excl_fence(resv); - fence = f ? to_radeon_fence(f) : NULL; - if (fence && fence->rdev == rdev) - radeon_sync_fence(sync, fence); - else if (f) - r = dma_fence_wait(f, true); - - flist = dma_resv_shared_list(resv); - if (shared || !flist || r) - return r; - - for (i = 0; i < flist->shared_count; ++i) { - f = rcu_dereference_protected(flist->shared[i], - dma_resv_held(resv)); + dma_resv_for_each_fence(&cursor, resv, shared, f) { fence = to_radeon_fence(f); if (fence && fence->rdev == rdev) radeon_sync_fence(sync, fence); else r = dma_fence_wait(f, true); - if (r) break; }