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

Commit 2d2fe3f9 authored by Christian König's avatar Christian König
Browse files

drm/radeon: drop radeon_ring_force_activity 



The reason for the false positives was fixed quite some time ago and since
most engines can still execute NOPs while being locked up it leads to false
negatives.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ff212f25

drivers/gpu/drm/radeon/cik.c

+0 −2
Original line number Diff line number Diff line
@@ -5118,8 +5118,6 @@ bool cik_gfx_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		radeon_ring_lockup_update(rdev, ring);

		return false;

	}

	/* force CP activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/cik_sdma.c

+0 −2
Original line number Diff line number Diff line
@@ -714,8 +714,6 @@ bool cik_sdma_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		radeon_ring_lockup_update(rdev, ring);

		return false;

	}

	/* force ring activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/evergreen.c

+0 −2
Original line number Diff line number Diff line
@@ -3953,8 +3953,6 @@ bool evergreen_gfx_is_lockup(struct radeon_device *rdev, struct radeon_ring *rin 
		radeon_ring_lockup_update(rdev, ring);

		return false;

	}

	/* force CP activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/evergreen_dma.c

+0 −2
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ bool evergreen_dma_is_lockup(struct radeon_device *rdev, struct radeon_ring *rin 
		radeon_ring_lockup_update(rdev, ring);

		return false;

	}

	/* force ring activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}

drivers/gpu/drm/radeon/ni.c

+0 −2
Original line number Diff line number Diff line
@@ -1920,8 +1920,6 @@ bool cayman_gfx_is_lockup(struct radeon_device *rdev, struct radeon_ring *ring) 
		radeon_ring_lockup_update(rdev, ring);

		return false;

	}

	/* force CP activities */

	radeon_ring_force_activity(rdev, ring);

	return radeon_ring_test_lockup(rdev, ring);

}