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

Commit f30b8eaa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-next 

More changes for 4.14.  Highlights:
- command submission overhead improvements
- Huge page support for vega10
- physical mode support for mjpeg for asics that don't support UVD vm
- improve ttm_mem_type_manager_func debug
- misc ttm fixes, cleanups
- misc gpuvm cleanups

* 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux: (26 commits)
  drm/ttm: use reservation_object_trylock in ttm_bo_individualize_resv v2
  drm/amdgpu: fix vega10 graphic hang issue in S3 test
  drm/amdgpu: bump version for support of UVD MJPEG decode
  drm/amdgpu: add MJPEG check for UVD physical mode msg buffer
  drm/ttm: Fix accounting error when fail to get pages for pool
  drm/amd/amdgpu: expose fragment size as module parameter (v2)
  drm/amd/amdgpu: store fragment_size in vm_manager
  drm/amdgpu: rename VM invalidated to moved
  drm/amdgpu: separate bo_va structure
  drm/amdgpu: drop the extra VM huge page flag v2
  drm/amdgpu: remove superflous amdgpu_bo_kmap in the VM
  drm/amdgpu: cleanup static CSA handling
  drm/amdgpu: SHADOW and VRAM_CONTIGUOUS flags shouldn't be used by userspace
  drm/amdgpu: save list length when fence is signaled
  drm/amdgpu: move vram usage tracking into the vram manager v2
  drm/amdgpu: move gtt usage tracking into the gtt manager v2
  drm/amdgpu: move debug print into the MM managers
  drm/amdgpu: fix incorrect use of the lru_lock
  drm/radeon: fix incorrect use of the lru_lock
  drm/ttm: make ttm_mem_type_manager_func debug more useful
  ...
parents 54e0aa64 df9bcb06

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −3
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ extern int amdgpu_bapm; 
extern int amdgpu_deep_color;

extern int amdgpu_vm_size;

extern int amdgpu_vm_block_size;

extern int amdgpu_vm_fragment_size;

extern int amdgpu_vm_fault_stop;

extern int amdgpu_vm_debug;

extern int amdgpu_vm_update_mode;
@@ -748,6 +749,7 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr); 
struct amdgpu_fpriv {

	struct amdgpu_vm	vm;

	struct amdgpu_bo_va	*prt_va;

	struct amdgpu_bo_va	*csa_va;

	struct mutex		bo_list_lock;

	struct idr		bo_list_handles;

	struct amdgpu_ctx_mgr	ctx_mgr;
@@ -1482,9 +1484,6 @@ struct amdgpu_device { 
	struct amdgpu_mman		mman;

	struct amdgpu_vram_scratch	vram_scratch;

	struct amdgpu_wb		wb;

	atomic64_t			vram_usage;

	atomic64_t			vram_vis_usage;

	atomic64_t			gtt_usage;

	atomic64_t			num_bytes_moved;

	atomic64_t			num_evictions;

	atomic64_t			num_vram_cpu_page_faults;

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+13 −16
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
	}



	total_vram = adev->mc.real_vram_size - adev->vram_pin_size;

	used_vram = atomic64_read(&adev->vram_usage);

	used_vram = amdgpu_vram_mgr_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);

	free_vram = used_vram >= total_vram ? 0 : total_vram - used_vram;



	spin_lock(&adev->mm_stats.lock);
@@ -292,7 +292,8 @@ static void amdgpu_cs_get_threshold_for_moves(struct amdgpu_device *adev, 
	/* Do the same for visible VRAM if half of it is free */

	if (adev->mc.visible_vram_size < adev->mc.real_vram_size) {

		u64 total_vis_vram = adev->mc.visible_vram_size;

		u64 used_vis_vram = atomic64_read(&adev->vram_vis_usage);

		u64 used_vis_vram =

			amdgpu_vram_mgr_vis_usage(&adev->mman.bdev.man[TTM_PL_VRAM]);



		if (used_vis_vram < total_vis_vram) {

			u64 free_vis_vram = total_vis_vram - used_vis_vram;
@@ -673,10 +674,8 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	}



error_validate:

	if (r) {

		amdgpu_vm_move_pt_bos_in_lru(p->adev, &fpriv->vm);

	if (r)

		ttm_eu_backoff_reservation(&p->ticket, &p->validated);

	}



error_free_pages:
@@ -724,21 +723,18 @@ static int amdgpu_cs_sync_rings(struct amdgpu_cs_parser *p) 
 * If error is set than unvalidate buffer, otherwise just free memory

 * used by parsing context.

 **/

static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error, bool backoff)

static void amdgpu_cs_parser_fini(struct amdgpu_cs_parser *parser, int error,

				  bool backoff)

{

	struct amdgpu_fpriv *fpriv = parser->filp->driver_priv;

	unsigned i;



	if (!error) {

		amdgpu_vm_move_pt_bos_in_lru(parser->adev, &fpriv->vm);



	if (!error)

		ttm_eu_fence_buffer_objects(&parser->ticket,

					    &parser->validated,

					    parser->fence);

	} else if (backoff) {

	else if (backoff)

		ttm_eu_backoff_reservation(&parser->ticket,

					   &parser->validated);

	}



	for (i = 0; i < parser->num_post_dep_syncobjs; i++)

		drm_syncobj_put(parser->post_dep_syncobjs[i]);
@@ -791,7 +787,8 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) 


	if (amdgpu_sriov_vf(adev)) {

		struct dma_fence *f;

		bo_va = vm->csa_bo_va;



		bo_va = fpriv->csa_va;

		BUG_ON(!bo_va);

		r = amdgpu_vm_bo_update(adev, bo_va, false);

		if (r)
@@ -828,7 +825,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p) 


	}



	r = amdgpu_vm_clear_invalids(adev, vm, &p->job->sync);

	r = amdgpu_vm_clear_moved(adev, vm, &p->job->sync);



	if (amdgpu_vm_debug && p->bo_list) {

		/* Invalidate all BOs to test for userspace bugs */
@@ -1490,7 +1487,7 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
			    addr > mapping->last)

				continue;



			*bo = lobj->bo_va->bo;

			*bo = lobj->bo_va->base.bo;

			return mapping;

		}
