forked from mirrors/linux
		
	drm/amdgpu: rename amdgpu_prime.[ch] into amdgpu_dma_buf.[ch]
We are getting a dma-buf implementation completely separate from drm prime, so rename the files now and cleanup the code a bit. No functional change. 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>
This commit is contained in:
		
							parent
							
								
									9b6eb00dbd
								
							
						
					
					
						commit
						2fbd6f94ac
					
				
					 7 changed files with 282 additions and 249 deletions
				
			
		| 
						 | 
					@ -49,7 +49,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \
 | 
				
			||||||
	amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o amdgpu_test.o \
 | 
						amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o amdgpu_test.o \
 | 
				
			||||||
	amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \
 | 
						amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \
 | 
				
			||||||
	atombios_encoders.o amdgpu_sa.o atombios_i2c.o \
 | 
						atombios_encoders.o amdgpu_sa.o atombios_i2c.o \
 | 
				
			||||||
	amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \
 | 
						amdgpu_dma_buf.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \
 | 
				
			||||||
	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
 | 
						amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \
 | 
				
			||||||
	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
 | 
						amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
 | 
				
			||||||
	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
 | 
						amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,6 +25,7 @@
 | 
				
			||||||
#include <drm/drmP.h>
 | 
					#include <drm/drmP.h>
 | 
				
			||||||
#include "amdgpu.h"
 | 
					#include "amdgpu.h"
 | 
				
			||||||
#include "amdgpu_gfx.h"
 | 
					#include "amdgpu_gfx.h"
 | 
				
			||||||
 | 
					#include "amdgpu_dma_buf.h"
 | 
				
			||||||
#include <linux/module.h>
 | 
					#include <linux/module.h>
 | 
				
			||||||
#include <linux/dma-buf.h>
 | 
					#include <linux/dma-buf.h>
 | 
				
			||||||
#include "amdgpu_xgmi.h"
 | 
					#include "amdgpu_xgmi.h"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -30,6 +30,7 @@
 | 
				
			||||||
#include "amdgpu_object.h"
 | 
					#include "amdgpu_object.h"
 | 
				
			||||||
#include "amdgpu_vm.h"
 | 
					#include "amdgpu_vm.h"
 | 
				
			||||||
