diff options
| author | Christian König <christian.koenig@amd.com> | 2017-11-13 19:20:50 +0300 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-11-14 19:35:43 +0300 | 
| commit | 4b277247b1df177a7a60f0601ebe3dc952e5dd54 (patch) | |
| tree | 9c9ce67937b0c0cc01bcce778d54c4a200673984 /drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | |
| parent | c5066129af4436ab0da8eefe4289774a5409706d (diff) | |
| download | linux-4b277247b1df177a7a60f0601ebe3dc952e5dd54.tar.xz | |
drm/amdgpu: set f_mapping on exported DMA-bufs
Otherwise we can't correctly CPU map TTM buffers.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 6 | 
1 files changed, 5 insertions, 1 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c index 90af8e82b16a..ae9c106979d7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c @@ -169,10 +169,14 @@ struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,  					int flags)  {  	struct amdgpu_bo *bo = gem_to_amdgpu_bo(gobj); +	struct dma_buf *buf;  	if (amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) ||  	    bo->flags & AMDGPU_GEM_CREATE_VM_ALWAYS_VALID)  		return ERR_PTR(-EPERM); -	return drm_gem_prime_export(dev, gobj, flags); +	buf = drm_gem_prime_export(dev, gobj, flags); +	if (!IS_ERR(buf)) +		buf->file->f_mapping = dev->anon_inode->i_mapping; +	return buf;  } | 