@@ -1499,7 +1496,7 @@ amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser, 
			    addr > mapping->last)

				continue;



			*bo = lobj->bo_va->bo;

			*bo = lobj->bo_va->base.bo;

			return mapping;

		}

	}

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+7 −0
Original line number Diff line number Diff line
@@ -1076,6 +1076,13 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) 
		amdgpu_gtt_size = -1;

	}



	/* valid range is between 4 and 9 inclusive */

	if (amdgpu_vm_fragment_size != -1 &&

	    (amdgpu_vm_fragment_size > 9 || amdgpu_vm_fragment_size < 4)) {

		dev_warn(adev->dev, "valid range is between 4 and 9\n");

		amdgpu_vm_fragment_size = -1;

	}



	amdgpu_check_vm_size(adev);



	amdgpu_check_block_size(adev);

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+6 −1
Original line number Diff line number Diff line
@@ -68,9 +68,10 @@ 
 * - 3.16.0 - Add reserved vmid support

 * - 3.17.0 - Add AMDGPU_NUM_VRAM_CPU_PAGE_FAULTS.

 * - 3.18.0 - Export gpu always on cu bitmap

 * - 3.19.0 - Add support for UVD MJPEG decode

 */

#define KMS_DRIVER_MAJOR	3

#define KMS_DRIVER_MINOR	18

#define KMS_DRIVER_MINOR	19

#define KMS_DRIVER_PATCHLEVEL	0



int amdgpu_vram_limit = 0;
@@ -94,6 +95,7 @@ unsigned amdgpu_ip_block_mask = 0xffffffff; 
int amdgpu_bapm = -1;

int amdgpu_deep_color = 0;

int amdgpu_vm_size = -1;

int amdgpu_vm_fragment_size = -1;

int amdgpu_vm_block_size = -1;

int amdgpu_vm_fault_stop = 0;

int amdgpu_vm_debug = 0;
@@ -183,6 +185,9 @@ module_param_named(deep_color, amdgpu_deep_color, int, 0444); 
MODULE_PARM_DESC(vm_size, "VM address space size in gigabytes (default 64GB)");

module_param_named(vm_size, amdgpu_vm_size, int, 0444);



MODULE_PARM_DESC(vm_fragment_size, "VM fragment size in bits (4, 5, etc. 4 = 64K (default), Max 9 = 2M)");

module_param_named(vm_fragment_size, amdgpu_vm_fragment_size, int, 0444);



MODULE_PARM_DESC(vm_block_size, "VM page table size in bits (default depending on vm_size)");

module_param_named(vm_block_size, amdgpu_vm_block_size, int, 0444);

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+3 −5
Original line number Diff line number Diff line
@@ -225,9 +225,7 @@ int amdgpu_gem_create_ioctl(struct drm_device *dev, void *data, 
	if (args->in.domain_flags & ~(AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED |

				      AMDGPU_GEM_CREATE_NO_CPU_ACCESS |

				      AMDGPU_GEM_CREATE_CPU_GTT_USWC |

				      AMDGPU_GEM_CREATE_VRAM_CLEARED|

				      AMDGPU_GEM_CREATE_SHADOW |

				      AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS))

				      AMDGPU_GEM_CREATE_VRAM_CLEARED))

		return -EINVAL;



	/* reject invalid gem domains */
@@ -623,7 +621,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 


	switch (args->operation) {

	case AMDGPU_VA_OP_MAP:

		r = amdgpu_vm_alloc_pts(adev, bo_va->vm, args->va_address,

		r = amdgpu_vm_alloc_pts(adev, bo_va->base.vm, args->va_address,

					args->map_size);

		if (r)

			goto error_backoff;
@@ -643,7 +641,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
						args->map_size);

		break;

	case AMDGPU_VA_OP_REPLACE:

		r = amdgpu_vm_alloc_pts(adev, bo_va->vm, args->va_address,

		r = amdgpu_vm_alloc_pts(adev, bo_va->base.vm, args->va_address,

					args->map_size);

		if (r)

			goto error_backoff;