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

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



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

amdgpu:
- RLC FW code cleanup
- RLC fixes for GC 11.x
- SMU 13.x fixes
- CP FW code cleanup
- SDMA FW code cleanup
- GC 11.x fixes
- DCN 3.2.x fixes
- DCN 3.1.4 fixes
- Misc fixes
- RAS fixes
- SR-IOV fixes
- VCN 4.x fixes

amdkfd:
- GC 11.x fixes
- Xnack fixes
- UBSAN warning fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220930162012.5823-1-alexander.deucher@amd.com
parents 4ae9f874 b292cafe

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

+4 −0
Original line number Diff line number Diff line
@@ -1053,6 +1053,10 @@ bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) 
{

	if (adev->flags & AMD_IS_APU)

		return false;



	if (amdgpu_sriov_vf(adev))

		return false;



	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

}

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

+1 −5
Original line number Diff line number Diff line
@@ -756,11 +756,7 @@ void amdgpu_amdkfd_ras_poison_consumption_handler(struct amdgpu_device *adev, bo 
{

	struct ras_err_data err_data = {0, 0, 0, NULL};



	/* CPU MCA will handle page retirement if connected_to_cpu is 1 */

	if (!adev->gmc.xgmi.connected_to_cpu)

	amdgpu_umc_poison_handler(adev, &err_data, reset);

	else if (reset)

		amdgpu_amdkfd_gpu_reset(adev);

}



bool amdgpu_amdkfd_ras_query_utcl2_poison_status(struct amdgpu_device *adev)

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

+29 −4
Original line number Diff line number Diff line
@@ -3154,7 +3154,8 @@ static int amdgpu_device_ip_resume_phase1(struct amdgpu_device *adev) 
			continue;

		if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_COMMON ||

		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_GMC ||

		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH) {

		    adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_IH ||

		    (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_PSP && amdgpu_sriov_vf(adev))) {



			r = adev->ip_blocks[i].version->funcs->resume(adev);

			if (r) {
@@ -4069,12 +4070,20 @@ static void amdgpu_device_evict_resources(struct amdgpu_device *adev) 
int amdgpu_device_suspend(struct drm_device *dev, bool fbcon)

{

	struct amdgpu_device *adev = drm_to_adev(dev);

	int r = 0;



	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;



	adev->in_suspend = true;



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_fini_data_exchange(adev);

		r = amdgpu_virt_request_full_gpu(adev, false);

		if (r)

			return r;

	}



	if (amdgpu_acpi_smart_shift_update(dev, AMDGPU_SS_DEV_D3))

		DRM_WARN("smart shift update failed\n");
@@ -4098,6 +4107,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) 


	amdgpu_device_ip_suspend_phase2(adev);



	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_release_full_gpu(adev, false);



	return 0;

}
@@ -4116,6 +4128,12 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	struct amdgpu_device *adev = drm_to_adev(dev);

	int r = 0;



	if (amdgpu_sriov_vf(adev)) {

		r = amdgpu_virt_request_full_gpu(adev, true);

		if (r)

			return r;

	}



	if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)

		return 0;
@@ -4130,6 +4148,13 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon) 
	}



	r = amdgpu_device_ip_resume(adev);



	/* no matter what r is, always need to properly release full GPU */

	if (amdgpu_sriov_vf(adev)) {

		amdgpu_virt_init_data_exchange(adev);

		amdgpu_virt_release_full_gpu(adev, true);

	}



	if (r) {

		dev_err(adev->dev, "amdgpu_device_ip_resume failed (%d).\n", r);

		return r;
@@ -5576,9 +5601,9 @@ bool amdgpu_device_is_peer_accessible(struct amdgpu_device *adev, 
		~*peer_adev->dev->dma_mask : ~((1ULL << 32) - 1);

	resource_size_t aper_limit =

		adev->gmc.aper_base + adev->gmc.aper_size - 1;

	bool p2p_access = !adev->gmc.xgmi.connected_to_cpu &&

			  !(pci_p2pdma_distance_many(adev->pdev,

					&peer_adev->dev, 1, true) < 0);

	bool p2p_access =

		!adev->gmc.xgmi.connected_to_cpu &&

		!(pci_p2pdma_distance(adev->pdev, peer_adev->dev, false) < 0);



	return pcie_p2p && p2p_access && (adev->gmc.visible_vram_size &&

		adev->gmc.real_vram_size == adev->gmc.visible_vram_size &&

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int amdgpu_discovery_read_binary_from_file(struct amdgpu_device *adev, ui 
		return r;

	}



	memcpy((u8 *)binary, (u8 *)fw->data, adev->mman.discovery_tmr_size);

	memcpy((u8 *)binary, (u8 *)fw->data, fw->size);

	release_firmware(fw);



	return 0;

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r;



	if (pci_p2pdma_distance_many(adev->pdev, &attach->dev, 1, true) < 0)

	if (pci_p2pdma_distance(adev->pdev, attach->dev, false) < 0)

		attach->peer2peer = false;



	r = pm_runtime_get_sync(adev_to_drm(adev)->dev);