#include "amdgpu_amdkfd.h"
 | 
					#include "amdgpu_amdkfd.h"
 | 
				
			||||||
 | 
					#include "amdgpu_dma_buf.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Special VM and GART address alignment needed for VI pre-Fiji due to
 | 
					/* Special VM and GART address alignment needed for VI pre-Fiji due to
 | 
				
			||||||
 * a HW bug.
 | 
					 * a HW bug.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * Copyright 2012 Advanced Micro Devices, Inc.
 | 
					 * Copyright 2019 Advanced Micro Devices, Inc.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Permission is hereby granted, free of charge, to any person obtaining a
 | 
					 * Permission is hereby granted, free of charge, to any person obtaining a
 | 
				
			||||||
 * copy of this software and associated documentation files (the "Software"),
 | 
					 * copy of this software and associated documentation files (the "Software"),
 | 
				
			||||||
| 
						 | 
					@ -103,7 +103,8 @@ void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr)
 | 
				
			||||||
 * Returns:
 | 
					 * Returns:
 | 
				
			||||||
 * 0 on success or a negative error code on failure.
 | 
					 * 0 on success or a negative error code on failure.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
int amdgpu_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma)
 | 
					int amdgpu_gem_prime_mmap(struct drm_gem_object *obj,
 | 
				
			||||||
 | 
								  struct vm_area_struct *vma)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
						struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
				
			||||||
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
						struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
				
			||||||
| 
						 | 
					@ -137,6 +138,235 @@ int amdgpu_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma
 | 
				
			||||||
	return ret;
 | 
						return ret;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static int
 | 
				
			||||||
 | 
					__reservation_object_make_exclusive(struct reservation_object *obj)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct dma_fence **fences;
 | 
				
			||||||
 | 
						unsigned int count;
 | 
				
			||||||
 | 
						int r;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (!reservation_object_get_list(obj)) /* no shared fences to convert */
 | 
				
			||||||
 | 
							return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						r = reservation_object_get_fences_rcu(obj, NULL, &count, &fences);
 | 
				
			||||||
 | 
						if (r)
 | 
				
			||||||
 | 
							return r;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (count == 0) {
 | 
				
			||||||
 | 
							/* Now that was unexpected. */
 | 
				
			||||||
 | 
						} else if (count == 1) {
 | 
				
			||||||
 | 
							reservation_object_add_excl_fence(obj, fences[0]);
 | 
				
			||||||
 | 
							dma_fence_put(fences[0]);
 | 
				
			||||||
 | 
							kfree(fences);
 | 
				
			||||||
 | 
						} else {
 | 
				
			||||||
 | 
							struct dma_fence_array *array;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							array = dma_fence_array_create(count, fences,
 | 
				
			||||||
 | 
										       dma_fence_context_alloc(1), 0,
 | 
				
			||||||
 | 
										       false);
 | 
				
			||||||
 | 
							if (!array)
 | 
				
			||||||
 | 
								goto err_fences_put;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							reservation_object_add_excl_fence(obj, &array->base);
 | 
				
			||||||
 | 
							dma_fence_put(&array->base);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					err_fences_put:
 | 
				
			||||||
 | 
						while (count--)
 | 
				
			||||||
 | 
							dma_fence_put(fences[count]);
 | 
				
			||||||
 | 
						kfree(fences);
 | 
				
			||||||
 | 
						return -ENOMEM;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * amdgpu_dma_buf_map_attach - &dma_buf_ops.attach implementation
 | 
				
			||||||
 | 
					 * @dma_buf: Shared DMA buffer
 | 
				
			||||||
 | 
					 * @attach: DMA-buf attachment
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Makes sure that the shared DMA buffer can be accessed by the target device.
 | 
				
			||||||
 | 
					 * For now, simply pins it to the GTT domain, where it should be accessible by
 | 
				
			||||||
 | 
					 * all DMA devices.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Returns:
 | 
				
			||||||
 | 
					 * 0 on success or a negative error code on failure.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					static int amdgpu_dma_buf_map_attach(struct dma_buf *dma_buf,
 | 
				
			||||||
 | 
									     struct dma_buf_attachment *attach)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct drm_gem_object *obj = dma_buf->priv;
 | 
				
			||||||
 | 
						struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
				
			||||||
 | 
						struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
				
			||||||
 | 
						long r;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						r = drm_gem_map_attach(dma_buf, attach);
 | 
				
			||||||
 | 
						if (r)
 | 
				
			||||||
 | 
							return r;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						r = amdgpu_bo_reserve(bo, false);
 | 
				
			||||||
 | 
						if (unlikely(r != 0))
 | 
				
			||||||
 | 
							goto error_detach;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (attach->dev->driver != adev->dev->driver) {
 | 
				
			||||||
 | 
							/*
 | 
				
			||||||
 | 
							 * We only create shared fences for internal use, but importers
 | 
				
			||||||
 | 
							 * of the dmabuf rely on exclusive fences for implicitly
 | 
				
			||||||
 | 
							 * tracking write hazards. As any of the current fences may
 | 
				
			||||||
 | 
							 * correspond to a write, we need to convert all existing
 | 
				
			||||||
 | 
							 * fences on the reservation object into a single exclusive
 | 
				
			||||||
 | 
							 * fence.
 | 
				
			||||||
 | 
							 */
 | 
				
			||||||
 | 
							r = __reservation_object_make_exclusive(bo->tbo.resv);
 | 
				
			||||||
 | 
							if (r)
 | 
				
			||||||
 | 
								goto error_unreserve;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/* pin buffer into GTT */
 | 
				
			||||||
 | 
						r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);
 | 
				
			||||||
 | 
						if (r)
 | 
				
			||||||
 | 
							goto error_unreserve;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (attach->dev->driver != adev->dev->driver)
 | 
				
			||||||
 | 
							bo->prime_shared_count++;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					error_unreserve:
 | 
				
			||||||
 | 
						amdgpu_bo_unreserve(bo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					error_detach:
 | 
				
			||||||
 | 
						if (r)
 | 
				
			||||||
 | 
							drm_gem_map_detach(dma_buf, attach);
 | 
				
			||||||
 | 
						return r;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * amdgpu_dma_buf_map_detach - &dma_buf_ops.detach implementation
 | 
				
			||||||
 | 
					 * @dma_buf: Shared DMA buffer
 | 
				
			||||||
 | 
					 * @attach: DMA-buf attachment
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * This is called when a shared DMA buffer no longer needs to be accessible by
 | 
				
			||||||
 | 
					 * another device. For now, simply unpins the buffer from GTT.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					static void amdgpu_dma_buf_map_detach(struct dma_buf *dma_buf,
 | 
				
			||||||
 | 
									      struct dma_buf_attachment *attach)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct drm_gem_object *obj = dma_buf->priv;
 | 
				
			||||||
 | 
						struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
				
			||||||
 | 
						struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
				
			||||||
 | 
						int ret = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ret = amdgpu_bo_reserve(bo, true);
 | 
				
			||||||
 | 
						if (unlikely(ret != 0))
 | 
				
			||||||
 | 
							goto error;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						amdgpu_bo_unpin(bo);
 | 
				
			||||||
 | 
						if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count)
 | 
				
			||||||
 | 
							bo->prime_shared_count--;
 | 
				
			||||||
 | 
						amdgpu_bo_unreserve(bo);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					error:
 | 
				
			||||||
 | 
						drm_gem_map_detach(dma_buf, attach);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * amdgpu_gem_prime_res_obj - &drm_driver.gem_prime_res_obj implementation
 | 
				
			||||||
 | 
					 * @obj: GEM BO
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Returns:
 | 
				
			||||||
 | 
					 * The BO's reservation object.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *obj)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return bo->tbo.resv;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * amdgpu_dma_buf_begin_cpu_access - &dma_buf_ops.begin_cpu_access implementation
 | 
				
			||||||
 | 
					 * @dma_buf: Shared DMA buffer
 | 
				
			||||||
 | 
					 * @direction: Direction of DMA transfer
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * This is called before CPU access to the shared DMA buffer's memory. If it's
 | 
				
			||||||
 | 
					 * a read access, the buffer is moved to the GTT domain if possible, for optimal
 | 
				
			||||||
 | 
					 * CPU read performance.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Returns:
 | 
				
			||||||
 | 
					 * 0 on success or a negative error code on failure.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					static int amdgpu_dma_buf_begin_cpu_access(struct dma_buf *dma_buf,
 | 
				
			||||||
 | 
										   enum dma_data_direction direction)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv);
 | 
				
			||||||
 | 
						struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
				
			||||||
 | 
						struct ttm_operation_ctx ctx = { true, false };
 | 
				
			||||||
 | 
						u32 domain = amdgpu_display_supported_domains(adev);
 | 
				
			||||||
 | 
						int ret;
 | 
				
			||||||
 | 
						bool reads = (direction == DMA_BIDIRECTIONAL ||
 | 
				
			||||||
 | 
							      direction == DMA_FROM_DEVICE);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (!reads || !(domain & AMDGPU_GEM_DOMAIN_GTT))
 | 
				
			||||||
 | 
							return 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						/* move to gtt */
 | 
				
			||||||
 | 
						ret = amdgpu_bo_reserve(bo, false);
 | 
				
			||||||
 | 
						if (unlikely(ret != 0))
 | 
				
			||||||
 | 
							return ret;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (!bo->pin_count && (bo->allowed_domains & AMDGPU_GEM_DOMAIN_GTT)) {
 | 
				
			||||||
 | 
							amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
 | 
				
			||||||
 | 
							ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						amdgpu_bo_unreserve(bo);
 | 
				
			||||||
 | 
						return ret;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					const struct dma_buf_ops amdgpu_dmabuf_ops = {
 | 
				
			||||||
 | 
						.attach = amdgpu_dma_buf_map_attach,
 | 
				
			||||||
 | 
						.detach = amdgpu_dma_buf_map_detach,
 | 
				
			||||||
 | 
						.map_dma_buf = drm_gem_map_dma_buf,
 | 
				
			||||||
 | 
						.unmap_dma_buf = drm_gem_unmap_dma_buf,
 | 
				
			||||||
 | 
						.release = drm_gem_dmabuf_release,
 | 
				
			||||||
 | 
						.begin_cpu_access = amdgpu_dma_buf_begin_cpu_access,
 | 
				
			||||||
 | 
						.mmap = drm_gem_dmabuf_mmap,
 | 
				
			||||||
 | 
						.vmap = drm_gem_dmabuf_vmap,
 | 
				
			||||||
 | 
						.vunmap = drm_gem_dmabuf_vunmap,
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * amdgpu_gem_prime_export - &drm_driver.gem_prime_export implementation
 | 
				
			||||||
 | 
					 * @dev: DRM device
 | 
				
			||||||
 | 
					 * @gobj: GEM BO
 | 
				
			||||||
 | 
					 * @flags: Flags such as DRM_CLOEXEC and DRM_RDWR.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * The main work is done by the &drm_gem_prime_export helper, which in turn
 | 
				
			||||||
 | 
					 * uses &amdgpu_gem_prime_res_obj.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Returns:
 | 
				
			||||||
 | 
					 * Shared DMA buffer representing the GEM BO from the given device.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
 | 
				
			||||||
 | 
										struct drm_gem_object *gobj,
 | 
				
			||||||
 | 
										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);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						buf = drm_gem_prime_export(dev, gobj, flags);
 | 
				
			||||||
 | 
						if (!IS_ERR(buf)) {
 | 
				
			||||||
 | 
							buf->file->f_mapping = dev->anon_inode->i_mapping;
 | 
				
			||||||
 | 
							buf->ops = &amdgpu_dmabuf_ops;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						return buf;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * amdgpu_gem_prime_import_sg_table - &drm_driver.gem_prime_import_sg_table
 | 
					 * amdgpu_gem_prime_import_sg_table - &drm_driver.gem_prime_import_sg_table
 | 
				
			||||||
 * implementation
 | 
					 * implementation
 | 
				
			||||||
| 
						 | 
					@ -188,235 +418,6 @@ amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
 | 
				
			||||||
	return ERR_PTR(ret);
 | 
						return ERR_PTR(ret);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static int
 | 
					 | 
				
			||||||
__reservation_object_make_exclusive(struct reservation_object *obj)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct dma_fence **fences;
 | 
					 | 
				
			||||||
	unsigned int count;
 | 
					 | 
				
			||||||
	int r;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (!reservation_object_get_list(obj)) /* no shared fences to convert */
 | 
					 | 
				
			||||||
		return 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	r = reservation_object_get_fences_rcu(obj, NULL, &count, &fences);
 | 
					 | 
				
			||||||
	if (r)
 | 
					 | 
				
			||||||
		return r;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (count == 0) {
 | 
					 | 
				
			||||||
		/* Now that was unexpected. */
 | 
					 | 
				
			||||||
	} else if (count == 1) {
 | 
					 | 
				
			||||||
		reservation_object_add_excl_fence(obj, fences[0]);
 | 
					 | 
				
			||||||
		dma_fence_put(fences[0]);
 | 
					 | 
				
			||||||
		kfree(fences);
 | 
					 | 
				
			||||||
	} else {
 | 
					 | 
				
			||||||
		struct dma_fence_array *array;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		array = dma_fence_array_create(count, fences,
 | 
					 | 
				
			||||||
					       dma_fence_context_alloc(1), 0,
 | 
					 | 
				
			||||||
					       false);
 | 
					 | 
				
			||||||
		if (!array)
 | 
					 | 
				
			||||||
			goto err_fences_put;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
		reservation_object_add_excl_fence(obj, &array->base);
 | 
					 | 
				
			||||||
		dma_fence_put(&array->base);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
err_fences_put:
 | 
					 | 
				
			||||||
	while (count--)
 | 
					 | 
				
			||||||
		dma_fence_put(fences[count]);
 | 
					 | 
				
			||||||
	kfree(fences);
 | 
					 | 
				
			||||||
	return -ENOMEM;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * amdgpu_gem_map_attach - &dma_buf_ops.attach implementation
 | 
					 | 
				
			||||||
 * @dma_buf: Shared DMA buffer
 | 
					 | 
				
			||||||
 * @attach: DMA-buf attachment
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * Makes sure that the shared DMA buffer can be accessed by the target device.
 | 
					 | 
				
			||||||
 * For now, simply pins it to the GTT domain, where it should be accessible by
 | 
					 | 
				
			||||||
 * all DMA devices.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * Returns:
 | 
					 | 
				
			||||||
 * 0 on success or a negative error code on failure.
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
static int amdgpu_gem_map_attach(struct dma_buf *dma_buf,
 | 
					 | 
				
			||||||
				 struct dma_buf_attachment *attach)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct drm_gem_object *obj = dma_buf->priv;
 | 
					 | 
				
			||||||
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
					 | 
				
			||||||
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
					 | 
				
			||||||
	long r;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	r = drm_gem_map_attach(dma_buf, attach);
 | 
					 | 
				
			||||||
	if (r)
 | 
					 | 
				
			||||||
		return r;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	r = amdgpu_bo_reserve(bo, false);
 | 
					 | 
				
			||||||
	if (unlikely(r != 0))
 | 
					 | 
				
			||||||
		goto error_detach;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (attach->dev->driver != adev->dev->driver) {
 | 
					 | 
				
			||||||
		/*
 | 
					 | 
				
			||||||
		 * We only create shared fences for internal use, but importers
 | 
					 | 
				
			||||||
		 * of the dmabuf rely on exclusive fences for implicitly
 | 
					 | 
				
			||||||
		 * tracking write hazards. As any of the current fences may
 | 
					 | 
				
			||||||
		 * correspond to a write, we need to convert all existing
 | 
					 | 
				
			||||||
		 * fences on the reservation object into a single exclusive
 | 
					 | 
				
			||||||
		 * fence.
 | 
					 | 
				
			||||||
		 */
 | 
					 | 
				
			||||||
		r = __reservation_object_make_exclusive(bo->tbo.resv);
 | 
					 | 
				
			||||||
		if (r)
 | 
					 | 
				
			||||||
			goto error_unreserve;
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* pin buffer into GTT */
 | 
					 | 
				
			||||||
	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);
 | 
					 | 
				
			||||||
	if (r)
 | 
					 | 
				
			||||||
		goto error_unreserve;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (attach->dev->driver != adev->dev->driver)
 | 
					 | 
				
			||||||
		bo->prime_shared_count++;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
error_unreserve:
 | 
					 | 
				
			||||||
	amdgpu_bo_unreserve(bo);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
error_detach:
 | 
					 | 
				
			||||||
	if (r)
 | 
					 | 
				
			||||||
		drm_gem_map_detach(dma_buf, attach);
 | 
					 | 
				
			||||||
	return r;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * amdgpu_gem_map_detach - &dma_buf_ops.detach implementation
 | 
					 | 
				
			||||||
 * @dma_buf: Shared DMA buffer
 | 
					 | 
				
			||||||
 * @attach: DMA-buf attachment
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * This is called when a shared DMA buffer no longer needs to be accessible by
 | 
					 | 
				
			||||||
 * another device. For now, simply unpins the buffer from GTT.
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
static void amdgpu_gem_map_detach(struct dma_buf *dma_buf,
 | 
					 | 
				
			||||||
				  struct dma_buf_attachment *attach)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct drm_gem_object *obj = dma_buf->priv;
 | 
					 | 
				
			||||||
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
					 | 
				
			||||||
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
					 | 
				
			||||||
	int ret = 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	ret = amdgpu_bo_reserve(bo, true);
 | 
					 | 
				
			||||||
	if (unlikely(ret != 0))
 | 
					 | 
				
			||||||
		goto error;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	amdgpu_bo_unpin(bo);
 | 
					 | 
				
			||||||
	if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count)
 | 
					 | 
				
			||||||
		bo->prime_shared_count--;
 | 
					 | 
				
			||||||
	amdgpu_bo_unreserve(bo);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
error:
 | 
					 | 
				
			||||||
	drm_gem_map_detach(dma_buf, attach);
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * amdgpu_gem_prime_res_obj - &drm_driver.gem_prime_res_obj implementation
 | 
					 | 
				
			||||||
 * @obj: GEM BO
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * Returns:
 | 
					 | 
				
			||||||
 * The BO's reservation object.
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *obj)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return bo->tbo.resv;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * amdgpu_gem_begin_cpu_access - &dma_buf_ops.begin_cpu_access implementation
 | 
					 | 
				
			||||||
 * @dma_buf: Shared DMA buffer
 | 
					 | 
				
			||||||
 * @direction: Direction of DMA transfer
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * This is called before CPU access to the shared DMA buffer's memory. If it's
 | 
					 | 
				
			||||||
 * a read access, the buffer is moved to the GTT domain if possible, for optimal
 | 
					 | 
				
			||||||
 * CPU read performance.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * Returns:
 | 
					 | 
				
			||||||
 * 0 on success or a negative error code on failure.
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
static int amdgpu_gem_begin_cpu_access(struct dma_buf *dma_buf,
 | 
					 | 
				
			||||||
				       enum dma_data_direction direction)
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
	struct amdgpu_bo *bo = gem_to_amdgpu_bo(dma_buf->priv);
 | 
					 | 
				
			||||||
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);
 | 
					 | 
				
			||||||
	struct ttm_operation_ctx ctx = { true, false };
 | 
					 | 
				
			||||||
	u32 domain = amdgpu_display_supported_domains(adev);
 | 
					 | 
				
			||||||
	int ret;
 | 
					 | 
				
			||||||
	bool reads = (direction == DMA_BIDIRECTIONAL ||
 | 
					 | 
				
			||||||
		      direction == DMA_FROM_DEVICE);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (!reads || !(domain & AMDGPU_GEM_DOMAIN_GTT))
 | 
					 | 
				
			||||||
		return 0;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	/* move to gtt */
 | 
					 | 
				
			||||||
	ret = amdgpu_bo_reserve(bo, false);
 | 
					 | 
				
			||||||
	if (unlikely(ret != 0))
 | 
					 | 
				
			||||||
		return ret;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	if (!bo->pin_count && (bo->allowed_domains & AMDGPU_GEM_DOMAIN_GTT)) {
 | 
					 | 
				
			||||||
		amdgpu_bo_placement_from_domain(bo, AMDGPU_GEM_DOMAIN_GTT);
 | 
					 | 
				
			||||||
		ret = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	amdgpu_bo_unreserve(bo);
 | 
					 | 
				
			||||||
	return ret;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
const struct dma_buf_ops amdgpu_dmabuf_ops = {
 | 
					 | 
				
			||||||
	.attach = amdgpu_gem_map_attach,
 | 
					 | 
				
			||||||
	.detach = amdgpu_gem_map_detach,
 | 
					 | 
				
			||||||
	.map_dma_buf = drm_gem_map_dma_buf,
 | 
					 | 
				
			||||||
	.unmap_dma_buf = drm_gem_unmap_dma_buf,
 | 
					 | 
				
			||||||
	.release = drm_gem_dmabuf_release,
 | 
					 | 
				
			||||||
	.begin_cpu_access = amdgpu_gem_begin_cpu_access,
 | 
					 | 
				
			||||||
	.mmap = drm_gem_dmabuf_mmap,
 | 
					 | 
				
			||||||
	.vmap = drm_gem_dmabuf_vmap,
 | 
					 | 
				
			||||||
	.vunmap = drm_gem_dmabuf_vunmap,
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					 | 
				
			||||||
 * amdgpu_gem_prime_export - &drm_driver.gem_prime_export implementation
 | 
					 | 
				
			||||||
 * @dev: DRM device
 | 
					 | 
				
			||||||
 * @gobj: GEM BO
 | 
					 | 
				
			||||||
 * @flags: Flags such as DRM_CLOEXEC and DRM_RDWR.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * The main work is done by the &drm_gem_prime_export helper, which in turn
 | 
					 | 
				
			||||||
 * uses &amdgpu_gem_prime_res_obj.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 * Returns:
 | 
					 | 
				
			||||||
 * Shared DMA buffer representing the GEM BO from the given device.
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
 | 
					 | 
				
			||||||
					struct drm_gem_object *gobj,
 | 
					 | 
				
			||||||
					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);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	buf = drm_gem_prime_export(dev, gobj, flags);
 | 
					 | 
				
			||||||
	if (!IS_ERR(buf)) {
 | 
					 | 
				
			||||||
		buf->file->f_mapping = dev->anon_inode->i_mapping;
 | 
					 | 
				
			||||||
		buf->ops = &amdgpu_dmabuf_ops;
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	return buf;
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * amdgpu_gem_prime_import - &drm_driver.gem_prime_import implementation
 | 
					 * amdgpu_gem_prime_import - &drm_driver.gem_prime_import implementation
 | 
				
			||||||
 * @dev: DRM device
 | 
					 * @dev: DRM device
 | 
				
			||||||
							
								
								
									
										46
									
								
								drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,46 @@
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Copyright 2019 Advanced Micro Devices, Inc.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Permission is hereby granted, free of charge, to any person obtaining a
 | 
				
			||||||
 | 
					 * copy of this software and associated documentation files (the "Software"),
 | 
				
			||||||
 | 
					 * to deal in the Software without restriction, including without limitation
 | 
				
			||||||
 | 
					 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 | 
				
			||||||
 | 
					 * and/or sell copies of the Software, and to permit persons to whom the
 | 
				
			||||||
 | 
					 * Software is furnished to do so, subject to the following conditions:
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * The above copyright notice and this permission notice shall be included in
 | 
				
			||||||
 | 
					 * all copies or substantial portions of the Software.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | 
				
			||||||
 | 
					 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | 
				
			||||||
 | 
					 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 | 
				
			||||||
 | 
					 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
 | 
				
			||||||
 | 
					 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
 | 
				
			||||||
 | 
					 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 | 
				
			||||||
 | 
					 * OTHER DEALINGS IN THE SOFTWARE.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					#ifndef __AMDGPU_DMA_BUF_H__
 | 
				
			||||||
 | 
					#define __AMDGPU_DMA_BUF_H__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <drm/drm_gem.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
 | 
				
			||||||
 | 
					struct drm_gem_object *
 | 
				
			||||||
 | 
					amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
 | 
				
			||||||
 | 
									 struct dma_buf_attachment *attach,
 | 
				
			||||||
 | 
									 struct sg_table *sg);
 | 
				
			||||||
 | 
					struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
 | 
				
			||||||
 | 
										struct drm_gem_object *gobj,
 | 
				
			||||||
 | 
										int flags);
 | 
				
			||||||
 | 
					struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,
 | 
				
			||||||
 | 
										    struct dma_buf *dma_buf);
 | 
				
			||||||
 | 
					struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *);
 | 
				
			||||||
 | 
					void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj);
 | 
				
			||||||
 | 
					void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
 | 
				
			||||||
 | 
					int amdgpu_gem_prime_mmap(struct drm_gem_object *obj,
 | 
				
			||||||
 | 
								  struct vm_area_struct *vma);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					extern const struct dma_buf_ops amdgpu_dmabuf_ops;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					@ -36,7 +36,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "amdgpu.h"
 | 
					#include "amdgpu.h"
 | 
				
			||||||
