Commit 367fe8dc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-next-5.16-2021-10-22' of... 

Merge tag 'amd-drm-next-5.16-2021-10-22' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-next

amd-drm-next-5.16-2021-10-22:

amdgpu:
- PSP fix for resume
- XGMI fixes
- Interrupt fix in device tear down
- Renoir USB-C DP alt mode fix for resume
- DP 2.0 fixes
- Yellow Carp display fixes
- Misc display fixes
- RAS fixes
- IP Discovery enumeration fixes
- VGH fixes
- SR-IOV fixes
- Revert ChromeOS workaround in display code
- Cyan Skillfish fixes

amdkfd:
- Fix error handling in gpu memory allocation
- Fix build warnings with some configs
- SVM fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211022183112.4574-1-alexander.deucher@amd.com
parents 6f2f7c83 41ad3662

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -902,6 +902,7 @@ F: include/uapi/linux/psp-sev.h 
AMD DISPLAY CORE

M:	Harry Wentland <harry.wentland@amd.com>

M:	Leo Li <sunpeng.li@amd.com>

M:	Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -73,10 +73,8 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce 


amdgpu-y += \

	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o navi10_reg_init.o navi14_reg_init.o \

	arct_reg_init.o navi12_reg_init.o mxgpu_nv.o sienna_cichlid_reg_init.o vangogh_reg_init.o \

	nbio_v7_2.o dimgrey_cavefish_reg_init.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o \

	beige_goby_reg_init.o yellow_carp_reg_init.o cyan_skillfish_reg_init.o

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o arct_reg_init.o mxgpu_nv.o \

	nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o



# add DF block

amdgpu-y += \

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

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,8 @@ static int aldebaran_mode2_restore_ip(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.late_initialized = true;

	}



	amdgpu_ras_set_error_query_ready(adev, true);



	amdgpu_device_set_cg_state(adev, AMD_CG_STATE_GATE);

	amdgpu_device_set_pg_state(adev, AMD_PG_STATE_GATE);

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

+1 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	remove_kgd_mem_from_kfd_bo_list(*mem, avm->process_info);

	drm_vma_node_revoke(&gobj->vma_node, drm_priv);

err_node_allow:

	amdgpu_bo_unref(&bo);

	drm_gem_object_put(gobj);

	/* Don't unreserve system mem limit twice */

	goto err_reserve_limit;

err_bo_create:

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

+2 −6
Original line number Diff line number Diff line
@@ -2398,10 +2398,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (!adev->gmc.xgmi.pending_reset)

		amdgpu_amdkfd_device_init(adev);



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	amdgpu_fru_get_product_info(adev);



init_failed:
@@ -3839,10 +3835,10 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 


	amdgpu_fbdev_fini(adev);



	amdgpu_irq_fini_hw(adev);



	amdgpu_device_ip_fini_early(adev);



	amdgpu_irq_fini_hw(adev);



	ttm_device_clear_dma_mappings(&adev->mman.bdev);



	amdgpu_gart_dummy_page_fini(adev);