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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EA2AC433F5 for ; Wed, 13 Oct 2021 14:21:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3104E610F8 for ; Wed, 13 Oct 2021 14:21:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235412AbhJMOXn (ORCPT ); Wed, 13 Oct 2021 10:23:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232587AbhJMOXm (ORCPT ); Wed, 13 Oct 2021 10:23:42 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F64FC061570 for ; Wed, 13 Oct 2021 07:21:39 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id r7so8983025wrc.10 for ; Wed, 13 Oct 2021 07:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=KGV5+XgnGGbgyKsBWGvZeJz+/eWLXpcVDfX0Eq6feqQ=; b=CDVxwOlatCqAQJ8IC7a7zwRg9FBupYDWMsfWNq6dSGIGWx8SOFh/5Oatw+InCNkBUz c81RlmRhS9qtZoUZcmEsSMPAdlgsuta7BhGZ7UsryDpPe5MAUMCPAKQmoXkCXin7aSEQ csk1THJ9vzr7MQlqGmrxP6ZpOIYWcJmMrX1o4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=KGV5+XgnGGbgyKsBWGvZeJz+/eWLXpcVDfX0Eq6feqQ=; b=H8OGRVpqG9iaP5u0aVJbt7+GmyQL4tilwhn0kswBC2wcy0ovVVY+do3hNshOrT/jCp BJ6LC9nriFoa7fNFpnueFG44zNhGbY7eFUQZ8G/Q7FRVl0V7g13KGiGa/O1lKMNYlg6a JrXCw5LhzttZ5rJG3Ae6I4Jji9US4EmwNvfxFefC8bNRMZbTp1LjN3n6S0eOoHN8xyBp 4MpyiLNCq7FHKxkhqgbcRgLupYQ7j4cNs6TEKZ1ZIZnzvGcxB5/epH8wnmiPOqBGAYb4 a5XKg+eqNFuSBgcAVKk8WhwiHlOJyMGqkL8JUQesKlOI1kQA0DTGnVcVSdzxMvl6eYa6 D/Hg== X-Gm-Message-State: AOAM5329B2/K30wjK+VhjreJA5x7+7N+FfnMyMBobLQGZFwBlW+8OHZC 1xYS9Z5X0WKS+b/9+/2OMYt63Q== X-Google-Smtp-Source: ABdhPJxMaiINoMOB6u6wWQi7pvYuDM8TL3L0oupZrIcFiKmpMteTsfoTnacdbIv/SDv8AHoif0NupA== X-Received: by 2002:a1c:21d7:: with SMTP id h206mr13058751wmh.163.1634134898166; Wed, 13 Oct 2021 07:21:38 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id r3sm7119388wrw.55.2021.10.13.07.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 07:21:37 -0700 (PDT) Date: Wed, 13 Oct 2021 16:21:35 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Cc: linaro-mm-sig@lists.linaro.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, daniel@ffwll.ch, tvrtko.ursulin@linux.intel.com Subject: Re: [PATCH 23/28] drm: use new iterator in drm_gem_fence_array_add_implicit v3 Message-ID: References: <20211005113742.1101-1-christian.koenig@amd.com> <20211005113742.1101-24-christian.koenig@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211005113742.1101-24-christian.koenig@amd.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Tue, Oct 05, 2021 at 01:37:37PM +0200, Christian König wrote: > Simplifying the code a bit. > > v2: add missing rcu_read_lock()/unlock() > v3: switch to locked version > > Signed-off-by: Christian König > Reviewed-by: Tvrtko Ursulin Please make sure you also apply this to the new copy of this code in drm/sched. This one here is up for deletion, once I get all the driver conversions I have landed ... -Daniel > --- > drivers/gpu/drm/drm_gem.c | 26 +++++--------------------- > 1 file changed, 5 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c > index 09c820045859..4dcdec6487bb 100644 > --- a/drivers/gpu/drm/drm_gem.c > +++ b/drivers/gpu/drm/drm_gem.c > @@ -1340,31 +1340,15 @@ int drm_gem_fence_array_add_implicit(struct xarray *fence_array, > struct drm_gem_object *obj, > bool write) > { > - int ret; > - struct dma_fence **fences; > - unsigned int i, fence_count; > - > - if (!write) { > - struct dma_fence *fence = > - dma_resv_get_excl_unlocked(obj->resv); > - > - return drm_gem_fence_array_add(fence_array, fence); > - } > + struct dma_resv_iter cursor; > + struct dma_fence *fence; > + int ret = 0; > > - ret = dma_resv_get_fences(obj->resv, NULL, > - &fence_count, &fences); > - if (ret || !fence_count) > - return ret; > - > - for (i = 0; i < fence_count; i++) { > - ret = drm_gem_fence_array_add(fence_array, fences[i]); > + dma_resv_for_each_fence(&cursor, obj->resv, write, fence) { > + ret = drm_gem_fence_array_add(fence_array, fence); > if (ret) > break; > } > - > - for (; i < fence_count; i++) > - dma_fence_put(fences[i]); > - kfree(fences); > return ret; > } > EXPORT_SYMBOL(drm_gem_fence_array_add_implicit); > -- > 2.25.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch