diff options
| author | Lucas Wei <lucaswei@google.com> | 2021-04-01 02:57:47 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2021-04-01 02:57:47 +0000 |
| commit | 8d6509fe912ee567023583b82155c0c237d30ed4 (patch) | |
| tree | 99e29f4d1def3e23ed50cca66bbd6c2cd8a1631f | |
| parent | 0ca1d662ac35c5322530ce0630f69593f65dc3c0 (diff) | |
| parent | f6bed079a0701a78792d1e1d40741b620d030f89 (diff) | |
| download | video-driver-8d6509fe912ee567023583b82155c0c237d30ed4.tar.gz | |
Merge "video: hfi_iris2: Fix -Wpointer-to-int-cast" into android-msm-barbet-4.19
| -rw-r--r-- | msm/vidc/hfi_iris2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/msm/vidc/hfi_iris2.c b/msm/vidc/hfi_iris2.c index 179fb2a..0f16e9b 100644 --- a/msm/vidc/hfi_iris2.c +++ b/msm/vidc/hfi_iris2.c @@ -2,6 +2,7 @@ /* * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. */ +#include <linux/kernel.h> #include "msm_vidc_debug.h" #include "hfi_common.h" @@ -167,9 +168,9 @@ void __setup_ucregion_memory_map_iris2(struct venus_hfi_device *device, u32 sid) (u32)device->qdss.align_device_addr, sid); /* update queues vaddr for debug purpose */ __write_register(device, CPU_CS_VCICMDARG0_IRIS2, - (u32)device->iface_q_table.align_virtual_addr, sid); + (u32)((uintptr_t)device->iface_q_table.align_virtual_addr & UINT_MAX), sid); __write_register(device, CPU_CS_VCICMDARG1_IRIS2, - (u32)((u64)device->iface_q_table.align_virtual_addr >> 32), + (u32)((uintptr_t)device->iface_q_table.align_virtual_addr >> 32), sid); } |