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

Merge tag 'amd-drm-next-5.19-2022-04-15' of... 

Merge tag 'amd-drm-next-5.19-2022-04-15' of https://gitlab.freedesktop.org/agd5f/linux into drm-next

amd-drm-next-5.19-2022-04-15:

amdgpu:
- USB-C updates
- GPUVM updates
- TMZ fixes for RV
- DCN 3.1 pstate fixes
- Display z state fixes
- RAS fixes
- Misc code cleanups and spelling fixes
- More DC FP rework
- GPUVM TLB handling rework
- Power management sysfs code cleanup
- Add RAS support for VCN
- Backlight fix
- Add unique id support for more asics
- Misc display updates
- SR-IOV fixes
- Extend CG and PG flags to 64 bits
- Enable VCN clk sysfs nodes for navi12

amdkfd:
- Fix IO link cleanup during device removal
- RAS fixes
- Retry fault fixes
- Asynchronously free events
- SVM fixes

radeon:
- Drop some dead code
- Misc code cleanups

From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220415135144.5700-1-alexander.deucher@amd.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 19df0cfa d68cf992

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o \

	atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \

	atombios_encoders.o amdgpu_sa.o atombios_i2c.o \

	amdgpu_dma_buf.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_dma_buf.o amdgpu_vm.o amdgpu_vm_pt.o amdgpu_ib.o amdgpu_pll.o \

	amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \

	amdgpu_gtt_mgr.o amdgpu_preempt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o \

	amdgpu_atomfirmware.o amdgpu_vf_error.o amdgpu_sched.o \

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

+3 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ extern int amdgpu_sched_jobs; 
extern int amdgpu_sched_hw_submission;

extern uint amdgpu_pcie_gen_cap;

extern uint amdgpu_pcie_lane_cap;

extern uint amdgpu_cg_mask;

extern u64 amdgpu_cg_mask;

extern uint amdgpu_pg_mask;

extern uint amdgpu_sdma_phase_quantum;

extern char *amdgpu_disable_cu;
@@ -322,7 +322,7 @@ int amdgpu_device_ip_set_powergating_state(void *dev, 
					   enum amd_ip_block_type block_type,

					   enum amd_powergating_state state);

void amdgpu_device_ip_get_clockgating_state(struct amdgpu_device *adev,

					    u32 *flags);

					    u64 *flags);

int amdgpu_device_ip_wait_for_idle(struct amdgpu_device *adev,

				   enum amd_ip_block_type block_type);

bool amdgpu_device_ip_is_idle(struct amdgpu_device *adev,
@@ -860,7 +860,7 @@ struct amdgpu_device { 
	/* powerplay */

	struct amd_powerplay		powerplay;

	struct amdgpu_pm		pm;

	u32				cg_flags;

	u64				cg_flags;

	u32				pg_flags;



	/* nbio */

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

+8 −0
Original line number Diff line number Diff line
@@ -724,3 +724,11 @@ void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev, bo 
	else if (reset)

		amdgpu_amdkfd_gpu_reset(adev);

}



bool amdgpu_amdkfd_ras_query_utcl2_poison_status(struct amdgpu_device *adev)

{

	if (adev->gfx.ras && adev->gfx.ras->query_utcl2_poison_status)

		return adev->gfx.ras->query_utcl2_poison_status(adev);

	else

		return false;

}

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

+3 −3
Original line number Diff line number Diff line
@@ -273,9 +273,8 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
int amdgpu_amdkfd_gpuvm_free_memory_of_gpu(

		struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv,

		uint64_t *size);

int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv,

		bool *table_freed);

int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(struct amdgpu_device *adev,

					  struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_unmap_memory_from_gpu(

		struct amdgpu_device *adev, struct kgd_mem *mem, void *drm_priv);

int amdgpu_amdkfd_gpuvm_sync_memory(
@@ -301,6 +300,7 @@ void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev, 
bool amdgpu_amdkfd_bo_mapped_to_dev(struct amdgpu_device *adev, struct kgd_mem *mem);

void amdgpu_amdkfd_block_mmu_notifications(void *p);

int amdgpu_amdkfd_criu_resume(void *p);

bool amdgpu_amdkfd_ras_query_utcl2_poison_status(struct amdgpu_device *adev);



#if IS_ENABLED(CONFIG_HSA_AMD)

void amdgpu_amdkfd_gpuvm_init_mem_limits(void);

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

+8 −10
Original line number Diff line number Diff line
@@ -1058,8 +1058,7 @@ 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,

			    bool *table_freed)

			    struct amdgpu_sync *sync)

{

	struct amdgpu_bo_va *bo_va = entry->bo_va;

	struct amdgpu_device *adev = entry->adev;
@@ -1070,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, table_freed);

	ret = amdgpu_vm_bo_update(adev, bo_va, false);

	if (ret) {

		pr_err("amdgpu_vm_bo_update failed\n");

		return ret;
@@ -1082,8 +1081,7 @@ 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 *table_freed)

			   bool no_update_pte)

{

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

		return 0;



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

	ret = update_gpuvm_pte(mem, entry, sync);

	if (ret) {

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

		goto update_gpuvm_pte_failed;
@@ -1710,7 +1708,7 @@ int amdgpu_amdkfd_gpuvm_free_memory_of_gpu( 


int amdgpu_amdkfd_gpuvm_map_memory_to_gpu(

		struct amdgpu_device *adev, struct kgd_mem *mem,

		void *drm_priv, bool *table_freed)

		void *drm_priv)

{

	struct amdgpu_vm *avm = drm_priv_to_vm(drm_priv);

	int ret;
@@ -1797,7 +1795,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, table_freed);

				      is_invalid_userptr);

		if (ret) {

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

			goto out_unreserve;
@@ -2265,7 +2263,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, NULL);

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

			if (ret) {

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

				/* make sure this gets validated again */
@@ -2476,7 +2474,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, NULL);

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

			if (ret) {

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

				goto validate_map_fail;