From: yxj Date: Wed, 30 Jan 2013 06:10:32 +0000 (+0800) Subject: Revert "rk3188 lcdc:support ioctl RK_FBIOSET_W0W1_ZORDER_SWAP" X-Git-Tag: firefly_0821_release~7685 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f6c07a3d4d0c6358ee5309c1782583b4c6abf746;p=firefly-linux-kernel-4.4.55.git Revert "rk3188 lcdc:support ioctl RK_FBIOSET_W0W1_ZORDER_SWAP" This reverts commit 598e43de00fec3b4fa87fdb4ec753f858b65b2de. --- diff --git a/drivers/video/rockchip/lcdc/rk3188_lcdc.c b/drivers/video/rockchip/lcdc/rk3188_lcdc.c index 45ea4c8b3e85..6d66d595d991 100644 --- a/drivers/video/rockchip/lcdc/rk3188_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3188_lcdc.c @@ -777,7 +777,6 @@ static int rk3188_lcdc_ioctl(struct rk_lcdc_device_driver *dev_drv, unsigned int u32 panel_size[2]; void __user *argp = (void __user *)arg; int enable; - int zorder; switch(cmd) { case FBIOGET_PANEL_SIZE: //get panel size @@ -794,12 +793,6 @@ static int rk3188_lcdc_ioctl(struct rk_lcdc_device_driver *dev_drv, unsigned int return -EFAULT; lcdc_dev->vsync_info.active = enable; break; - case RK_FBIOSET_W0W1_ZORDER_SWAP: - if (copy_from_user(&zorder, argp, sizeof(zorder))) - return -EFAULT; - lcdc_msk_reg(lcdc_dev,DSP_CTRL0,m_WIN0_TOP,v_WIN0_TOP(zorder)); - break; - default: break; }