From patchwork Thu Nov 15 15:48:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Souptick Joarder X-Patchwork-Id: 10684657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CF4C14DB for ; Thu, 15 Nov 2018 15:44:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 561802CADD for ; Thu, 15 Nov 2018 15:44:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4962B2CB61; Thu, 15 Nov 2018 15:44:54 +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=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3B022CB87 for ; Thu, 15 Nov 2018 15:44:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A31A16B0495; Thu, 15 Nov 2018 10:44:52 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9DF786B0496; Thu, 15 Nov 2018 10:44:52 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F6466B0497; Thu, 15 Nov 2018 10:44:52 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by kanga.kvack.org (Postfix) with ESMTP id 4D9B96B0495 for ; Thu, 15 Nov 2018 10:44:52 -0500 (EST) Received: by mail-pg1-f200.google.com with SMTP id h10so10772444pgv.20 for ; Thu, 15 Nov 2018 07:44:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:from:to:cc:subject :message-id:mime-version:content-disposition:user-agent; bh=aM1C42m8xdOqFETa7vpI1nSS13dxTXWD/5chbQoQBa8=; b=Nc3N8zGG3y+M3bcQioyEV+7VnfYBEg1uoAl8g6W9MzatwLwxH/ZHHEbU6NmKyWw3Vj oJqrZqXpmsWWes2IwZikyD72PESK5taEJSMI12ztBZady9eHjThkiI4h1cOoJpbH1nja Y2z0Sw2956ly568My7RCP4GuKm7v6GuwcWE8VgOQU65JNYpvwse0jmFXPw0EDYBFuWbn N6WTv+G55ff96Pf2LVjrUgpAXKvtQHCFz+cwe7MEEo5kbb8nll4yfVD0RXYzYgq/tGg5 1D3mGcJxxGAVLUNHeCgl5q8A0owe9UpScfhskxyR3aqrS9S8FaHiNSZDB0+NGP/c19eU lahg== X-Gm-Message-State: AGRZ1gJS2vTy/WjQA3i80GrP6krQxnp7XGmUE4TmeMtY2wp5gyGYQrFl aTdWV+R5v/E95ZXFtdkL/ta/19v+BSvOvikuojuVLHeL9AvBFIrXA7X9ZBSH9y+7JamyvFqSQYn XHaR32htUxI/QYzROR9VbOjtME46EbxawhB9NFS0jXIWAxxq6zbFTqAY1s/ek0MUOjyNJvUXSTs LQ1+e16TYJoxLHjhWeipBCA9B4iAM4N3FqakZSD273YKle01wgknOuvdfUc084gafAWR770aOc8 R1QNyYNjBamU0HcxYkK55s3z7SacZQ8w6ZufyJ1dHMdKtussiVq5p81ufh16WTXbmDoQNG+xkCc uMFhvsY56FdbuzGWhLUXOXyVe+KVK27ug/A+C2s+3Pub/abXfAVmKVEDdk+YbRspoWj/5Wb0u5n t X-Received: by 2002:a62:3647:: with SMTP id d68-v6mr7001426pfa.66.1542296691982; Thu, 15 Nov 2018 07:44:51 -0800 (PST) X-Received: by 2002:a62:3647:: with SMTP id d68-v6mr7001390pfa.66.1542296691261; Thu, 15 Nov 2018 07:44:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542296691; cv=none; d=google.com; s=arc-20160816; b=JMpPrDBz48QY8QvcdLaAybfHCY/N/47DT2w8gvx0R8dy2vMHcEPLjJ/P2AH0Y0wKc+ fPAXSbNpn17I4kofCUTjC980EFhk2WDbxNG0uNiZittuzzRsAip9dE8tKxmnCraKwjsx PygtQXkNobkEvvsnf2LO5sqNete5j9LO0cFqk6twk/fCZsVclYU4UWFb8LsyZ66knQAo ADd/StSvn/wLAIuWs2AO1JB7AUJnnLU+W/BGFo7IHkuKCJLaUcDzuY52ZTLIDLLwfPqb pp6BgPvofo6VjfCFJs03wbIipalQJ3J3KRZwmaZntMQVcoEQvY+VnbahuY08x7OucvBx +qCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:content-disposition:mime-version:message-id:subject:cc :to:from:date:dkim-signature; bh=aM1C42m8xdOqFETa7vpI1nSS13dxTXWD/5chbQoQBa8=; b=l98qky1iAXAe5f0LkgNq1XkjVjSIDA9ofZA3M/inDo/srz5gJNBZumDiQ8X3t3xxCd GQh40rylvCfryNrnusBsku5G/SWw91dwbY2WsQuX4vluPdRid2ACCg26YXT5RpLeDqEf SMqQ7tYHy1ZNkJq0J16nCJMDBKeIS4GDGvNGj+HcWocADR5s3YSl/OBRHEXrgm82PL7/ 8e2hZ5q3LYL/rI5YHd0vgfMm/gMCchIDd4vFrUvqO53vmTbvQpkJlFWrLhqcMvkZDMVK EeNYb/QYM+/A7t0KCHyrrR6HxEl8Nm7zclDzTrfeIwR6/ACTFf/xsSd/S27ivZa9VKJj WEuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=WPUlk2x5; spf=pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jrdr.linux@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k3-v6sor33497753pfb.7.2018.11.15.07.44.51 for (Google Transport Security); Thu, 15 Nov 2018 07:44:51 -0800 (PST) Received-SPF: pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=WPUlk2x5; spf=pass (google.com: domain of jrdr.linux@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jrdr.linux@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=aM1C42m8xdOqFETa7vpI1nSS13dxTXWD/5chbQoQBa8=; b=WPUlk2x5CRHbvpM1bKX0kitApnk9BOX9wd6CvD1uXCrRKIH6tLEay2hxykg+jfsOB5 J3wKWSBsuJ6udvfS4G6bvMcO6ox+2kzBEBlokR74eBZjoMw6d8x1PN71smAmcbb6mBup OdgkIHjtmqbhHbuOLy/q3SSyLzA2k+Xpsv24H8M3CFunfT0Vso70i7cPyZZzP0niaf+O JGIryGQnwC1aAak8kAS+Qx8SqdiY8zDRVlIBvvktT+IuNNm53fGMh6V+fHDKJ1kl3EAv aNkn5Ps0QTpVVhzhG4tLFaxNej9aYPChR96QL/bg7V+spivBI26bw5QPRPmo5pwul8kV BkFg== X-Google-Smtp-Source: AJdET5e7n4pF+rhd6dDpXXTPWo1Rru/vt9norA53b2YS+zYvPSJKdhFnnXdL8xxj4jhF0QHgnmIpvw== X-Received: by 2002:a62:6241:: with SMTP id w62-v6mr6901975pfb.69.1542296690923; Thu, 15 Nov 2018 07:44:50 -0800 (PST) Received: from jordon-HP-15-Notebook-PC ([103.227.97.233]) by smtp.gmail.com with ESMTPSA id z127-v6sm32794856pfz.135.2018.11.15.07.44.49 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Nov 2018 07:44:49 -0800 (PST) Date: Thu, 15 Nov 2018 21:18:26 +0530 From: Souptick Joarder To: akpm@linux-foundation.org, willy@infradead.org, mhocko@suse.com, hjc@rock-chips.com, heiko@sntech.de, airlied@linux.ie Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org Subject: [PATCH 4/9] drm/rockchip/rockchip_drm_gem.c: Convert to use vm_insert_range Message-ID: <20181115154826.GA27948@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Convert to use vm_insert_range() to map range of kernel memory to user vma. Signed-off-by: Souptick Joarder Tested-by: Heiko Stuebner Acked-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index a8db758..2cb83bb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -221,26 +221,10 @@ static int rockchip_drm_gem_object_mmap_iommu(struct drm_gem_object *obj, struct vm_area_struct *vma) { struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj); - unsigned int i, count = obj->size >> PAGE_SHIFT; unsigned long user_count = vma_pages(vma); - unsigned long uaddr = vma->vm_start; - unsigned long offset = vma->vm_pgoff; - unsigned long end = user_count + offset; - int ret; - - if (user_count == 0) - return -ENXIO; - if (end > count) - return -ENXIO; - for (i = offset; i < end; i++) { - ret = vm_insert_page(vma, uaddr, rk_obj->pages[i]); - if (ret) - return ret; - uaddr += PAGE_SIZE; - } - - return 0; + return vm_insert_range(vma, vma->vm_start, rk_obj->pages, + user_count); } static int rockchip_drm_gem_object_mmap_dma(struct drm_gem_object *obj,