From patchwork Tue Oct 5 11:37:28 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: 12536343 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21B39C433FE for ; Tue, 5 Oct 2021 11:38:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0B3746137D for ; Tue, 5 Oct 2021 11:38:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234446AbhJELju (ORCPT ); Tue, 5 Oct 2021 07:39:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234430AbhJELjt (ORCPT ); Tue, 5 Oct 2021 07:39:49 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2660DC061749 for ; Tue, 5 Oct 2021 04:37:59 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id s15so8594241wrv.11 for ; Tue, 05 Oct 2021 04:37:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=svmFiiyBNTOLlFWjgaUjcSSYX7QcL0TbCV34MdRHULg=; b=D0WgB+II1eRgAH07ZmG09EaNq5ijM+dWU8gLHbYnQ6hfCiwtC9VDz44a9qzcFZTb3I dOqHSCphqY+nXEo4tdXjfBzIYdApZffzTEHbWvS9PnwxZzpXxMs3XrWXmKfd116Kph/P 7demlF3nkJT/T0ePnbKAU46yOOsj5069iEk4st7zd2+2+TRLkEBrto5VGbet/1mm0AS0 1s3uoN5qIoXDotRlDuM8vMrmIC7TvKVU92/k4UNEznNfkyPmtcRNfCud3vv9zYyrCUaV apJ7vQlqWKKUQogmo+EQZsQv7J9kC71jEgdv10JuliYrv49zGz9s1Fhc+rKeQmd7nfEB nSrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=svmFiiyBNTOLlFWjgaUjcSSYX7QcL0TbCV34MdRHULg=; b=ZddCiHSvgrWVTaeqtRb32FAABydT+GaKO0+lB99CPY4WMHb9uP1tr//gaKQGECU0XV AeUS29uyaZGO48S+ORtTjanUuBo7GHPoiuJNWLcSyBOiEpg8/TrmSbnV/CRL5iFg4Wi6 bGMJuMeDrLQui3+zSkWBB1oS/EMMV2Keuq0XIy5IK3jJW7q5Ci09cyp/Zbd9vSIx222y RCdB6HVRZ2gO6Ydqxxwcfqm2Kfk0R7XLAtCls8zneptMJIdlr5pkMLrthG3KQLin1zEb jg+9fWe6a38DfdQvXDi8ePxBMFhon3sZ4P5/f9aD0ml3Zq7mrLetTO4s0jAfvr5gMcGv weJQ== X-Gm-Message-State: AOAM531kciagPW09Lg5nVmoehGjXJeOa9Du90XXytjNC6FLkj0lvQIUU 0+KnBUGYLF1sPE5yP+A/tP3EiNay8FY= X-Google-Smtp-Source: ABdhPJx0/JVRov9Wd4qwLwsNNo2H4eKQ6mk2i3bZTjifx/MjL7C8Y4FtxSwIUMZ39yTG61fxHtl8Jw== X-Received: by 2002:adf:a2c4:: with SMTP id t4mr21434985wra.296.1633433877783; Tue, 05 Oct 2021 04:37:57 -0700 (PDT) Received: from abel.fritz.box (p5b0ea1b5.dip0.t-ipconnect.de. [91.14.161.181]) by smtp.gmail.com with ESMTPSA id c5sm1739912wml.9.2021.10.05.04.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Oct 2021 04:37:57 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org Cc: daniel@ffwll.ch, tvrtko.ursulin@linux.intel.com Subject: [PATCH 14/28] drm/msm: use new iterator in msm_gem_describe Date: Tue, 5 Oct 2021 13:37:28 +0200 Message-Id: <20211005113742.1101-15-christian.koenig@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211005113742.1101-1-christian.koenig@amd.com> References: <20211005113742.1101-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. Also drop the RCU read side lock since the object is locked anyway. Untested since I can't get the driver to compile on !ARM. Signed-off-by: Christian König Reviewed-by: Daniel Vetter --- drivers/gpu/drm/msm/msm_gem.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 40a9863f5951..5bd511f07c07 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -880,7 +880,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, { struct msm_gem_object *msm_obj = to_msm_bo(obj); struct dma_resv *robj = obj->resv; - struct dma_resv_list *fobj; + struct dma_resv_iter cursor; struct dma_fence *fence; struct msm_gem_vma *vma; uint64_t off = drm_vma_node_start(&obj->vma_node); @@ -955,22 +955,13 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, seq_puts(m, "\n"); } - rcu_read_lock(); - fobj = dma_resv_shared_list(robj); - if (fobj) { - unsigned int i, shared_count = fobj->shared_count; - - for (i = 0; i < shared_count; i++) { - fence = rcu_dereference(fobj->shared[i]); + dma_resv_for_each_fence(&cursor, robj, true, fence) { + if (dma_resv_iter_is_exclusive(&cursor)) + describe_fence(fence, "Exclusive", m); + else describe_fence(fence, "Shared", m); - } } - fence = dma_resv_excl_fence(robj); - if (fence) - describe_fence(fence, "Exclusive", m); - rcu_read_unlock(); - msm_gem_unlock(obj); }