Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1987084pxk; Tue, 1 Sep 2020 12:37:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx0atJS+/77a0BsbBOq5CRsklPfA9uyNPPFvVHaxMNv7oiNwwJBqE/YX32r8OLuGnf+mfqB X-Received: by 2002:a17:906:a1cf:: with SMTP id bx15mr2859662ejb.231.1598989076841; Tue, 01 Sep 2020 12:37:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598989076; cv=none; d=google.com; s=arc-20160816; b=WRtPtmbkLPVk8hFsbwX3YRdE6crRX+WukhEVgl8uo0HEfZXD5N8wmRjxRA/OD4DifV +hINW3TyuWUfv0518JAvhpvK0bqBn+mu4Wug9XnHpV4TyN5tMXJgdyttVCEMR5Qc6o3E KDn3kk6WmeswEnp0UVzM/g3Z9b2K3XQGfS/LFwEsFySGPDJ9w8XDSlgLgajhfcNh5MrN EUsJvys9Uyk2BmHmlP+IsF0MAN/u5l3z78ZhDj9CI8NEt9FZDw9ytb4QIOaG28gLUJUD 9UfPh1tovY1knOYW+IguM7nABr1yhJF40CnsplsP9GukW7cOudBPdWUzEtmn62EBvvU5 yfzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=kOLJ6f1bBLZQfbEVwjwmGv74kUxmiw2D3ie8UcUnEjw=; b=r5T+ScFbH35JIC3IXEoMidtvRhIruxwQOaL19DhKTC6g6fAVlr6N6JcbdCkKGjAuYa uNzU+7+btL4vQ8q/TM56RVaAxIRAC1N8SGCRlgqv7iNTo6g2WyjFXaleqAInSieUClmK EJjezOoHIuyXYGEy8kTrpQQqsid3qGOpM6gpGzvXm/Q6zq8UMyOFOt0hn3mx7cSLHJb6 M574sPJsNcJyfXuQqCM+FqlL9PhYtxISvbzhf2UDV0G5GGDr5iNqY+BwXu6Ih7KrkECf B81+O9oiMnM19LK9zGHCgD1bUD2stVIf48FlXIWh8huY5cuoY0bt3WAz4SEK66lceVm+ MdMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t12si1317998edc.174.2020.09.01.12.37.31; Tue, 01 Sep 2020 12:37:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728845AbgIATee (ORCPT + 99 others); Tue, 1 Sep 2020 15:34:34 -0400 Received: from foss.arm.com ([217.140.110.172]:48954 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728217AbgIATed (ORCPT ); Tue, 1 Sep 2020 15:34:33 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 63F041FB; Tue, 1 Sep 2020 12:34:32 -0700 (PDT) Received: from [10.57.40.122] (unknown [10.57.40.122]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D91FB3F71F; Tue, 1 Sep 2020 12:34:29 -0700 (PDT) Subject: Re: [PATCH v9 16/32] drm: rockchip: use common helper for a scatterlist contiguity check To: Marek Szyprowski , dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Christoph Hellwig , Bartlomiej Zolnierkiewicz , linux-arm-kernel@lists.infradead.org, David Airlie , Daniel Vetter , Sandy Huang , =?UTF-8?Q?Heiko_St=c3=bcbner?= , linux-rockchip@lists.infradead.org References: <20200826063316.23486-1-m.szyprowski@samsung.com> <20200826063316.23486-17-m.szyprowski@samsung.com> From: Robin Murphy Message-ID: <263143f0-8b39-6daa-1d26-54ef32b54c27@arm.com> Date: Tue, 1 Sep 2020 20:34:28 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20200826063316.23486-17-m.szyprowski@samsung.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2020-08-26 07:33, Marek Szyprowski wrote: > Use common helper for checking the contiguity of the imported dma-buf. Reviewed-by: Robin Murphy > Signed-off-by: Marek Szyprowski > --- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 19 +------------------ > 1 file changed, 1 insertion(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index b9275ba7c5a5..2970e534e2bb 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -460,23 +460,6 @@ struct sg_table *rockchip_gem_prime_get_sg_table(struct drm_gem_object *obj) > return sgt; > } > > -static unsigned long rockchip_sg_get_contiguous_size(struct sg_table *sgt, > - int count) > -{ > - struct scatterlist *s; > - dma_addr_t expected = sg_dma_address(sgt->sgl); > - unsigned int i; > - unsigned long size = 0; > - > - for_each_sg(sgt->sgl, s, count, i) { > - if (sg_dma_address(s) != expected) > - break; > - expected = sg_dma_address(s) + sg_dma_len(s); > - size += sg_dma_len(s); > - } > - return size; > -} > - > static int > rockchip_gem_iommu_map_sg(struct drm_device *drm, > struct dma_buf_attachment *attach, > @@ -498,7 +481,7 @@ rockchip_gem_dma_map_sg(struct drm_device *drm, > if (!count) > return -EINVAL; > > - if (rockchip_sg_get_contiguous_size(sg, count) < attach->dmabuf->size) { > + if (drm_prime_get_contiguous_size(sg) < attach->dmabuf->size) { > DRM_ERROR("failed to map sg_table to contiguous linear address.\n"); > dma_unmap_sg(drm->dev, sg->sgl, sg->nents, > DMA_BIDIRECTIONAL); >