diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.14.71/5379-drm-amdgpu-fix-32-bit-build-warning.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.14.71/5379-drm-amdgpu-fix-32-bit-build-warning.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.14.71/5379-drm-amdgpu-fix-32-bit-build-warning.patch b/common/recipes-kernel/linux/linux-yocto-4.14.71/5379-drm-amdgpu-fix-32-bit-build-warning.patch new file mode 100644 index 00000000..5cd60284 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.14.71/5379-drm-amdgpu-fix-32-bit-build-warning.patch @@ -0,0 +1,46 @@ +From fe216fb5fd5cbfcf2f0e88514529d9601ca1aaf2 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Fri, 25 May 2018 17:50:09 +0200 +Subject: [PATCH 5379/5725] drm/amdgpu: fix 32-bit build warning + +Casting a pointer to a 64-bit type causes a warning on 32-bit targets: + +drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c:473:24: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] + lower_32_bits((uint64_t)wptr)); + ^ +drivers/gpu/drm/amd/amdgpu/amdgpu.h:1701:53: note: in definition of macro 'WREG32' + #define WREG32(reg, v) amdgpu_mm_wreg(adev, (reg), (v), 0) + ^ +drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c:473:10: note: in expansion of macro 'lower_32_bits' + lower_32_bits((uint64_t)wptr)); + ^~~~~~~~~~~~~ + +The correct method is to cast to 'uintptr_t'. + +Fixes: d5a114a6c5f7 ("drm/amdgpu: Add GFXv9 kfd2kgd interface functions") +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com> +Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +index b6852a1..c47a75d 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +@@ -532,9 +532,9 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, + WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_HI), + upper_32_bits(guessed_wptr)); + WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_POLL_ADDR), +- lower_32_bits((uint64_t)wptr)); ++ lower_32_bits((uintptr_t)wptr)); + WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_HQD_PQ_WPTR_POLL_ADDR_HI), +- upper_32_bits((uint64_t)wptr)); ++ upper_32_bits((uintptr_t)wptr)); + WREG32(SOC15_REG_OFFSET(GC, 0, mmCP_PQ_WPTR_POLL_CNTL1), + get_queue_mask(adev, pipe_id, queue_id)); + } +-- +2.7.4 + |