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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B809C48BD3 for ; Thu, 27 Jun 2019 00:48:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6103220B1F for ; Thu, 27 Jun 2019 00:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596522; bh=EgQM/TXve2elP/6ZXxEVjCqqSaywt9iJ96wu7+E1KNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Sv+iKDJlHlY5GR5fBsJUpyPGj92ycG+VQOONGCrP3+q5g5ztyr3oL2vRxtf0Hj7dN yx8Wufq0yMmg0bjCnMwygYm5m+Oi0Pr1yqvP8MuwnhAgYh7ZJ+2qKNGqNxfs3XuGDL oUFEwS/MpSfJUmJmZSJUCxqJFpI7OQuRHJy3l2yk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728750AbfF0AiE (ORCPT ); Wed, 26 Jun 2019 20:38:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:42360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727270AbfF0Ah4 (ORCPT ); Wed, 26 Jun 2019 20:37:56 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E8132080C; Thu, 27 Jun 2019 00:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595875; bh=EgQM/TXve2elP/6ZXxEVjCqqSaywt9iJ96wu7+E1KNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uxw2WB5WfOpjYD6SQG3CiTDNFmwz9I1vU2dsbaU5uGAlxZXpznXnlgX9CN4zUyCGp cJnJ1UIY45+6LGaEas1GRn9eBv+ld9ytcon4XYL6GgQn4kra25egeB8gKBDKk+2iHi jyO+ZmbzHX94de+4wsF1EbxVbEB9V0V473c23bIQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Hellstrom , Deepak Rawat , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 32/60] drm/vmwgfx: Honor the sg list segment size limitation Date: Wed, 26 Jun 2019 20:35:47 -0400 Message-Id: <20190627003616.20767-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003616.20767-1-sashal@kernel.org> References: <20190627003616.20767-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Hellstrom [ Upstream commit bde15555ba61c7f664f40fd3c6fdbdb63f784c9b ] When building sg tables, honor the device sg list segment size limitation. Signed-off-by: Thomas Hellstrom Reviewed-by: Deepak Rawat Signed-off-by: Sasha Levin --- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index 31786b200afc..f388ad51e72b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -448,11 +448,11 @@ static int vmw_ttm_map_dma(struct vmw_ttm_tt *vmw_tt) if (unlikely(ret != 0)) return ret; - ret = sg_alloc_table_from_pages(&vmw_tt->sgt, vsgt->pages, - vsgt->num_pages, 0, - (unsigned long) - vsgt->num_pages << PAGE_SHIFT, - GFP_KERNEL); + ret = __sg_alloc_table_from_pages + (&vmw_tt->sgt, vsgt->pages, vsgt->num_pages, 0, + (unsigned long) vsgt->num_pages << PAGE_SHIFT, + dma_get_max_seg_size(dev_priv->dev->dev), + GFP_KERNEL); if (unlikely(ret != 0)) goto out_sg_alloc_fail; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 32/60] drm/vmwgfx: Honor the sg list segment size limitation Date: Wed, 26 Jun 2019 20:35:47 -0400 Message-ID: <20190627003616.20767-32-sashal@kernel.org> References: <20190627003616.20767-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 46A696E577 for ; Thu, 27 Jun 2019 00:43:04 +0000 (UTC) In-Reply-To: <20190627003616.20767-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Thomas Hellstrom , Deepak Rawat , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJvbUB2bXdhcmUuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgYmRlMTU1NTViYTYxYzdmNjY0ZjQwZmQzYzZmZGJkYjYzZjc4NGM5YiBdCgpXaGVu IGJ1aWxkaW5nIHNnIHRhYmxlcywgaG9ub3IgdGhlIGRldmljZSBzZyBsaXN0IHNlZ21lbnQgc2l6 ZSBsaW1pdGF0aW9uLgoKU2lnbmVkLW9mZi1ieTogVGhvbWFzIEhlbGxzdHJvbSA8dGhlbGxzdHJv bUB2bXdhcmUuY29tPgpSZXZpZXdlZC1ieTogRGVlcGFrIFJhd2F0IDxkcmF3YXRAdm13YXJlLmNv bT4KU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRy aXZlcnMvZ3B1L2RybS92bXdnZngvdm13Z2Z4X3R0bV9idWZmZXIuYyB8IDEwICsrKysrLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfdHRtX2J1ZmZlci5jIGIvZHJpdmVy cy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfdHRtX2J1ZmZlci5jCmluZGV4IDMxNzg2YjIwMGFmYy4u ZjM4OGFkNTFlNzJiIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vdm13Z2Z4L3Ztd2dmeF90 dG1fYnVmZmVyLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3Ztd2dmeC92bXdnZnhfdHRtX2J1ZmZl ci5jCkBAIC00NDgsMTEgKzQ0OCwxMSBAQCBzdGF0aWMgaW50IHZtd190dG1fbWFwX2RtYShzdHJ1 Y3Qgdm13X3R0bV90dCAqdm13X3R0KQogCQlpZiAodW5saWtlbHkocmV0ICE9IDApKQogCQkJcmV0 dXJuIHJldDsKIAotCQlyZXQgPSBzZ19hbGxvY190YWJsZV9mcm9tX3BhZ2VzKCZ2bXdfdHQtPnNn dCwgdnNndC0+cGFnZXMsCi0JCQkJCQl2c2d0LT5udW1fcGFnZXMsIDAsCi0JCQkJCQkodW5zaWdu ZWQgbG9uZykKLQkJCQkJCXZzZ3QtPm51bV9wYWdlcyA8PCBQQUdFX1NISUZULAotCQkJCQkJR0ZQ X0tFUk5FTCk7CisJCXJldCA9IF9fc2dfYWxsb2NfdGFibGVfZnJvbV9wYWdlcworCQkJKCZ2bXdf dHQtPnNndCwgdnNndC0+cGFnZXMsIHZzZ3QtPm51bV9wYWdlcywgMCwKKwkJCSAodW5zaWduZWQg bG9uZykgdnNndC0+bnVtX3BhZ2VzIDw8IFBBR0VfU0hJRlQsCisJCQkgZG1hX2dldF9tYXhfc2Vn X3NpemUoZGV2X3ByaXYtPmRldi0+ZGV2KSwKKwkJCSBHRlBfS0VSTkVMKTsKIAkJaWYgKHVubGlr ZWx5KHJldCAhPSAwKSkKIAkJCWdvdG8gb3V0X3NnX2FsbG9jX2ZhaWw7CiAKLS0gCjIuMjAuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs