CHROMIUM: drm/exynos: prime: Fix exynos_drm_gem_dmabuf_mmap
authorDaniel Kurtz <djkurtz@chromium.org>
Mon, 10 Dec 2012 05:20:53 +0000 (13:20 +0800)
committerGerrit <chrome-bot@google.com>
Tue, 11 Dec 2012 01:55:10 +0000 (17:55 -0800)
Exynos stores a pointer to an exynos_drm_gem_obj in dma_buf->priv, not
a pointer to its base drm_gem_object field.

While we are at it, fix up the functions name and some space/tab issues.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
BUG=none
TEST=Compile test; As far as I can tell, this function isn't actually used

Change-Id: I64e421537d11cc0ebebdae27b1a990e998ed101e
Reviewed-on: https://gerrit.chromium.org/gerrit/39471
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
drivers/gpu/drm/exynos/exynos_drm_dmabuf.c

index c908a29..dc43870 100644 (file)
@@ -163,11 +163,10 @@ static void exynos_gem_dmabuf_kunmap(struct dma_buf *dma_buf,
        /* TODO */
 }
 
-static int exynos_drm_gem_dmabuf_mmap(struct dma_buf *dmabuf,
-                                     struct vm_area_struct *vma)
+static int exynos_gem_dmabuf_mmap(struct dma_buf *dmabuf,
+                                 struct vm_area_struct *vma)
 {
-       struct drm_gem_object *obj = dmabuf->priv;
-       struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj);
+       struct exynos_drm_gem_obj *exynos_gem_obj = dmabuf->priv;
        struct exynos_drm_gem_buf *buffer = exynos_gem_obj->buffer;
        unsigned long uaddr = vma->vm_start;
        int ret;
@@ -193,7 +192,7 @@ static int exynos_drm_gem_dmabuf_mmap(struct dma_buf *dmabuf,
 }
 
 static struct dma_buf_ops exynos_dmabuf_ops = {
-       .mmap                   = exynos_drm_gem_dmabuf_mmap,
+       .mmap                   = exynos_gem_dmabuf_mmap,
        .map_dma_buf            = exynos_gem_map_dma_buf,
        .unmap_dma_buf          = exynos_gem_unmap_dma_buf,
        .kmap                   = exynos_gem_dmabuf_kmap,