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

Merge tag 'amd-drm-fixes-5.15-2021-10-06' of... 

Merge tag 'amd-drm-fixes-5.15-2021-10-06' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.15-2021-10-06:

amdgpu:
- DCN 3.1 DP alt mode fixes
- S0ix gfxoff fix
- Fix DRM_AMD_DC_SI dependencies
- PCIe DPC handling fix
- DCN 3.1 scaling fix
- Documentation fix

amdkfd:
- Fix potential memory leak
- IOMMUv2 init fixes

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211006203828.4818-1-alexander.deucher@amd.com
parents b28a130f 5a1fef02

Documentation/gpu/amdgpu.rst

+2 −2
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ pcie_replay_count 
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

   :doc: pcie_replay_count



+GPU SmartShift Information

============================

GPU SmartShift Information

==========================



GPU SmartShift information via sysfs

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

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


	bool                            no_hw_access;

	struct pci_saved_state          *pci_state;

	pci_channel_state_t		pci_channel_state;



	struct amdgpu_reset_control     *reset_cntl;

};

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

+1 −0
Original line number Diff line number Diff line
@@ -563,6 +563,7 @@ kfd_mem_dmaunmap_userptr(struct kgd_mem *mem, 


	dma_unmap_sgtable(adev->dev, ttm->sg, direction, 0);

	sg_free_table(ttm->sg);

	kfree(ttm->sg);

	ttm->sg = NULL;

}

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

+10 −4
Original line number Diff line number Diff line
@@ -2394,10 +2394,6 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (r)

		goto init_failed;



	r = amdgpu_amdkfd_resume_iommu(adev);

	if (r)

		goto init_failed;



	r = amdgpu_device_ip_hw_init_phase1(adev);

	if (r)

		goto init_failed;
@@ -2436,6 +2432,10 @@ 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:
@@ -5399,6 +5399,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
		return PCI_ERS_RESULT_DISCONNECT;

	}



	adev->pci_channel_state = state;



	switch (state) {

	case pci_channel_io_normal:

		return PCI_ERS_RESULT_CAN_RECOVER;
@@ -5541,6 +5543,10 @@ void amdgpu_pci_resume(struct pci_dev *pdev) 


	DRM_INFO("PCI error: resume callback!!\n");



	/* Only continue execution for the case of pci_channel_io_frozen */

	if (adev->pci_channel_state != pci_channel_io_frozen)

		return;



	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

		struct amdgpu_ring *ring = adev->rings[i];

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

+12 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
/* delay 0.1 second to enable gfx off feature */

#define GFX_OFF_DELAY_ENABLE         msecs_to_jiffies(100)



#define GFX_OFF_NO_DELAY 0



/*

 * GPU GFX IP block helpers function.

 */
@@ -558,6 +560,8 @@ int amdgpu_gfx_enable_kcq(struct amdgpu_device *adev) 


void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable)

{

	unsigned long delay = GFX_OFF_DELAY_ENABLE;



	if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))

		return;
@@ -573,8 +577,14 @@ void amdgpu_gfx_off_ctrl(struct amdgpu_device *adev, bool enable) 


		adev->gfx.gfx_off_req_count--;



		if (adev->gfx.gfx_off_req_count == 0 && !adev->gfx.gfx_off_state)

			schedule_delayed_work(&adev->gfx.gfx_off_delay_work, GFX_OFF_DELAY_ENABLE);

		if (adev->gfx.gfx_off_req_count == 0 &&

		    !adev->gfx.gfx_off_state) {

			/* If going to s2idle, no need to wait */

			if (adev->in_s0ix)

				delay = GFX_OFF_NO_DELAY;

			schedule_delayed_work(&adev->gfx.gfx_off_delay_work,

					      delay);

		}

	} else {

		if (adev->gfx.gfx_off_req_count == 0) {

			cancel_delayed_work_sync(&adev->gfx.gfx_off_delay_work);