Commit 849b1f33 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-6.1-2022-09-16' of https://gitlab.freedesktop.org/agd5f/linux into drm-next 



amd-drm-next-6.1-2022-09-16:

amdgpu:
- PCI AER fixes
- BACO fix
- RAS fixes
- XGMI fixes
- Display SubVP fixes
- DCN 3.2 updates
- DCN 3.1.4 updates
- LLVM fixes
- CS cleanup in preparation for gang submit
- Add some new GC CG registers
- Misc cleanups

amdkfd:
- Fix CRIU regression
- CPU fault on COW mapping fixes
- Prefault fixes
- Misc cleanups

radeon:
- Misc cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220916153638.6501-1-alexander.deucher@amd.com
parents 47cd3af6 dacd2d2d

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

+7 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright 2012 Advanced Micro Devices, Inc.

 *
@@ -849,6 +850,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
		if (amdgpu_device_has_dc_support(adev)) {

#if defined(CONFIG_DRM_AMD_DC)

			struct amdgpu_display_manager *dm = &adev->dm;



			if (dm->backlight_dev[0])

				atif->bd = dm->backlight_dev[0];

#endif
@@ -863,6 +865,7 @@ int amdgpu_acpi_init(struct amdgpu_device *adev) 
				if ((enc->devices & (ATOM_DEVICE_LCD_SUPPORT)) &&

				    enc->enc_priv) {

					struct amdgpu_encoder_atom_dig *dig = enc->enc_priv;



					if (dig->bl_dev) {

						atif->bd = dig->bl_dev;

						break;
@@ -919,9 +922,9 @@ static bool amdgpu_atif_pci_probe_handle(struct pci_dev *pdev) 
		return false;



	status = acpi_get_handle(dhandle, "ATIF", &atif_handle);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status))

		return false;

	}



	amdgpu_acpi_priv.atif.handle = atif_handle;

	acpi_get_name(amdgpu_acpi_priv.atif.handle, ACPI_FULL_PATHNAME, &buffer);

	DRM_DEBUG_DRIVER("Found ATIF handle %s\n", acpi_method_name);
@@ -954,9 +957,9 @@ static bool amdgpu_atcs_pci_probe_handle(struct pci_dev *pdev) 
		return false;



	status = acpi_get_handle(dhandle, "ATCS", &atcs_handle);

	if (ACPI_FAILURE(status)) {

	if (ACPI_FAILURE(status))

		return false;

	}



	amdgpu_acpi_priv.atcs.handle = atcs_handle;

	acpi_get_name(amdgpu_acpi_priv.atcs.handle, ACPI_FULL_PATHNAME, &buffer);

	DRM_DEBUG_DRIVER("Found ATCS handle %s\n", acpi_method_name);

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

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright 2014 Advanced Micro Devices, Inc.

 *
@@ -130,6 +131,7 @@ static void amdgpu_amdkfd_reset_work(struct work_struct *work) 
						  kfd.reset_work);



	struct amdgpu_reset_context reset_context;



	memset(&reset_context, 0, sizeof(reset_context));



	reset_context.method = AMD_RESET_METHOD_NONE;

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

+19 −11
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