#include "amdgpu_irq.h"
 | 
					#include "amdgpu_irq.h"
 | 
				
			||||||
#include "amdgpu_gem.h"
 | 
					#include "amdgpu_dma_buf.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "amdgpu_amdkfd.h"
 | 
					#include "amdgpu_amdkfd.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -39,22 +39,6 @@ int amdgpu_gem_object_open(struct drm_gem_object *obj,
 | 
				
			||||||
void amdgpu_gem_object_close(struct drm_gem_object *obj,
 | 
					void amdgpu_gem_object_close(struct drm_gem_object *obj,
 | 
				
			||||||
				struct drm_file *file_priv);
 | 
									struct drm_file *file_priv);
 | 
				
			||||||
unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);
 | 
					unsigned long amdgpu_gem_timeout(uint64_t timeout_ns);
 | 
				
			||||||
struct sg_table *amdgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
 | 
					 | 
				
			||||||
struct drm_gem_object *
 | 
					 | 
				
			||||||
amdgpu_gem_prime_import_sg_table(struct drm_device *dev,
 | 
					 | 
				
			||||||
				 struct dma_buf_attachment *attach,
 | 
					 | 
				
			||||||
				 struct sg_table *sg);
 | 
					 | 
				
			||||||
struct dma_buf *amdgpu_gem_prime_export(struct drm_device *dev,
 | 
					 | 
				
			||||||
					struct drm_gem_object *gobj,
 | 
					 | 
				
			||||||
					int flags);
 | 
					 | 
				
			||||||
struct drm_gem_object *amdgpu_gem_prime_import(struct drm_device *dev,
 | 
					 | 
				
			||||||
					    struct dma_buf *dma_buf);
 | 
					 | 
				
			||||||
struct reservation_object *amdgpu_gem_prime_res_obj(struct drm_gem_object *);
 | 
					 | 
				
			||||||
void *amdgpu_gem_prime_vmap(struct drm_gem_object *obj);
 | 
					 | 
				
			||||||
void amdgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
 | 
					 | 
				
			||||||
int amdgpu_gem_prime_mmap(struct drm_gem_object *obj, struct vm_area_struct *vma);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
extern const struct dma_buf_ops amdgpu_dmabuf_ops;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 * GEM objects.
 | 
					 * GEM objects.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue