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

Commit 0ec0612a authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon: fix regression in dynpm due to multi-ring rework 

Not all asics have all rings, so make sure the ring is ready
before attempting to check it in the dynpm work handler.

Fixes:
https://bugzilla.kernel.org/show_bug.cgi?id=43367



Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarJerome Glisse <jglisse@redhat.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f8fee8f5

drivers/gpu/drm/radeon/radeon_pm.c

+7 −3
Original line number Diff line number Diff line
@@ -801,10 +801,14 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work) 
		int i;



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

			struct radeon_ring *ring = &rdev->ring[i];



			if (ring->ready) {

				not_processed += radeon_fence_count_emitted(rdev, i);

				if (not_processed >= 3)

					break;

			}

		}



		if (not_processed >= 3) { /* should upclock */

			if (rdev->pm.dynpm_planned_action == DYNPM_ACTION_DOWNCLOCK) {