From patchwork Thu Nov 15 14:59:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prathyush K X-Patchwork-Id: 1753611 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork2.kernel.org (Postfix) with ESMTP id 6334EDF288 for ; Fri, 16 Nov 2012 08:48:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 51A0DE5C7C for ; Fri, 16 Nov 2012 00:48:32 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTP id 79A869E92B for ; Thu, 15 Nov 2012 06:37:09 -0800 (PST) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDJ007QS9XREC70@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 15 Nov 2012 23:37:08 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id FF.EC.01231.31EF4A05; Thu, 15 Nov 2012 23:37:08 +0900 (KST) X-AuditID: cbfee61a-b7fa66d0000004cf-e1-50a4fe136444 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id AF.EC.01231.31EF4A05; Thu, 15 Nov 2012 23:37:07 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDJ008AX9WIS800@mmp2.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 15 Nov 2012 23:37:07 +0900 (KST) From: Prathyush K To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm/exynos: add exynos drm specific fb_mmap function Date: Thu, 15 Nov 2012 20:29:01 +0530 Message-id: <1352991541-9970-1-git-send-email-prathyush.k@samsung.com> X-Mailer: git-send-email 1.7.0.4 DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMLMWRmVeSWpSXmKPExsWyRsSkWlfk35IAg2dPGC2ufH3P5sDocb/7 OFMAYxSXTUpqTmZZapG+XQJXxu6jh1kK5gpUbLv4m7mB8QhvFyMnh4SAicTVZbPZIWwxiQv3 1rN1MXJxCAksZZQ49v49I0zRu3WLmCAS0xklDkw/xwKSEBJYzSTxf5EFiM0moC3xa85dVhBb REBZ4u/EVWDNzAIGEu1XJoDZwgIeEsu+rwWzWQRUJS5P3QxWzyvgJtGxYwvUFQoSrcsOsUPU CEh8m3wIaBcHUFxWYtMBZoiSHWwSLQurIWxJiYMrbrBMYBRcwMiwilE0tSC5oDgpPddQrzgx t7g0L10vOT93EyMwpE7/eya1g3Flg8UhRgEORiUeXocfiwOEWBPLiitzDzFKcDArifAanFsS IMSbklhZlVqUH19UmpNafIjRB+iQicxSosn5wHDPK4k3NDYxNzU2tTQyMjM1xSGsJM7b7JES ICSQnliSmp2aWpBaBDOOiYNTqoFR7IvlDwZu3mj2iZcjXpkem/Gpmd+kfovwt6j1s4OiQ5Qy q4XbjtR6TGVc/IuvYsamWWYOLn5hh7aolf6aqPZQPfJQ/dPdt85cm7/t33XLl7v+TnwQK3zp QISewf4JbC3qG9bf+7CtLuK55Tqf3ITZ77m0gnd9eXSxw/pbPEtQm8JCBcFJxV6FSizFGYmG WsxFxYkAmpXeKFYCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrMLMWRmVeSWpSXmKPExsVy+t9jQV3hf0sCDNpXGVlc+fqezYHR4373 caYAxqgGRpuM1MSU1CKF1Lzk/JTMvHRbJe/geOd4UzMDQ11DSwtzJYW8xNxUWyUXnwBdt8wc oLFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxozdRw+zFMwVqNh28Tdz A+MR3i5GTg4JAROJd+sWMUHYYhIX7q1n62Lk4hASmM4ocWD6ORaQhJDAaiaJ/4ssQGw2AW2J X3PusoLYIgLKEn8nrmIEsZkFDCTar0wAs4UFPCSWfV8LZrMIqEpcnroZrJ5XwE2iY8cWdohl ChKtyw6xT2DkXsDIsIpRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMjOGSfSe1gXNlgcYhRgINR iYfX4cfiACHWxLLiytxDjBIczEoivAbnlgQI8aYkVlalFuXHF5XmpBYfYvQB2j6RWUo0OR8Y T3kl8YbGJuamxqaWJhYmZpY4hJXEeZs9UgKEBNITS1KzU1MLUotgxjFxcEo1MNZcap42Ryz7 XpiTm1Dxvkvv5yQK/dk0/WDx5A/Z1e/3Rd/cEPJL6pq9hLr/819iK+Mnl7+syOCUO/zoZckz tVkZ2zT0JPwyVL0r7xwNcU2QuW3yKTzd8MPxCPkFDq/VnUpStkZNu9Vye+Lm1SKp09aJvXiU KHlHMPW/bXL/amnu/qx5Je/DFZRYijMSDbWYi4oTAb5utjqGAgAA X-CFilter-Loop: Reflected X-Mailman-Approved-At: Fri, 16 Nov 2012 00:46:26 -0800 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org This patch adds a exynos drm specific implementation of fb_mmap. The root framebuffer is allocated using dma_alloc_attrs which can allocate a contig or noncontig buffer depending on whether an iommu is attached to drm device or not. The default fb_mmap function always assumes the root fb to be contiguous thus failing in case of a non-contig buffer. The exynos drm specific implementation of fb_mmap extracts the private data from the fb_info and calls dma_mmap_attrs with the parameters used while allocating the buffer. Signed-off-by: Prathyush K --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 30 +++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 67eb6ba..62314ca 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -46,8 +46,38 @@ struct exynos_drm_fbdev { struct exynos_drm_gem_obj *exynos_gem_obj; }; +static int exynos_drm_fb_mmap(struct fb_info *info, + struct vm_area_struct *vma) +{ + struct drm_fb_helper *helper = info->par; + struct exynos_drm_fbdev *exynos_fbd = to_exynos_fbdev(helper); + struct exynos_drm_gem_obj *exynos_gem_obj = exynos_fbd->exynos_gem_obj; + struct exynos_drm_gem_buf *buffer = exynos_gem_obj->buffer; + unsigned long vm_size; + int ret; + + DRM_DEBUG_KMS("%s\n", __func__); + + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + + vm_size = vma->vm_end - vma->vm_start; + + if (vm_size > buffer->size) + return -EINVAL; + + ret = dma_mmap_attrs(helper->dev->dev, vma, buffer->kvaddr, + buffer->dma_addr, vm_size, &buffer->dma_attrs); + if (ret < 0) { + DRM_ERROR("failed to mmap.\n"); + return ret; + } + + return 0; +} + static struct fb_ops exynos_drm_fb_ops = { .owner = THIS_MODULE, + .fb_mmap = exynos_drm_fb_mmap, .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, .fb_imageblit = cfb_imageblit,