Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp409694ybb; Wed, 25 Mar 2020 02:10:29 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvAI5xTlHvqV2Ancy1jXbcrs66kJrNGkF3ZzXQ8q57RseSaHA+xom9m0HN0vvq1sgf6Q5g9 X-Received: by 2002:aca:cd0e:: with SMTP id d14mr1621293oig.167.1585127429830; Wed, 25 Mar 2020 02:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585127429; cv=none; d=google.com; s=arc-20160816; b=af+PTBzdAE77z9jZqEhx8tuQ6Q1oLqbRz0E6rHx4Ffsqq8RocyGFzLLIdGbevRKc11 +sTEhDuxjJY3fpwelMT9dvVZl3uPyJ8kJFZzEiwuC1pjIErTxgBst8zq32j10yUL+w16 4VBYXmsZ8a8pzvQ/JxH7sIYTf+Jq1hlnA1VAOc8sIkHndt7OsHcRfXmzdc+TDUU7h49c K3WRq3hxSmirPmxo5rszyPq3ghLGmJs22OsUOs+k9QSDCWcjnZU4IoLQMCtd6jslnxtr Dw6z3u9lWIqAzWmoSSImake+FlFrjwM5pGRzErxTNBQyFR83MopkLxwGPn4pu5s8qW/v bX4A== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QLkRr9j1+t7kkMw2Ku/7MnvEj1jxos3vANcsR2A+POs=; b=zRUWndDThhOrQ+PO+GC9uZOqMkaCbYMJsx4p2vx2nqh6Hje4pYbzL06FuD5roZBpui 7VnH4vv1LFvSyb1TLfZjkqPe+6hLyodvQp1Xzs9z9kPh34AZ5SL5nmHvcmKj3ACxwe/f a+w9pSqxa3na1LsQt5vUTBuEAFQnbCmkoaNRXNdQHBH7e28w/Z3drE/SNyFZSoAwLn3/ B4oPUfTKZ0F2GE5mngPVuryJcfodZBoZAZfL6FeOEK6TEF0CbWOzx8pmEpIstGagd3cf S7+8XtLadgCLHFv8l4SHD2hOnpSoKdQXNHffX6k70mOM9nIIvlhSYXZYmMUtpCE+MGp3 v4Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tItHUlXC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h11si10649254otj.170.2020.03.25.02.10.16; Wed, 25 Mar 2020 02:10:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tItHUlXC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727504AbgCYJIn (ORCPT + 99 others); Wed, 25 Mar 2020 05:08:43 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:33866 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727452AbgCYJIm (ORCPT ); Wed, 25 Mar 2020 05:08:42 -0400 Received: by mail-wm1-f67.google.com with SMTP id 26so4414399wmk.1 for ; Wed, 25 Mar 2020 02:08:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QLkRr9j1+t7kkMw2Ku/7MnvEj1jxos3vANcsR2A+POs=; b=tItHUlXC1+dfULZj1LhOU5NDx3F9h/M/Ae+O3kMnVbgtAsdvT2ghQImi0NoPV8ldYI 8GaZtaL4VnqLR4oMrFkvItwsYw7cJKeIrKcyQfKWK6tf2RhjiYrreUBRr/2fCdDbjXKT 3BYngDUrgZV4/43KdBii77JRucqGFUjtik85FPE67ce5c6hnB898jDOBVZfnKm5pxiAH hk+QX8F83j54OcYIqCop2qgnskqWTGYNi2hm6xTOXihX/NMSg9wjpPY9qnW8jBmJSaST XcZFNCTzLHphjahSUA5EBejR9NCMy7C6mOoclZxiGkRX/9smMlqy/43m2uR0gW3JzfDL 82xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QLkRr9j1+t7kkMw2Ku/7MnvEj1jxos3vANcsR2A+POs=; b=AG0FA88Usxcj2KTgCIPrM+MEN9BqF45HOcw/YvwZvrB73mmLt8Uv9GCutepIXAC3gG Ag92DMDZoT/Nd1qA2LLACEen0QqrgfhHbBiDS3sxysQsbj+A99dKma//J719pwBj3WPC o90ki6xJjmAsB8PxiJhurN7aY/dkZmwRr7PdBeUJ/aGHlsm3xRwA43SsdGCpsj/Ve9RI 0E6J9zPV2RVOiyTdZGF0ae0+LOBGAdX2JGgHgyk95w5OwGYRqfXv/8llQBxzKBC2dlf9 Vtf8xLEvN9fg2tua83sWcSfCjU0ZaFEdsODGufJxBS2mrj3fHMHX05K41BhNRlHSBxS4 J56w== X-Gm-Message-State: ANhLgQ3x4abdYDW9clcOYMDWILrcRjJSHQ+Jol1oG1FNAXRUlfgCD0s1 1E0+ewcF2Vb5qzdqD6WmVjQ= X-Received: by 2002:a1c:f407:: with SMTP id z7mr2380279wma.36.1585127321046; Wed, 25 Mar 2020 02:08:41 -0700 (PDT) Received: from wasp.lan (250.128.208.46.dyn.plus.net. [46.208.128.250]) by smtp.googlemail.com with ESMTPSA id 127sm8565048wmd.38.2020.03.25.02.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 02:08:40 -0700 (PDT) From: Shane Francis To: dri-devel@lists.freedesktop.org Cc: amd-gfx-request@lists.freedesktop.org, linux-kernel@vger.kernel.org, bigbeeshane@gmail.com, alexander.deucher@amd.com, christian.koenig@amd.com, mripard@kernel.org, airlied@linux.ie, David1.Zhou@amd.com Subject: [PATCH v4 2/3] drm/amdgpu: fix scatter-gather mapping with user pages Date: Wed, 25 Mar 2020 09:07:40 +0000 Message-Id: <20200325090741.21957-3-bigbeeshane@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200325090741.21957-1-bigbeeshane@gmail.com> References: <20200325090741.21957-1-bigbeeshane@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calls to dma_map_sg may return segments / entries than requested if they fall on page bounderies. The old implementation did not support this use case. Signed-off-by: Shane Francis --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index dee446278417..c6e9885c071f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -974,7 +974,7 @@ static int amdgpu_ttm_tt_pin_userptr(struct ttm_tt *ttm) /* Map SG to device */ r = -ENOMEM; nents = dma_map_sg(adev->dev, ttm->sg->sgl, ttm->sg->nents, direction); - if (nents != ttm->sg->nents) + if (nents == 0) goto release_sg; /* convert SG to linear array of pages and dma addresses */ -- 2.26.0