/*

 * Copyright 2014-2018 Advanced Micro Devices, Inc.

 *
@@ -297,7 +298,7 @@ static int amdgpu_amdkfd_remove_eviction_fence(struct amdgpu_bo *bo, 
	 */

	replacement = dma_fence_get_stub();

	dma_resv_replace_fences(bo->tbo.base.resv, ef->base.context,

				replacement, DMA_RESV_USAGE_READ);

				replacement, DMA_RESV_USAGE_BOOKKEEP);

	dma_fence_put(replacement);

	return 0;

}
@@ -1390,8 +1391,9 @@ static int init_kfd_vm(struct amdgpu_vm *vm, void **process_info, 
	ret = dma_resv_reserve_fences(vm->root.bo->tbo.base.resv, 1);

	if (ret)

		goto reserve_shared_fail;

	amdgpu_bo_fence(vm->root.bo,

			&vm->process_info->eviction_fence->base, true);

	dma_resv_add_fence(vm->root.bo->tbo.base.resv,

			   &vm->process_info->eviction_fence->base,

			   DMA_RESV_USAGE_BOOKKEEP);

	amdgpu_bo_unreserve(vm->root.bo);



	/* Update process info */
@@ -1612,6 +1614,7 @@ size_t amdgpu_amdkfd_get_available_memory(struct amdgpu_device *adev) 
	uint64_t reserved_for_pt =

		ESTIMATE_PT_SIZE(amdgpu_amdkfd_total_mem_size);

	size_t available;



	spin_lock(&kfd_mem_limit.mem_limit_lock);

	available = adev->gmc.real_vram_size

		- adev->kfd.vram_used_aligned
@@ -1987,9 +1990,9 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
	}



	if (!amdgpu_ttm_tt_get_usermm(bo->tbo.ttm) && !bo->tbo.pin_count)

		amdgpu_bo_fence(bo,

		dma_resv_add_fence(bo->tbo.base.resv,

				   &avm->process_info->eviction_fence->base,

				true);

				   DMA_RESV_USAGE_BOOKKEEP);

	ret = unreserve_bo_and_vms(&ctx, false, false);



	goto out;
@@ -2216,7 +2219,7 @@ int amdgpu_amdkfd_gpuvm_get_vm_fault_info(struct amdgpu_device *adev, 
{

	if (atomic_read(&adev->gmc.vm_fault_info_updated) == 1) {

		*mem = *adev->gmc.vm_fault_info;

		mb();

		mb(); /* make sure read happened */

		atomic_set(&adev->gmc.vm_fault_info_updated, 0);

	}

	return 0;
@@ -2758,15 +2761,18 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
		if (mem->bo->tbo.pin_count)

			continue;



		amdgpu_bo_fence(mem->bo,

			&process_info->eviction_fence->base, true);

		dma_resv_add_fence(mem->bo->tbo.base.resv,

				   &process_info->eviction_fence->base,

				   DMA_RESV_USAGE_BOOKKEEP);

	}

	/* Attach eviction fence to PD / PT BOs */

	list_for_each_entry(peer_vm, &process_info->vm_list_head,

			    vm_list_node) {

		struct amdgpu_bo *bo = peer_vm->root.bo;



		amdgpu_bo_fence(bo, &process_info->eviction_fence->base, true);

		dma_resv_add_fence(bo->tbo.base.resv,

				   &process_info->eviction_fence->base,

				   DMA_RESV_USAGE_BOOKKEEP);

	}



validate_map_fail:
@@ -2820,7 +2826,9 @@ int amdgpu_amdkfd_add_gws_to_process(void *info, void *gws, struct kgd_mem **mem 
	ret = dma_resv_reserve_fences(gws_bo->tbo.base.resv, 1);

	if (ret)

		goto reserve_shared_fail;

	amdgpu_bo_fence(gws_bo, &process_info->eviction_fence->base, true);

	dma_resv_add_fence(gws_bo->tbo.base.resv,

			   &process_info->eviction_fence->base,

			   DMA_RESV_USAGE_BOOKKEEP);

	amdgpu_bo_unreserve(gws_bo);

	mutex_unlock(&(*mem)->process_info->lock);

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

+667 −682

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −2
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ static int amdgpu_ctx_init(struct amdgpu_ctx_mgr *mgr, int32_t priority, 
	kref_init(&ctx->refcount);

	ctx->mgr = mgr;

	spin_lock_init(&ctx->ring_lock);

	mutex_init(&ctx->lock);



	ctx->reset_counter = atomic_read(&mgr->adev->gpu_reset_counter);

	ctx->reset_counter_query = ctx->reset_counter;
@@ -407,7 +406,6 @@ static void amdgpu_ctx_fini(struct kref *ref) 
		drm_dev_exit(idx);

	}



	mutex_destroy(&ctx->lock);

	kfree(ctx);

}