diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3144-drm-amdgpu-use-pap-format-string-for-phys_addr_t.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3144-drm-amdgpu-use-pap-format-string-for-phys_addr_t.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3144-drm-amdgpu-use-pap-format-string-for-phys_addr_t.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3144-drm-amdgpu-use-pap-format-string-for-phys_addr_t.patch new file mode 100644 index 00000000..d9a94335 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3144-drm-amdgpu-use-pap-format-string-for-phys_addr_t.patch @@ -0,0 +1,43 @@ +From 250f9835dbc69e2d780058deb541a6bd2124067d Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 8 Jan 2018 13:53:56 +0100 +Subject: [PATCH 3144/4131] drm/amdgpu: use %pap format string for phys_addr_t + +The newly added get_local_mem_info() function prints a phys_addr_t +using 0x%llx, which is wrong on most 32-bit systems, as shown by +this warning: + +drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c: In function 'get_local_mem_info': +include/linux/kern_levels.h:5:18: error: format '%llx' expects argument of type 'long long unsigned int', but argument 2 has type 'resource_size_t {aka unsigned int}' [-Werror=format=] +drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c:297:31: note: format string is defined here + pr_debug("Address base: 0x%llx limit 0x%llx public 0x%llx private 0x%llx\n", + +Passing the address by reference to the special %pap format string will +produce the correct output and avoid the warning. + +Fixes: 30f1c0421ec5 ("drm/amdgpu: Implement get_local_mem_info") +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> +Signed-off-by: Dave Airlie <airlied@redhat.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +index db55846..0725615 100755 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +@@ -402,8 +402,8 @@ void get_local_mem_info(struct kgd_dev *kgd, + } + mem_info->vram_width = adev->mc.vram_width; + +- pr_debug("Address base: 0x%llx limit 0x%llx public 0x%llx private 0x%llx\n", +- adev->mc.aper_base, aper_limit, ++ pr_debug("Address base: %pap limit %pap public 0x%llx private 0x%llx\n", ++ &adev->mc.aper_base, &aper_limit, + mem_info->local_mem_size_public, + mem_info->local_mem_size_private); + +-- +2.7.4 + |