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

Commit 396f9aca authored by Dave Airlie's avatar Dave Airlie
Browse files

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



amdgpu:
- Revert timeline support until KHR is ready
- Various driver reload fixes
- Refactor clock handling in DC
- Aux fixes for DC
- Bandwidth calculation updates for DC
- Fix documentation due to file rename
- RAS fix
- Fix race in late_init

ttm:
- Allow for better forward progress when there is heavy memory contention

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190606032537.6939-1-alexander.deucher@amd.com
parents 141de1d4 72a14e9b

Documentation/gpu/amdgpu.rst

+2 −2
Original line number Diff line number Diff line
@@ -37,10 +37,10 @@ Buffer Objects 
PRIME Buffer Sharing

--------------------



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c

.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

   :doc: PRIME Buffer Sharing



.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c

.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

   :internal:



MMU Notifier

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

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ struct amdgpu_device { 
	const struct amdgpu_df_funcs	*df_funcs;



	/* delayed work_func for deferring clockgating during resume */

	struct delayed_work     late_init_work;

	struct delayed_work     delayed_init_work;



	struct amdgpu_virt	virt;

	/* firmware VRAM reservation */

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

+6 −5
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem, 
	amdgpu_vm_get_pd_bo(vm, &ctx->list, &ctx->vm_pd[0]);



	ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

				     false, &ctx->duplicates);

				     false, &ctx->duplicates, true);

	if (!ret)

		ctx->reserved = true;

	else {
@@ -658,7 +658,7 @@ static int reserve_bo_and_cond_vms(struct kgd_mem *mem, 
	}



	ret = ttm_eu_reserve_buffers(&ctx->ticket, &ctx->list,

				     false, &ctx->duplicates);

				     false, &ctx->duplicates, true);

	if (!ret)

		ctx->reserved = true;

	else
@@ -1808,7 +1808,8 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 
	}



	/* Reserve all BOs and page tables for validation */

	ret = ttm_eu_reserve_buffers(&ticket, &resv_list, false, &duplicates);

	ret = ttm_eu_reserve_buffers(&ticket, &resv_list, false, &duplicates,

				     true);

	WARN(!list_empty(&duplicates), "Duplicates should be empty");

	if (ret)

		goto out_free;
@@ -2014,7 +2015,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
	}



	ret = ttm_eu_reserve_buffers(&ctx.ticket, &ctx.list,

				     false, &duplicate_save);

				     false, &duplicate_save, true);

	if (ret) {

		pr_debug("Memory eviction: TTM Reserve Failed. Try again\n");

		goto ttm_reserve_fail;
@@ -2124,7 +2125,7 @@ int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem 


	*mem = kzalloc(sizeof(struct kgd_mem), GFP_KERNEL);

	if (!*mem)

		return -EINVAL;

		return -ENOMEM;



	mutex_init(&(*mem)->lock);

	(*mem)->bo = amdgpu_bo_ref(gws_bo);

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

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p, 
	}



	r = ttm_eu_reserve_buffers(&p->ticket, &p->validated, true,

				   &duplicates);

				   &duplicates, true);

	if (unlikely(r != 0)) {

		if (r != -ERESTARTSYS)

			DRM_ERROR("ttm_eu_reserve_buffers failed.\n");

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

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm, 
	list_add(&csa_tv.head, &list);

	amdgpu_vm_get_pd_bo(vm, &list, &pd);



	r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL);

	r = ttm_eu_reserve_buffers(&ticket, &list, true, NULL, true);

	if (r) {

		DRM_ERROR("failed to reserve CSA,PD BOs: err=%d\n", r);

		return r;