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

Merge tag 'amd-drm-fixes-6.1-2022-10-20' of... 

Merge tag 'amd-drm-fixes-6.1-2022-10-20' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-6.1-2022-10-20:

amdgpu:
- Fix gfx9 APU regression caused by PCI AER fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221020135225.562807-1-alexander.deucher@amd.com
parents f046ca4a 50b0e4d4

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

+0 −5
Original line number Diff line number Diff line
@@ -1417,11 +1417,6 @@ static int sdma_v4_0_start(struct amdgpu_device *adev) 
		WREG32_SDMA(i, mmSDMA0_CNTL, temp);



		if (!amdgpu_sriov_vf(adev)) {

			ring = &adev->sdma.instance[i].ring;

			adev->nbio.funcs->sdma_doorbell_range(adev, i,

				ring->use_doorbell, ring->doorbell_index,

				adev->doorbell_index.sdma_doorbell_range);



			/* unhalt engine */

			temp = RREG32_SDMA(i, mmSDMA0_F32_CNTL);

			temp = REG_SET_FIELD(temp, SDMA0_F32_CNTL, HALT, 0);

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

+21 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,20 @@ static int soc15_common_sw_fini(void *handle) 
	return 0;

}



static void soc15_sdma_doorbell_range_init(struct amdgpu_device *adev)

{

	int i;



	/* sdma doorbell range is programed by hypervisor */

	if (!amdgpu_sriov_vf(adev)) {

		for (i = 0; i < adev->sdma.num_instances; i++) {

			adev->nbio.funcs->sdma_doorbell_range(adev, i,

				true, adev->doorbell_index.sdma_engine[i] << 1,

				adev->doorbell_index.sdma_doorbell_range);

		}

	}

}



static int soc15_common_hw_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -1230,6 +1244,13 @@ static int soc15_common_hw_init(void *handle) 


	/* enable the doorbell aperture */

	soc15_enable_doorbell_aperture(adev, true);

	/* HW doorbell routing policy: doorbell writing not

	 * in SDMA/IH/MM/ACV range will be routed to CP. So

	 * we need to init SDMA doorbell range prior

	 * to CP ip block init and ring test.  IH already

	 * happens before CP.

	 */

	soc15_sdma_doorbell_range_init(adev);



	return 0;

}