From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ander Conselvan de Oliveira Subject: [PATCH v3] drm/i915: Implement dma-buf mmap() for userspace access Date: Thu, 19 Jun 2014 15:34:34 +0300 Message-ID: <1403181274-7167-1-git-send-email-conselvan2@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-la0-f52.google.com (mail-la0-f52.google.com [209.85.215.52]) by gabe.freedesktop.org (Postfix) with ESMTP id D0DBC6E89B for ; Thu, 19 Jun 2014 05:35:20 -0700 (PDT) Received: by mail-la0-f52.google.com with SMTP id ty20so1388542lab.25 for ; Thu, 19 Jun 2014 05:35:19 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: intel-gfx@lists.freedesktop.org Cc: Ander Conselvan de Oliveira List-Id: intel-gfx@lists.freedesktop.org From: Rob Bradford The aim is that this is functionally equivalent to using the I915_GEM_MMAP ioctl. v2: Add aperture check limit, limit to SNB+ and improve error handling. v3 (anderco): Map without using the GTT. Signed-off-by: Rob Bradford Signed-off-by: Ander Conselvan de Oliveira --- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 580aa42..2d31fca 100644 --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -193,7 +193,24 @@ static void i915_gem_dmabuf_kunmap(struct dma_buf *dma_buf, unsigned long page_n static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct *vma) { - return -EINVAL; + struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); + struct drm_device *dev = obj->base.dev; + struct drm_i915_private *dev_priv = dev->dev_private; + int ret; + + if (INTEL_INFO(dev)->gen < 6) + return -EINVAL; + + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return ret; + + ret = obj->base.filp->f_op->mmap(obj->base.filp, vma); + fput(vma->vm_file); + vma->vm_file = get_file(obj->base.filp); + + mutex_unlock(&dev->struct_mutex); + return ret; } static int i915_gem_begin_cpu_access(struct dma_buf *dma_buf, size_t start, size_t length, enum dma_data_direction direction) -- 1.8.3.2