drm/shmem: switch shmem helper to &drm_gem_object_funcs.mmap (0be89589) · Commits · 戴 / test

drivers/gpu/drm/drm_gem_shmem_helper.c

+10 −18

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ static const struct drm_gem_object_funcs drm_gem_shmem_funcs = {
		.get_sg_table = drm_gem_shmem_get_sg_table,
		.vmap = drm_gem_shmem_vmap,
		.vunmap = drm_gem_shmem_vunmap,
		.vm_ops = &drm_gem_shmem_vm_ops,
		.mmap = drm_gem_shmem_mmap,
		};

		/**
		@@ -505,39 +505,30 @@ static void drm_gem_shmem_vm_close(struct vm_area_struct *vma)
		drm_gem_vm_close(vma);
		}

		const struct vm_operations_struct drm_gem_shmem_vm_ops = {
		static const struct vm_operations_struct drm_gem_shmem_vm_ops = {
		.fault = drm_gem_shmem_fault,
		.open = drm_gem_shmem_vm_open,
		.close = drm_gem_shmem_vm_close,
		};
		EXPORT_SYMBOL_GPL(drm_gem_shmem_vm_ops);

		/**
		* drm_gem_shmem_mmap - Memory-map a shmem GEM object
		* @filp: File object
		* @obj: gem object
		* @vma: VMA for the area to be mapped
		*
		* This function implements an augmented version of the GEM DRM file mmap
		* operation for shmem objects. Drivers which employ the shmem helpers should
		* use this function as their &file_operations.mmap handler in the DRM device file's
		* file_operations structure.
		*
		* Instead of directly referencing this function, drivers should use the
		* DEFINE_DRM_GEM_SHMEM_FOPS() macro.
		* use this function as their &drm_gem_object_funcs.mmap handler.
		*
		* Returns:
		* 0 on success or a negative error code on failure.
		*/
		int drm_gem_shmem_mmap(struct file filp, struct vm_area_struct vma)
		int drm_gem_shmem_mmap(struct drm_gem_object obj, struct vm_area_struct vma)
		{
		struct drm_gem_shmem_object *shmem;
		int ret;

		ret = drm_gem_mmap(filp, vma);
		if (ret)
		return ret;

		shmem = to_drm_gem_shmem_obj(vma->vm_private_data);
		shmem = to_drm_gem_shmem_obj(obj);

		ret = drm_gem_shmem_get_pages(shmem);
		if (ret) {
		@@ -545,9 +536,10 @@ int drm_gem_shmem_mmap(struct file filp, struct vm_area_struct vma)
		return ret;
		}

		/* VM_PFNMAP was set by drm_gem_mmap() */
		vma->vm_flags &= ~VM_PFNMAP;
		vma->vm_flags \|= VM_MIXEDMAP;
		vma->vm_flags \|= VM_IO \| VM_MIXEDMAP \| VM_DONTEXPAND \| VM_DONTDUMP;
		vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
		vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
		vma->vm_ops = &drm_gem_shmem_vm_ops;

		/* Remove the fake offset */
		vma->vm_pgoff -= drm_vma_node_start(&shmem->base.vma_node);

drivers/gpu/drm/panfrost/panfrost_gem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ static const struct drm_gem_object_funcs panfrost_gem_funcs = {
		.get_sg_table = drm_gem_shmem_get_sg_table,
		.vmap = drm_gem_shmem_vmap,
		.vunmap = drm_gem_shmem_vunmap,
		.vm_ops = &drm_gem_shmem_vm_ops,
		.mmap = drm_gem_shmem_mmap,
		};

		/**

drivers/gpu/drm/v3d/v3d_bo.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ static const struct drm_gem_object_funcs v3d_gem_funcs = {
		.get_sg_table = drm_gem_shmem_get_sg_table,
		.vmap = drm_gem_shmem_vmap,
		.vunmap = drm_gem_shmem_vunmap,
		.vm_ops = &drm_gem_shmem_vm_ops,
		.mmap = drm_gem_shmem_mmap,
		};

		/* gem_create_object function for allocating a BO struct and doing

drivers/gpu/drm/virtio/virtgpu_object.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ static const struct drm_gem_object_funcs virtio_gpu_gem_funcs = {
		.get_sg_table = drm_gem_shmem_get_sg_table,
		.vmap = drm_gem_shmem_vmap,
		.vunmap = drm_gem_shmem_vunmap,
		.vm_ops = &drm_gem_shmem_vm_ops,
		.mmap = &drm_gem_shmem_mmap,
		};

		struct drm_gem_object virtio_gpu_create_object(struct drm_device dev,

include/drm/drm_gem_shmem_helper.h

+2 −4

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@ struct drm_gem_shmem_object {
		.poll = drm_poll,\
		.read = drm_read,\
		.llseek = noop_llseek,\
		.mmap = drm_gem_shmem_mmap, \
		.mmap = drm_gem_mmap, \
		}

		struct drm_gem_shmem_object drm_gem_shmem_create(struct drm_device dev, size_t size);
		@@ -143,9 +143,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
		int drm_gem_shmem_dumb_create(struct drm_file file, struct drm_device dev,
		struct drm_mode_create_dumb *args);

		int drm_gem_shmem_mmap(struct file filp, struct vm_area_struct vma);

		extern const struct vm_operations_struct drm_gem_shmem_vm_ops;
		int drm_gem_shmem_mmap(struct drm_gem_object obj, struct vm_area_struct vma);

		void drm_gem_shmem_print_info(struct drm_printer *p, unsigned int indent,
		const struct drm_gem_object *obj);

Admin message