Commit c722865a authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher

drm/amdgpu: check function points valid before use. (v3)

v2: agd: integrate Christian's comments.
v3: print error message if call fails
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5463545b
...@@ -1191,13 +1191,15 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev, ...@@ -1191,13 +1191,15 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev,
for (i = 0; i < adev->num_ip_blocks; i++) { for (i = 0; i < adev->num_ip_blocks; i++) {
if (!adev->ip_blocks[i].status.valid) if (!adev->ip_blocks[i].status.valid)
continue; continue;
if (adev->ip_blocks[i].version->type == block_type) { if (adev->ip_blocks[i].version->type != block_type)
r = adev->ip_blocks[i].version->funcs->set_clockgating_state((void *)adev, continue;
state); if (!adev->ip_blocks[i].version->funcs->set_clockgating_state)
continue;
r = adev->ip_blocks[i].version->funcs->set_clockgating_state(
(void *)adev, state);
if (r) if (r)
return r; DRM_ERROR("set_clockgating_state of IP block <%s> failed %d\n",
break; adev->ip_blocks[i].version->funcs->name, r);
}
} }
return r; return r;
} }
...@@ -1211,13 +1213,15 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev, ...@@ -1211,13 +1213,15 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev,
for (i = 0; i < adev->num_ip_blocks; i++) { for (i = 0; i < adev->num_ip_blocks; i++) {
if (!adev->ip_blocks[i].status.valid) if (!adev->ip_blocks[i].status.valid)
continue; continue;
if (adev->ip_blocks[i].version->type == block_type) { if (adev->ip_blocks[i].version->type != block_type)
r = adev->ip_blocks[i].version->funcs->set_powergating_state((void *)adev, continue;
state); if (!adev->ip_blocks[i].version->funcs->set_powergating_state)
continue;
r = adev->ip_blocks[i].version->funcs->set_powergating_state(
(void *)adev, state);
if (r) if (r)
return r; DRM_ERROR("set_powergating_state of IP block <%s> failed %d\n",
break; adev->ip_blocks[i].version->funcs->name, r);
}
} }
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment