From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Plattner Subject: Re: [PATCH 1/3] drm: add mmap function to prime helpers Date: Fri, 14 Jun 2013 10:16:05 -0700 Message-ID: <51BB4FD5.7000401@nvidia.com> References: <1371042979-14633-1-git-send-email-jy0922.shim@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from hqemgate04.nvidia.com (hqemgate04.nvidia.com [216.228.121.35]) by gabe.freedesktop.org (Postfix) with ESMTP id 42F4FE5CCF for ; Fri, 14 Jun 2013 10:16:09 -0700 (PDT) In-Reply-To: <1371042979-14633-1-git-send-email-jy0922.shim@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Joonyoung Shim Cc: "laurent.pinchart@ideasonboard.com" , "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org On 06/12/2013 06:16 AM, Joonyoung Shim wrote: > This adds to call low-level mmap() from prime helpers. > > Signed-off-by: Joonyoung Shim > --- > drivers/gpu/drm/drm_prime.c | 5 ++++- > include/drm/drmP.h | 2 ++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c > index d92853e..3a008b2 100644 > --- a/drivers/gpu/drm/drm_prime.c > +++ b/drivers/gpu/drm/drm_prime.c > @@ -165,7 +165,10 @@ static void drm_gem_dmabuf_kunmap(struct dma_buf *dma_buf, > static int drm_gem_dmabuf_mmap(struct dma_buf *dma_buf, > struct vm_area_struct *vma) > { > - return -EINVAL; > + struct drm_gem_object *obj = dma_buf->priv; > + struct drm_device *dev = obj->dev; > + > + return dev->driver->gem_prime_mmap(obj, vma); Won't this crash if the driver doesn't fill in the new field and userspace tries to map it? > } > > static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { > diff --git a/include/drm/drmP.h b/include/drm/drmP.h > index 82670ac..12083dc 100644 > --- a/include/drm/drmP.h > +++ b/include/drm/drmP.h > @@ -937,6 +937,8 @@ struct drm_driver { > struct sg_table *sgt); > void *(*gem_prime_vmap)(struct drm_gem_object *obj); > void (*gem_prime_vunmap)(struct drm_gem_object *obj, void *vaddr); > + int (*gem_prime_mmap)(struct drm_gem_object *obj, > + struct vm_area_struct *vma); > > /* vga arb irq handler */ > void (*vgaarb_irq)(struct drm_device *dev, bool state); > -- Aaron