From: root <root@huangds-desktop.(none)>
Date: Thu, 10 Mar 2011 09:08:32 +0000 (+0800)
Subject: in video mode chage ui to 565 fail
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7fe63eebbee4404585c616ec4d1b1e996c2ef3ad;p=firefly-linux-kernel-4.4.55.git

in video mode chage ui to 565 fail
---

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
old mode 100644
new mode 100755
index 8e60b26864f8..27e40d34c209
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -41,8 +41,6 @@
      */
 
 #define FBPIXMAPSIZE	(1024 * 8)
-#define SETFBIOVADDR    0x4619
-#define GETFBIOVADDR    0x4620
 
 struct fb_info *registered_fb[FB_MAX] __read_mostly;
 int num_registered_fb __read_mostly;
@@ -1147,17 +1145,6 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
 		release_console_sem();
 		unlock_fb_info(info);
 		break;
-#if 1		
-	case SETFBIOVADDR:
-		if (copy_from_user(&fb_vaddr, argp, 4))
-			return -EFAULT;
-		//printk("fbmem.c  set fb_vaddr = 0x%08x \n",fb_vaddr);
-		break;		
-	case GETFBIOVADDR:
-		copy_to_user(argp, &fb_vaddr, 4);
-		//printk("fbmem.c  get fb_vaddr = 0x%08x \n",fb_vaddr);
-		break;	
-#endif		
 	default:
 		if (!lock_fb_info(info))
 			return -ENODEV;
diff --git a/drivers/video/rk29_fb.c b/drivers/video/rk29_fb.c
index f4a6432ee698..e290040a6f0c 100755
--- a/drivers/video/rk29_fb.c
+++ b/drivers/video/rk29_fb.c
@@ -1499,11 +1499,13 @@ static int fb0_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
                 panel_size[1] = inf->cur_screen->y_res;
             }
             if(copy_to_user((void*)arg, panel_size, 8))  return -EFAULT;
+            break;
 		}
 	case FBIOPUT_GET_CURSOR_EN:
 		{
             u32 en = LcdReadBit(inf, SYS_CONFIG, m_HWC_ENABLE);
             if(copy_to_user((void*)arg, &en, 4))  return -EFAULT;
+            break;
 		}
    default:
         break;
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 74595389f4ef..8d21255801e5 100755
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -26,7 +26,6 @@ struct dentry;
 #define FBIOPUT_SET_CURSOR_CMAP    0x460c
 #define FBIOPUT_GET_CURSOR_RESOLUTION    0x460d
 #define FBIOPUT_GET_CURSOR_EN    0x460e
-#define FBIOGET_OVERLAY_STATE 0X460f
 #ifdef __KERNEL__
 #define FBIO_CURSOR            _IOWR('F', 0x08, struct fb_cursor_user)
 #else
@@ -46,6 +45,7 @@ struct dentry;
 #define FBIOGET_HWCINFO         0x4616
 #define FBIOPUT_MODEINFO        0x4617
 #define FBIOGET_DISPINFO        0x4618
+#define FBIOGET_OVERLAY_STATE   0X4619
 
 
 #define FB_TYPE_PACKED_PIXELS		0	/* Packed Pixels	*/