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

Commit 24178ec4 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: don't reset the MC on IGPs/APUs 



The MC isn't part of the GPU per se.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 123bc183

drivers/gpu/drm/radeon/evergreen.c

+4 −2
Original line number Diff line number Diff line
@@ -2500,8 +2500,10 @@ static void evergreen_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
	if (reset_mask & RADEON_RESET_VMC)

		srbm_soft_reset |= SOFT_RESET_VMC;



	if (!(rdev->flags & RADEON_IS_IGP)) {

		if (reset_mask & RADEON_RESET_MC)

			srbm_soft_reset |= SOFT_RESET_MC;

	}



	if (grbm_soft_reset) {

		tmp = RREG32(GRBM_SOFT_RESET);

drivers/gpu/drm/radeon/ni.c

+4 −2
Original line number Diff line number Diff line
@@ -1474,8 +1474,10 @@ static void cayman_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
	if (reset_mask & RADEON_RESET_VMC)

		srbm_soft_reset |= SOFT_RESET_VMC;



	if (!(rdev->flags & RADEON_IS_IGP)) {

		if (reset_mask & RADEON_RESET_MC)

			srbm_soft_reset |= SOFT_RESET_MC;

	}



	if (grbm_soft_reset) {

		tmp = RREG32(GRBM_SOFT_RESET);

drivers/gpu/drm/radeon/r600.c

+4 −2
Original line number Diff line number Diff line
@@ -1475,8 +1475,10 @@ static void r600_gpu_soft_reset(struct radeon_device *rdev, u32 reset_mask) 
	if (reset_mask & RADEON_RESET_GRBM)

		srbm_soft_reset |= S_000E60_SOFT_RESET_GRBM(1);



	if (!(rdev->flags & RADEON_IS_IGP)) {

		if (reset_mask & RADEON_RESET_MC)

			srbm_soft_reset |= S_000E60_SOFT_RESET_MC(1);

	}



	if (reset_mask & RADEON_RESET_VMC)

		srbm_soft_reset |= S_000E60_SOFT_RESET_VMC(1);