Commit 59b9d6ba authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.15-2021-08-06' of... 

Merge tag 'amd-drm-next-5.15-2021-08-06' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.15-2021-08-06:

amdgpu:
- Aldebaran fixes
- Powergating fix for Renoir
- Switch virtual DCE over to vkms based atomic modesetting
- Misc typo fixes
- PSP handling cleanups
- DC FP cleanups
- RAS fixes
- Wave debug improvements
- Freesync fix
- BACO/BOCO fixes
- Misc fixes

amdkfd:
- Expose gfx version in sysfs
- Aldebaran fixes

radeon:
- Coding style fix
- Typo fixes
- Pageflip fix

UAPI:
- amdkfd: SVM address range query
  Proposed userspace: https://github.com/RadeonOpenCompute/ROCR-Runtime/tree/memory_model_queries



Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210806205248.3864-1-alexander.deucher@amd.com
parents 9efba202 a43e2a0e

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ amdgpu-y += \ 
amdgpu-y += \

	dce_v10_0.o \

	dce_v11_0.o \

	dce_virtual.o

	amdgpu_vkms.o



# add GFX block

amdgpu-y += \

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

+1 −0
Original line number Diff line number Diff line
@@ -916,6 +916,7 @@ struct amdgpu_device { 


	/* display */

	bool				enable_virtual_display;

	struct amdgpu_vkms_output       *amdgpu_vkms_output;

	struct amdgpu_mode_info		mode_info;

	/* For pre-DCE11. DCE11 and later are in "struct amdgpu_device->dm" */

	struct work_struct		hotplug_work;

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

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ void amdgpu_acpi_detect(void) 
 */

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)

{

#if defined(CONFIG_AMD_PMC) || defined(CONFIG_AMD_PMC_MODULE)

#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_PM_SLEEP)

	if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {

		if (adev->flags & AMD_IS_APU)

			return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;

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

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv,

		uint64_t *size);

int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv);

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv, bool *table_freed);

int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_sync_memory(

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

+17 −8
Original line number Diff line number Diff line
@@ -1057,7 +1057,8 @@ static void unmap_bo_from_gpuvm(struct kgd_mem *mem, 


static int update_gpuvm_pte(struct kgd_mem *mem,

			    struct kfd_mem_attachment *entry,

			    struct amdgpu_sync *sync)

			    struct amdgpu_sync *sync,

			    bool *table_freed)

{

	struct amdgpu_bo_va *bo_va = entry->bo_va;

	struct amdgpu_device *adev = entry->adev;
@@ -1068,7 +1069,7 @@ static int update_gpuvm_pte(struct kgd_mem *mem, 
		return ret;



	/* Update the page tables  */

	ret = amdgpu_vm_bo_update(adev, bo_va, false);

	ret = amdgpu_vm_bo_update(adev, bo_va, false, table_freed);

	if (ret) {

		pr_err("amdgpu_vm_bo_update failed\n");

		return ret;
@@ -1080,7 +1081,8 @@ static int update_gpuvm_pte(struct kgd_mem *mem, 
static int map_bo_to_gpuvm(struct kgd_mem *mem,

			   struct kfd_mem_attachment *entry,

			   struct amdgpu_sync *sync,

			   bool no_update_pte)

			   bool no_update_pte,

			   bool *table_freed)

{

	int ret;
@@ -1097,7 +1099,7 @@ static int map_bo_to_gpuvm(struct kgd_mem *mem, 
	if (no_update_pte)

		return 0;



	ret = update_gpuvm_pte(mem, entry, sync);

	ret = update_gpuvm_pte(mem, entry, sync, table_freed);

	if (ret) {

		pr_err("update_gpuvm_pte() failed\n");

		goto update_gpuvm_pte_failed;
@@ -1605,7 +1607,8 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 
}



int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct kgd_dev *kgd, struct kgd_mem *mem, void *drm_priv)

		struct kgd_dev *kgd, struct kgd_mem *mem,

		void *drm_priv, bool *table_freed)

{

	struct amdgpu_device *adev = get_amdgpu_device(kgd);

	struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);
@@ -1693,7 +1696,7 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
			 entry->va, entry->va + bo_size, entry);



		ret = map_bo_to_gpuvm(mem, entry, ctx.sync,

				      is_invalid_userptr);

				      is_invalid_userptr, table_freed);

		if (ret) {

			pr_err("Failed to map bo to gpuvm\n");

			goto out_unreserve;
@@ -1717,6 +1720,12 @@ int amdgpu_amdkfd_gpuvm_map_memory_to_gpu( 
				true);

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



	/* Only apply no TLB flush on Aldebaran to

	 * workaround regressions on other Asics.

	 */

	if (table_freed && (adev->asic_type != CHIP_ALDEBARAN))

		*table_freed = true;



	goto out;



out_unreserve:
@@ -2143,7 +2152,7 @@ static int validate_invalid_user_pages(struct amdkfd_process_info *process_info) 
				continue;



			kfd_mem_dmaunmap_attachment(mem, attachment);

			ret = update_gpuvm_pte(mem, attachment, &sync);

			ret = update_gpuvm_pte(mem, attachment, &sync, NULL);

			if (ret) {

				pr_err("%s: update PTE failed\n", __func__);

				/* make sure this gets validated again */
@@ -2349,7 +2358,7 @@ int amdgpu_amdkfd_gpuvm_restore_process_bos(void *info, struct dma_fence **ef) 
				continue;



			kfd_mem_dmaunmap_attachment(mem, attachment);

			ret = update_gpuvm_pte(mem, attachment, &sync_obj);

			ret = update_gpuvm_pte(mem, attachment, &sync_obj, NULL);

			if (ret) {

				pr_debug("Memory eviction: update PTE failed. Try again\n");

				goto validate_map_fail;