Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b314f9a9 authored by Chunming Zhou's avatar Chunming Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: enable BUS master after pci reset 



Re-enable bus mastering after GPU reset. We disable it
at the top of these functions, so balance them by
re-enabling it.

Signed-off-by: default avatarChunming Zhou <David1.Zhou@amd.com>
eviewed-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 89a31827

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

+2 −0
Original line number Diff line number Diff line
@@ -1179,6 +1179,8 @@ static int cik_gpu_pci_config_reset(struct amdgpu_device *adev) 
	/* wait for asic to come out of reset */

	for (i = 0; i < adev->usec_timeout; i++) {

		if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) {

			/* enable BM */

			pci_set_master(adev->pdev);

			r = 0;

			break;

		}

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

+4 −1
Original line number Diff line number Diff line
@@ -612,8 +612,11 @@ static int vi_gpu_pci_config_reset(struct amdgpu_device *adev) 


	/* wait for asic to come out of reset */

	for (i = 0; i < adev->usec_timeout; i++) {

		if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff)

		if (RREG32(mmCONFIG_MEMSIZE) != 0xffffffff) {

			/* enable BM */

			pci_set_master(adev->pdev);

			return 0;

		}

		udelay(1);

	}

	return -EINVAL;