]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/amd/powerplay: return false instead of -EINVAL
authorAndrew Shadura <andrew.shadura@collabora.co.uk>
Thu, 3 Nov 2016 10:09:24 +0000 (11:09 +0100)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 8 Nov 2016 16:43:05 +0000 (11:43 -0500)
Returning -EINVAL from a bool-returning function
phm_check_smc_update_required_for_display_configuration has an unexpected
effect of returning true, which is probably not what was intended.
Replace -EINVAL by false.

The only place this function is called from is
psm_adjust_power_state_dynamic in
drivers/gpu/drm/amd/powerplay/eventmgr/psm.c:106:

if (!equal || phm_check_smc_update_required_for_display_configuration(hwmgr)) {
phm_apply_state_adjust_rules(hwmgr, requested, pcurrent);
phm_set_power_state(hwmgr, &pcurrent->hardware, &requested->hardware);
hwmgr->current_ps = requested;
}

It seems to expect a boolean value here.

This issue has been found using the following Coccinelle semantic patch
written by Peter Senna Tschudin:
<smpl>
@@
identifier f;
constant C;
typedef bool;
@@
bool f (...){
<+...
* return -C;
...+>
}
</smpl>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c

index 14f8c1f4da3d7a385202f2e8ec24ee5e6ab0f3ad..0723758ed0650616ee111af60e9ac14287f73ae2 100644 (file)
@@ -272,7 +272,7 @@ bool phm_check_smc_update_required_for_display_configuration(struct pp_hwmgr *hw
        PHM_FUNC_CHECK(hwmgr);
 
        if (hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration == NULL)
-               return -EINVAL;
+               return false;
 
        return hwmgr->hwmgr_func->check_smc_update_required_for_display_configuration(hwmgr);
 }