diff options
Diffstat (limited to 'common/recipes-kernel/linux/files/0179-drm-amd-amdgpu-Improve-amdgpu_dpm-macros-to-avoid-un.patch')
| -rw-r--r-- | common/recipes-kernel/linux/files/0179-drm-amd-amdgpu-Improve-amdgpu_dpm-macros-to-avoid-un.patch | 108 |
1 files changed, 108 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/files/0179-drm-amd-amdgpu-Improve-amdgpu_dpm-macros-to-avoid-un.patch b/common/recipes-kernel/linux/files/0179-drm-amd-amdgpu-Improve-amdgpu_dpm-macros-to-avoid-un.patch new file mode 100644 index 00000000..53038fde --- /dev/null +++ b/common/recipes-kernel/linux/files/0179-drm-amd-amdgpu-Improve-amdgpu_dpm-macros-to-avoid-un.patch @@ -0,0 +1,108 @@ +From c5bdb2aca2d984ec540d7967ef22371f641357ca Mon Sep 17 00:00:00 2001 +From: Eric Huang <JinHuiEric.Huang@amd.com> +Date: Tue, 19 Jan 2016 14:28:56 -0500 +Subject: [PATCH 0179/1110] drm/amd/amdgpu: Improve amdgpu_dpm* macros to avoid + unexpected result (v2) + +The two macros returns are values which probably are used +in the expression of calculation. Without the brackets +the result of the expression may be wrong. + +v2: agd: squash both patches together + +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Signed-off-by: Eric Huang <JinHuiEric.Huang@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 44 ++++++++++++++++++------------------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +index 6edeba2..06a46f5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h +@@ -2285,60 +2285,60 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) + #define amdgpu_dpm_enable_bapm(adev, e) (adev)->pm.funcs->enable_bapm((adev), (e)) + + #define amdgpu_dpm_get_temperature(adev) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->get_temperature((adev)->powerplay.pp_handle) : \ +- (adev)->pm.funcs->get_temperature((adev)) ++ (adev)->pm.funcs->get_temperature((adev))) + + #define amdgpu_dpm_set_fan_control_mode(adev, m) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->set_fan_control_mode((adev)->powerplay.pp_handle, (m)) : \ +- (adev)->pm.funcs->set_fan_control_mode((adev), (m)) ++ (adev)->pm.funcs->set_fan_control_mode((adev), (m))) + + #define amdgpu_dpm_get_fan_control_mode(adev) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->get_fan_control_mode((adev)->powerplay.pp_handle) : \ +- (adev)->pm.funcs->get_fan_control_mode((adev)) ++ (adev)->pm.funcs->get_fan_control_mode((adev))) + + #define amdgpu_dpm_set_fan_speed_percent(adev, s) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->set_fan_speed_percent((adev)->powerplay.pp_handle, (s)) : \ +- (adev)->pm.funcs->set_fan_speed_percent((adev), (s)) ++ (adev)->pm.funcs->set_fan_speed_percent((adev), (s))) + + #define amdgpu_dpm_get_fan_speed_percent(adev, s) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->get_fan_speed_percent((adev)->powerplay.pp_handle, (s)) : \ +- (adev)->pm.funcs->get_fan_speed_percent((adev), (s)) ++ (adev)->pm.funcs->get_fan_speed_percent((adev), (s))) + + #define amdgpu_dpm_get_sclk(adev, l) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->get_sclk((adev)->powerplay.pp_handle, (l)) : \ +- (adev)->pm.funcs->get_sclk((adev), (l)) ++ (adev)->pm.funcs->get_sclk((adev), (l))) + + #define amdgpu_dpm_get_mclk(adev, l) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->get_mclk((adev)->powerplay.pp_handle, (l)) : \ +- (adev)->pm.funcs->get_mclk((adev), (l)) ++ (adev)->pm.funcs->get_mclk((adev), (l))) + + + #define amdgpu_dpm_force_performance_level(adev, l) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->force_performance_level((adev)->powerplay.pp_handle, (l)) : \ +- (adev)->pm.funcs->force_performance_level((adev), (l)) ++ (adev)->pm.funcs->force_performance_level((adev), (l))) + + #define amdgpu_dpm_powergate_uvd(adev, g) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->powergate_uvd((adev)->powerplay.pp_handle, (g)) : \ +- (adev)->pm.funcs->powergate_uvd((adev), (g)) ++ (adev)->pm.funcs->powergate_uvd((adev), (g))) + + #define amdgpu_dpm_powergate_vce(adev, g) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->powergate_vce((adev)->powerplay.pp_handle, (g)) : \ +- (adev)->pm.funcs->powergate_vce((adev), (g)) ++ (adev)->pm.funcs->powergate_vce((adev), (g))) + + #define amdgpu_dpm_debugfs_print_current_performance_level(adev, m) \ +- (adev)->pp_enabled ? \ ++ ((adev)->pp_enabled ? \ + (adev)->powerplay.pp_funcs->print_current_performance_level((adev)->powerplay.pp_handle, (m)) : \ +- (adev)->pm.funcs->debugfs_print_current_performance_level((adev), (m)) ++ (adev)->pm.funcs->debugfs_print_current_performance_level((adev), (m))) + + #define amdgpu_dpm_get_current_power_state(adev) \ + (adev)->powerplay.pp_funcs->get_current_power_state((adev)->powerplay.pp_handle) +-- +2.7.4 + |