diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-kernel/linux/files/0139-drm-powerplay-use-div64_s64-instead-of-do_div.patch')
| -rw-r--r-- | meta-amdfalconx86/recipes-kernel/linux/files/0139-drm-powerplay-use-div64_s64-instead-of-do_div.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amdfalconx86/recipes-kernel/linux/files/0139-drm-powerplay-use-div64_s64-instead-of-do_div.patch b/meta-amdfalconx86/recipes-kernel/linux/files/0139-drm-powerplay-use-div64_s64-instead-of-do_div.patch new file mode 100644 index 00000000..e9c927c5 --- /dev/null +++ b/meta-amdfalconx86/recipes-kernel/linux/files/0139-drm-powerplay-use-div64_s64-instead-of-do_div.patch @@ -0,0 +1,45 @@ +From d7bc091149f65703b5175e3e4cf5d3b72817a48b Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Fri, 1 Jan 2016 14:07:41 +0100 +Subject: [PATCH 0139/1110] drm: powerplay: use div64_s64 instead of do_div +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The newly added code for Fiji creates a correct compiler warning +about invalid use of the do_div macro: + +In file included from powerplay/hwmgr/ppatomctrl.c:31:0: +drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h: In function 'fDivide': +drivers/gpu/drm/amd/amdgpu/../powerplay/hwmgr/ppevvmath.h:382:89: warning: comparison of distinct pointer types lacks a cast + do_div(longlongX, longlongY); /*Q(32,32) divided by Q(16,16) = Q(16,16) Back to original format */ + +do_div() divides an unsigned 64-bit number by an unsigned 32-bit number. +The code instead wants to divide two signed 64-bit numbers, which is done +using the div64_s64 function. + +Reviewed-by: Thierry Reding <treding@nvidia.com> +Reviewed-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Fixes: 770911a3cfbb ("drm/amd/powerplay: add/update headers for Fiji SMU and DPM") +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h +index 42f2423..411cb0f 100644 +--- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h ++++ b/drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h +@@ -379,7 +379,7 @@ fInt fDivide (fInt X, fInt Y) + + longlongX = longlongX << 16; /*Q(16,16) -> Q(32,32) */ + +- do_div(longlongX, longlongY); /*Q(32,32) divided by Q(16,16) = Q(16,16) Back to original format */ ++ div64_s64(longlongX, longlongY); /*Q(32,32) divided by Q(16,16) = Q(16,16) Back to original format */ + + fQuotient.full = (int)longlongX; + return fQuotient; +-- +2.7.4 + |