shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

rockchip/rga: rga driver fix compat ptr from u64

Browse Source 
Change-Id: I23cff21aab9af09989b8b2332e7a2ef3ffc8bfb8
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>
This commit is contained in:
Zikim,Wei
2016-11-09 21:01:02 +08:00
committed by Huang, Tao
parent 8c0aa0e3a3
commit ff788a2811
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/gpu/drm/rockchip/rockchip_drm_rga.c
View File

@@ -42,6 +42,15 @@
#define RGA_MMU_SRC1_BASE 0x0174
#define RGA_MMU_DST_BASE 0x0178
static void __user *rga_compat_ptr(u64 value)
{
#ifdef CONFIG_ARM64
return (void __user *)(value);
#else
return (void __user *)((u32)(value));
#endif
}
static void rga_dma_flush_range(void *ptr, int size)
{
#ifdef CONFIG_ARM
@@ -550,13 +559,13 @@ int rockchip_rga_set_cmdlist_ioctl(struct drm_device *drm_dev, void *data,
* command have two integer, one for register offset, another for
* register value.
*/
if (copy_from_user(cmdlist->data, (void __user *)req->cmd,
if (copy_from_user(cmdlist->data, rga_compat_ptr(req->cmd),
sizeof(struct drm_rockchip_rga_cmd) * req->cmd_nr))
return -EFAULT;
cmdlist->last += req->cmd_nr * 2;
if (copy_from_user(&cmdlist->data[cmdlist->last],
(void __user *)req->cmd_buf,
rga_compat_ptr(req->cmd_buf),
sizeof(struct drm_rockchip_rga_cmd) * req->cmd_buf_nr))
return -EFAULT;
cmdlist->last += req->cmd_buf_nr * 2;