Commit 52e81b69 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.16-2021-12-01' of... 

Merge tag 'amd-drm-fixes-5.16-2021-12-01' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.16-2021-12-01:

amdgpu:
- IP discovery based enumeration fixes
- vkms fixes
- DSC fixes for DP MST
- Audio fix for hotplug with tiled displays
- Misc display fixes
- DP tunneling fix
- DP fix
- Aldebaran fix

amdkfd:
- Locking fix
- Static checker fix
- Fix double free

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211201232802.5801-1-alexander.deucher@amd.com
parents 8b233a83 3abfe30d

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

+5 −3
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ int amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu( 
	struct sg_table *sg = NULL;

	uint64_t user_addr = 0;

	struct amdgpu_bo *bo;

	struct drm_gem_object *gobj;

	struct drm_gem_object *gobj = NULL;

	u32 domain, alloc_domain;

	u64 alloc_flags;

	int ret;
@@ -1506,13 +1506,15 @@ 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:

	drm_gem_object_put(gobj);

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

	goto err_reserve_limit;

err_bo_create:

	unreserve_mem_limit(adev, size, alloc_domain, !!sg);

err_reserve_limit:

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

	if (gobj)

		drm_gem_object_put(gobj);

	else

		kfree(*mem);

err:

	if (sg) {

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

+10 −6
Original line number Diff line number Diff line
@@ -3833,7 +3833,7 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
	/* disable all interrupts */

	amdgpu_irq_disable_all(adev);

	if (adev->mode_info.mode_config_initialized){

		if (!amdgpu_device_has_dc_support(adev))

		if (!drm_drv_uses_atomic_modeset(adev_to_drm(adev)))

			drm_helper_force_disable_all(adev_to_drm(adev));

		else

			drm_atomic_helper_shutdown(adev_to_drm(adev));
@@ -4289,6 +4289,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 
{

	int r;



	amdgpu_amdkfd_pre_reset(adev);



	if (from_hypervisor)

		r = amdgpu_virt_request_full_gpu(adev, true);

	else
@@ -4316,6 +4318,7 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 


	amdgpu_irq_gpu_reset_resume_helper(adev);

	r = amdgpu_ib_ring_tests(adev);

	amdgpu_amdkfd_post_reset(adev);



error:

	if (!r && adev->virt.gim_feature & AMDGIM_FEATURE_GIM_FLR_VRAMLOST) {
@@ -5030,6 +5033,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


		cancel_delayed_work_sync(&tmp_adev->delayed_init_work);



		if (!amdgpu_sriov_vf(tmp_adev))

			amdgpu_amdkfd_pre_reset(tmp_adev);



		/*
@@ -5129,7 +5133,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
			drm_sched_start(&ring->sched, !tmp_adev->asic_reset_res);

		}



		if (!amdgpu_device_has_dc_support(tmp_adev) && !job_signaled) {

		if (!drm_drv_uses_atomic_modeset(adev_to_drm(tmp_adev)) && !job_signaled) {

			drm_helper_resume_force_mode(adev_to_drm(tmp_adev));

		}
@@ -5148,8 +5152,8 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 


skip_sched_resume:

	list_for_each_entry(tmp_adev, device_list_handle, reset_list) {

		/* unlock kfd */

		if (!need_emergency_restart)

		/* unlock kfd: SRIOV would do it separately */

		if (!need_emergency_restart && !amdgpu_sriov_vf(tmp_adev))

			amdgpu_amdkfd_post_reset(tmp_adev);



		/* kfd_post_reset will do nothing if kfd device is not initialized,

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

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@ static int hw_id_map[MAX_HWIP] = { 
	[HDP_HWIP]	= HDP_HWID,

	[SDMA0_HWIP]	= SDMA0_HWID,

	[SDMA1_HWIP]	= SDMA1_HWID,

	[SDMA2_HWIP]    = SDMA2_HWID,

	[SDMA3_HWIP]    = SDMA3_HWID,

	[MMHUB_HWIP]	= MMHUB_HWID,

	[ATHUB_HWIP]	= ATHUB_HWID,

	[NBIO_HWIP]	= NBIF_HWID,
@@ -918,6 +920,7 @@ static int amdgpu_discovery_set_mm_ip_blocks(struct amdgpu_device *adev) 
		case IP_VERSION(3, 0, 64):

		case IP_VERSION(3, 1, 1):

		case IP_VERSION(3, 0, 2):

		case IP_VERSION(3, 0, 192):

			amdgpu_device_ip_block_add(adev, &vcn_v3_0_ip_block);

			if (!amdgpu_sriov_vf(adev))

				amdgpu_device_ip_block_add(adev, &jpeg_v3_0_ip_block);

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

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) 
		break;

	case IP_VERSION(3, 0, 0):

	case IP_VERSION(3, 0, 64):

	case IP_VERSION(3, 0, 192):

		if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 3, 0))

			fw_name = FIRMWARE_SIENNA_CICHLID;

		else

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

+2 −2
Original line number Diff line number Diff line
@@ -504,8 +504,8 @@ static int amdgpu_vkms_sw_fini(void *handle) 
	int i = 0;



	for (i = 0; i < adev->mode_info.num_crtc; i++)

		if (adev->mode_info.crtcs[i])

			hrtimer_cancel(&adev->mode_info.crtcs[i]->vblank_timer);

		if (adev->amdgpu_vkms_output[i].vblank_hrtimer.function)

			hrtimer_cancel(&adev->amdgpu_vkms_output[i].vblank_hrtimer);



	kfree(adev->mode_info.bios_hardcoded_edid);

	kfree(adev->amdgpu_vkms_output);