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

Commit 9ecbe7f5 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: skip invalid ip blocks in ip helpers 



Skip IP blocks that are not enabled.

Reviewed-by: default avatarChunming zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a225bf1c

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

+8 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,8 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev, 
	int i, r = 0;



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

		if (!adev->ip_block_status[i].valid)

			continue;

		if (adev->ip_blocks[i].type == block_type) {

			r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev,

									    state);
@@ -1093,6 +1095,8 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev, 
	int i, r = 0;



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

		if (!adev->ip_block_status[i].valid)

			continue;

		if (adev->ip_blocks[i].type == block_type) {

			r = adev->ip_blocks[i].funcs->set_powergating_state((void *)adev,

									    state);
@@ -1110,6 +1114,8 @@ int amdgpu_wait_for_idle(struct amdgpu_device *adev, 
	int i, r;



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

		if (!adev->ip_block_status[i].valid)

			continue;

		if (adev->ip_blocks[i].type == block_type) {

			r = adev->ip_blocks[i].funcs->wait_for_idle((void *)adev);

			if (r)
@@ -1127,6 +1133,8 @@ bool amdgpu_is_idle(struct amdgpu_device *adev, 
	int i;



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

		if (!adev->ip_block_status[i].valid)

			continue;

		if (adev->ip_blocks[i].type == block_type)

			return adev->ip_blocks[i].funcs->is_idle((void *)adev);

	}