Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56a76c01 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

drm/prime: Pass the right module owner through to dma_buf_export() 



dma_buf_export() adds a reference to the owning module to the dmabuf (to
prevent the driver from being unloaded whilst a third party still refers
to the dmabuf). However, drm_gem_prime_export() was passing its own
THIS_MODULE (i.e. drm.ko) rather than the driver. Extract the right
owner from the device->fops instead.

v2: Use C99 initializers to zero out unset elements of
dma_buf_export_info
v3: Extract the right module from dev->fops.

Testcase: igt/vgem_basic/unload
Reported-by: default avatarPetri Latvala <petri.latvala@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
Tested-by: default avatarPetri Latvala <petri.latvala@intel.com>
Reviewed-by: default avatarPetri Latvala <petri.latvala@intel.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161005122145.1507-1-chris@chris-wilson.co.uk
parent bf3b123e

drivers/gpu/drm/drm_prime.c

+10 −7
Original line number Diff line number Diff line
@@ -397,14 +397,17 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { 
 * using the PRIME helpers.

 */

struct dma_buf *drm_gem_prime_export(struct drm_device *dev,

				     struct drm_gem_object *obj, int flags)

				     struct drm_gem_object *obj,

				     int flags)

{

	DEFINE_DMA_BUF_EXPORT_INFO(exp_info);



	exp_info.ops = &drm_gem_prime_dmabuf_ops;

	exp_info.size = obj->size;

	exp_info.flags = flags;

	exp_info.priv = obj;

	struct dma_buf_export_info exp_info = {

		.exp_name = KBUILD_MODNAME, /* white lie for debug */

		.owner = dev->driver->fops->owner,

		.ops = &drm_gem_prime_dmabuf_ops,

		.size = obj->size,

		.flags = flags,

		.priv = obj,

	};



	if (dev->driver->gem_prime_res_obj)

		exp_info.resv = dev->driver->gem_prime_res_obj(obj);

include/drm/drmP.h

+2 −1
Original line number Diff line number Diff line
@@ -1012,7 +1012,8 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, 
#endif



extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev,

		struct drm_gem_object *obj, int flags);

					    struct drm_gem_object *obj,

					    int flags);

extern int drm_gem_prime_handle_to_fd(struct drm_device *dev,

		struct drm_file *file_priv, uint32_t handle, uint32_t flags,

		int *prime_fd);