diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2015-07-28 17:53:23 +0900 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2015-09-30 16:39:41 +0900 |
| commit | 48cf53f4343ae12ddc1c60dbe116161ecf7a2885 (patch) | |
| tree | f1b5c2a231a7851b4d6008a08167d439dbe288a5 /drivers/gpu/drm/exynos | |
| parent | 8755556fbbdd1a6af21a3c4d9ce8f451e999e457 (diff) | |
| download | linux-48cf53f4343ae12ddc1c60dbe116161ecf7a2885.tar.gz linux-48cf53f4343ae12ddc1c60dbe116161ecf7a2885.tar.bz2 linux-48cf53f4343ae12ddc1c60dbe116161ecf7a2885.zip | |
drm/exynos: create a fake mmap offset with gem creation
Don't create a fake mmap offset in exynos_drm_gem_dumb_map_offset. If
not, it will call drm_gem_create_mmap_offset whenever user requests
DRM_IOCTL_MODE_MAP_DUMB ioctl.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gem.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 5c94863a4ca6..048ad13e5d82 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -199,6 +199,13 @@ static struct exynos_drm_gem_obj *exynos_drm_gem_init(struct drm_device *dev, return ERR_PTR(ret); } + ret = drm_gem_create_mmap_offset(obj); + if (ret < 0) { + drm_gem_object_release(obj); + kfree(exynos_gem_obj); + return ERR_PTR(ret); + } + DRM_DEBUG_KMS("created file object = 0x%x\n", (unsigned int)obj->filp); return exynos_gem_obj; @@ -445,14 +452,9 @@ int exynos_drm_gem_dumb_map_offset(struct drm_file *file_priv, goto unlock; } - ret = drm_gem_create_mmap_offset(obj); - if (ret) - goto out; - *offset = drm_vma_node_offset_addr(&obj->vma_node); DRM_DEBUG_KMS("offset = 0x%lx\n", (unsigned long)*offset); -out: drm_gem_object_unreference(obj); unlock: mutex_unlock(&dev->struct_mutex); |