Merge pull request #120 from endlessm/shell/6274

drm/meson: Implent gem_prime_mmap

Author: carlocaione

drivers/gpu/drm/meson/meson_drv.c

@@ -1288,6 +1288,7 @@ static struct drm_driver meson_driver = {
 	.gem_prime_export	= drm_gem_prime_export,
 	.gem_prime_get_sg_table	= meson_drm_gem_get_sg_table,
 	.gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
+	.gem_prime_mmap     = meson_drm_gem_prime_mmap,
 	.dumb_create        = meson_drm_gem_dumb_create,
 	.dumb_map_offset    = meson_drm_gem_dumb_map_offset,
 	.dumb_destroy       = drm_gem_dumb_destroy,

drivers/gpu/drm/meson/meson_gem.c

@@ -386,6 +386,28 @@ int meson_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma)
 	return meson_drm_gem_scattered_mmap_obj(meson_gem_obj, vma);
 }
 
+int meson_drm_gem_prime_mmap(struct drm_gem_object *obj,
+			     struct vm_area_struct *vma)
+{
+	struct meson_drm_gem_object *meson_gem_obj;
+	struct drm_device *dev = obj->dev;
+	int ret;
+
+	mutex_lock(&dev->struct_mutex);
+	ret = drm_gem_mmap_obj(obj, obj->size, vma);
+	mutex_unlock(&dev->struct_mutex);
+	if (ret < 0)
+		return ret;
+
+	meson_gem_obj = to_meson_drm_gem_obj(obj);
+	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+
+	if (!meson_gem_obj->is_scattered)
+		return meson_drm_gem_cma_mmap_obj(meson_gem_obj, vma);
+
+	return meson_drm_gem_scattered_mmap_obj(meson_gem_obj, vma);
+}
+
 int meson_drm_gem_dumb_create(struct drm_file *file_priv,
 			      struct drm_device *dev,
 			      struct drm_mode_create_dumb *args)

drivers/gpu/drm/meson/meson_gem.h

@@ -57,6 +57,8 @@ void meson_drm_gem_free_object(struct drm_gem_object *gem_obj);
 int meson_drm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
 struct sg_table *meson_drm_gem_get_sg_table(struct drm_gem_object *obj);
 int meson_drm_gem_mmap(struct file *filp, struct vm_area_struct *vma);
+int meson_drm_gem_prime_mmap(struct drm_gem_object *obj,
+			     struct vm_area_struct *vma);
 struct meson_drm_gem_object *meson_drm_gem_create_obj(struct drm_device *dev,
 		unsigned int size);
 int meson_drm_gem_dumb_create(struct drm_file *file_priv,