From patchwork Tue Apr 10 18:25:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 10334999 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F6B76053B for ; Wed, 11 Apr 2018 07:41:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7168F28753 for ; Wed, 11 Apr 2018 07:41:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F95528785; Wed, 11 Apr 2018 07:41:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0759528776 for ; Wed, 11 Apr 2018 07:41:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D5556E570; Wed, 11 Apr 2018 07:40:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from smtp.codeaurora.org (smtp.codeaurora.org [198.145.29.96]) by gabe.freedesktop.org (Postfix) with ESMTPS id 06C5E6E4A4; Tue, 10 Apr 2018 18:25:13 +0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3E15A6076A; Tue, 10 Apr 2018 18:25:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523384713; bh=Ua3acgZnryQrtTzTjHqzVYdyxACYdgx2LTupnbkII/A=; h=From:To:Cc:Subject:Date:From; b=E8bwPq+2A8jUOnj2AJdJ9LuZifn1KiUsn6Qv2T5CZJLuHvI0NN/+IY+JuHu+7x2jm 7PoZQHpDs9lGBxbZyTmGcr3ShmbjvIFMFq0f5ndYVRjONdOYTi4SmVyye4sb3pU9MZ Oiv86ezQ7rP/Qj4w443U02VvTwC0O66zvROQpewM= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id CF3BA60274; Tue, 10 Apr 2018 18:25:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1523384712; bh=Ua3acgZnryQrtTzTjHqzVYdyxACYdgx2LTupnbkII/A=; h=From:To:Cc:Subject:Date:From; b=msUAvGUSbbtJ69mFaj1Wni/TkIKyZOdvRCvnvm9dMQ/RYBa08vxTBzJui0RMpzpmV 6+iDPhjpJ72XRKCwDaa9A6V0eHth46DuVaFR5rkuVoQV7NKmZ5EquvlkSr+41kFYEU 6HxWcWeYg27Hk+/Q/uTe3lEhV97SV92KQvmUaAxA= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org CF3BA60274 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: amd-gfx@lists.freedesktop.org, timur@codeaurora.org, sulrich@codeaurora.org Subject: [PATCH] drm/amdgpu: limit DMA size to PAGE_SIZE for scatter-gather buffers Date: Tue, 10 Apr 2018 14:25:03 -0400 Message-Id: <1523384705-3976-1-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 11 Apr 2018 07:39:57 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom St Denis , David Airlie , linux-arm-msm@vger.kernel.org, Felix Kuehling , =?UTF-8?q?Michel=20D=C3=A4nzer?= , open list , "open list:DRM DRIVERS" , Sinan Kaya , Harish Kasiviswanathan , Roger He , Monk Liu , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Code is expecing to observe the same number of buffers returned from dma_map_sg() function compared to sg_alloc_table_from_pages(). This doesn't hold true universally especially for systems with IOMMU. IOMMU driver tries to combine buffers into a single DMA address as much as it can. The right thing is to tell the DMA layer how much combining IOMMU can do. Signed-off-by: Sinan Kaya --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index e4bb435..02465cd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -787,6 +787,8 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) enum dma_data_direction direction = write ? DMA_BIDIRECTIONAL : DMA_TO_DEVICE; + dma_set_max_seg_size(adev->dev, PAGE_SIZE); + r = sg_alloc_table_from_pages(ttm->sg, ttm->pages, ttm->num_pages, 0, ttm->num_pages << PAGE_SHIFT, GFP_KERNEL);