diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-10-05 13:21:43 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-10-05 15:29:08 +0200 |
| commit | 56a76c0123d6cb034975901c80fce2627338ef9e (patch) | |
| tree | bfffd4b02977d612a3d35e73f79ce195de5ffe0c /include/drm | |
| parent | bf3b123e3d946dc110020814106ad84a36898d3a (diff) | |
| download | op-kernel-dev-56a76c0123d6cb034975901c80fce2627338ef9e.zip op-kernel-dev-56a76c0123d6cb034975901c80fce2627338ef9e.tar.gz | |
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: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Chris 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: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20161005122145.1507-1-chris@chris-wilson.co.uk
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0e99669..81fcd55 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -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); |
