From patchwork Tue Jul 28 08:53:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6880951 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0879D9F380 for ; Tue, 28 Jul 2015 08:53:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37010206D2 for ; Tue, 28 Jul 2015 08:53:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 41356205C6 for ; Tue, 28 Jul 2015 08:53:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7A57A6E8F1; Tue, 28 Jul 2015 01:53:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F1246E919 for ; Tue, 28 Jul 2015 01:53:38 -0700 (PDT) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS60207ZWP5AR90@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 28 Jul 2015 17:53:29 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.115]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 66.30.28411.90347B55; Tue, 28 Jul 2015 17:53:29 +0900 (KST) X-AuditID: cbfee68e-f79c56d000006efb-23-55b743097ac6 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 54.82.07062.90347B55; Tue, 28 Jul 2015 17:53:29 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS60042VWP4KW00@mmp2.samsung.com>; Tue, 28 Jul 2015 17:53:29 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH 11/14] drm/exynos: remove function update_vm_cache_attr Date: Tue, 28 Jul 2015 17:53:26 +0900 Message-id: <1438073609-32664-11-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438073609-32664-1-git-send-email-jy0922.shim@samsung.com> References: <1438073609-32664-1-git-send-email-jy0922.shim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPLMWRmVeSWpSXmKPExsWyRsSkWJfTeXuowcIZ5hZXvr5ns5h0fwKL xYt7F1ksZkx+yebA4nG/+ziTR9+WVYwBTFFcNimpOZllqUX6dglcGVennGMtOMRXsWrGSaYG xk08XYycHBICJhKrfsxihrDFJC7cW8/WxcjFISSwglFizq3NzDBFT/oPM0IkZjFKHFiyCsr5 wShx5sVysCo2AT2JO9uOM4HYIgLKEn8nghRxcjALeEqsWDUPLC4s4C6xYM1bNhCbRUAVaPVq FhCbV8BD4uHtW+wQ2+QkTh6bzApicwLFjx7aB2YLAfWu/tECtlhC4DObxMw5E1kgBglIfJt8 CMjmAErISmw6AHW1pMTBFTdYJjAKL2BkWMUomlqQXFCclF5kpFecmFtcmpeul5yfu4kRGK6n /z3r28F484D1IUYBDkYlHt4J67aFCrEmlhVX5h5iNAXaMJFZSjQ5HxgVeSXxhsZmRhamJqbG RuaWZkrivAlSP4OFBNITS1KzU1MLUovii0pzUosPMTJxcEo1MLZG6DCZB1z28ciue2W/r3b2 2jWi0lplHaHBUZFv9wXuuyC4M1LrwMHCQBm2GWI37IrPlhYUqUmujb7EU5DD2jfnfIzSy/s7 pVYonkzY1OqkzDE5fffmXwus3O6Y8/+59Nzty/tu5qX9Lq01p3e5ds+/lnsl9Ouc+cl5BZNU eU4s1NB+9eKyphJLcUaioRZzUXEiAP56hfVSAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeLIzCtJLcpLzFFi42I5/e+xoC6n8/ZQgz0LjC2ufH3PZjHp/gQW ixf3LrJYzJj8ks2BxeN+93Emj74tqxgDmKIaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0M DHUNLS3MlRTyEnNTbZVcfAJ03TJzgFYpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLr MTJAAwlrGDOuTjnHWnCIr2LVjJNMDYybeLoYOTkkBEwknvQfZoSwxSQu3FvP1sXIxSEkMItR 4sCSVYwQzg9GiTMvljODVLEJ6Enc2XacCcQWEVCW+DtxFVg3s4CnxIpV88DiwgLuEgvWvGUD sVkEVCVW/VjNAmLzCnhIPLx9ix1im5zEyWOTWUFsTqD40UP7wGwhoN7VP1oYJzDyLmBkWMUo kVqQXFCclJ5rlJdarlecmFtcmpeul5yfu4kRHBPPpHcwHt7lfohRgINRiYf3xYZtoUKsiWXF lbmHGCU4mJVEeP8Ybg8V4k1JrKxKLcqPLyrNSS0+xGgKdNhEZinR5HxgvOaVxBsam5gZWRqZ G1oYGZsrifPqm2wKFRJITyxJzU5NLUgtgulj4uCUamDUf3KQS5td02BVkvO9pp71E5WmJs/8 Fll3ZF3C5Wumsc8mVJqZ8+rs8Z4mlJWaYD/nS3jAlv6dR9++djnHVzKJ9e+t/U5GTvnnvm1c wqXA9i9JRyPt4/9IX/9HD24eEVn4+83MGexXnNPXmNRUrxK48PvWJHnz3Lnre18JXDL2eZPs Yr5JmcNNiaU4I9FQi7moOBEAjCguVZ8CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The function update_vm_cache_attr can be merged in exynos_drm_gem_mmap. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 03e85d8..55c64cf 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -20,22 +20,6 @@ #include "exynos_drm_buf.h" #include "exynos_drm_iommu.h" -static void update_vm_cache_attr(struct exynos_drm_gem_obj *obj, - struct vm_area_struct *vma) -{ - DRM_DEBUG_KMS("flags = 0x%x\n", obj->flags); - - /* non-cachable as default. */ - if (obj->flags & EXYNOS_BO_CACHABLE) - vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); - else if (obj->flags & EXYNOS_BO_WC) - vma->vm_page_prot = - pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); - else - vma->vm_page_prot = - pgprot_noncached(vm_get_page_prot(vma->vm_flags)); -} - static unsigned long roundup_gem_size(unsigned long size, unsigned int flags) { /* TODO */ @@ -580,7 +564,17 @@ int exynos_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) goto err_close_vm; } - update_vm_cache_attr(exynos_gem_obj, vma); + DRM_DEBUG_KMS("flags = 0x%x\n", exynos_gem_obj->flags); + + /* non-cachable as default. */ + if (exynos_gem_obj->flags & EXYNOS_BO_CACHABLE) + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); + else if (exynos_gem_obj->flags & EXYNOS_BO_WC) + vma->vm_page_prot = + pgprot_writecombine(vm_get_page_prot(vma->vm_flags)); + else + vma->vm_page_prot = + pgprot_noncached(vm_get_page_prot(vma->vm_flags)); ret = exynos_drm_gem_mmap_buffer(exynos_gem_obj, vma); if (ret)