diff options
| author | Ivan.liu <xiaowen.liu@nxp.com> | 2018-10-22 09:19:06 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:34:44 +0800 |
| commit | fb256da9024243a821e01a04b8d9dc22d888b042 (patch) | |
| tree | 809c26305d214b5c6dc8ff768be8d07c38e1423c /drivers/mxc/gpu-viv/hal/os/linux | |
| parent | 77dc5dc28f2aef061bc94bd5c444e1c10333e2a8 (diff) | |
MA-13121-2 [#imx-1221] Fix kernel panic after reduce gpu reserved memory size.
Fix uint64_t to pointer conversion issue on 32bit platform.
Signed-off-by: Ivan.liu <xiaowen.liu@nxp.com>
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/os/linux')
| -rw-r--r-- | drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c index 157e42564a0f..a047d4eb741a 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_drm.c @@ -582,7 +582,7 @@ static int viv_ioctl_gem_attach_aux(struct drm_device *drm, void *data, gcmkONERROR(gckDEVICE_Dispatch(gal_dev->device, &iface)); /* Fill tile status node with tileStatusFiller. */ - entry = (char __user*)iface.u.LockVideoMemory.memory; + entry = (char __user*)(uintptr_t)iface.u.LockVideoMemory.memory; for (num=0; num<gem_ts_obj->size; num++) { put_user(tileStatusFiller, entry+num); } |